Merge pull request #415 from the-m4a/master

September 2019 Update mod fixes v2 (includes fixes from PR #407)
Azurency · Apr 3, 2020 · 27702e5 · 27702e5
2 parents 1683a24 + 433bd2b
commit 27702e5
Show file tree

Hide file tree

Showing 31 changed files with 851 additions and 640 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,5 @@ cqui_settings_local.sql
 .bak
 *.bak
 .DS_Store
+/.settings/
+/.buildpath
diff --git a/Assets/Expansion1/CityBanners/citybannermanager.lua b/Assets/Expansion1/CityBanners/citybannermanager.lua
diff --git a/Assets/Expansion1/CityBanners/citybannermanager.xml b/Assets/Expansion1/CityBanners/citybannermanager.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Context>
-
   <!-- Instances that make up City Banners -->
   <Include File="CityBannerInstances"/>
 
@@ -9,5 +8,4 @@
   <Container ID="CityDistrictIcons"/>
 
   <Container ID="CQUI_WorkedPlotContainer" />
-
 </Context>
diff --git a/Assets/Expansion2/CityBanners/citybannermanager.lua b/Assets/Expansion2/CityBanners/citybannermanager.lua
@@ -4509,7 +4509,7 @@ end
 -- ===========================================================================
 function Initialize()
 
-  print("Initialize CQUI CityBanner Expansion 1")
+  print("Initialize CQUI CityBanner Expansion 2")
 
   RegisterDirtyEvents();