Merge pull request #117 from jakobharder/devel/7.1

Devel/7.1

.github/package.js

@@ -33,17 +33,13 @@ function copyFolderSync(source, target) {
 }
 
 const idsToPackage = [
-  "jakob-city-variations",
   "jakob_new_world_cities",
   "jakob_industrial_cities",
-  "jakob_Biogas_Plant",
-  "jakob_diagonal_residences",
+  "jakob_biogas",
   "jakob_Nates_Windmill",
-  "jakob_street_skins",
   "jakob_compact_menus",
   "disable-fertilities-jakob",
-  "disable-street-jakob",
-  "disable-railway-jakob"
+  "cheat-instant-residences-jakob"
 ];
 
 const modsToPackage = glob.sync("./out/*/modinfo.json")

doc/alt-needs.md

@@ -0,0 +1,9 @@
+
+
+
+## Sausages vs Cheese
+
+- Cheese needs harbor space, Sausages have -8 Attractivity
+- Cheese is more expensive to maintain, but doesn't need Steel to construct
+  - Sausages: 40 coins, 30 farmers + 80 coins, 50 workers
+  - Cheese: 100 coins, 25 farmers, 15 workers + 60 coins, 40 workers

mods/addon-industrial-cities/README.md

@@ -156,6 +156,18 @@ Smaller **power plants** and additional energy options.
 
 ## Changes
 
+### 4.2
+
+- Renamed Vegetables into Field Vegetables to differentiate better from Red Peppers
+- Added support for Khobs' land oil depot
+- Added Olive Grove to all crop farms pool
+- Removed 100 cost when upgrading from farmer to Pescatarian I
+- Fixed Dockland sell prices for Ropes and Olive Oil
+- Fixed Pescatarian menu unlocking to early because of the Potato farm
+- Fixed Distillery and Malthouse missing in boost menu
+- Alternative Needs are now listed last in Lifestyle Needs.
+  Recommend to use the Marketplace to activate in InfoTips.
+
 ### 4.1
 
 - 4.1.1: Removed storage info for services in needs InfoTip

mods/addon-industrial-cities/modinfo.json

@@ -1,6 +1,6 @@
 {
   "out": "${annoMods}/[Addon] Industrial Cities (Jakob)",
-  "Version": "4.1.1",
+  "Version": "4.2.0",
   "ModID": "jakob_industrial_cities",
   "ModioResourceId": 3227009,
   "ModDependencies": [
@@ -34,37 +34,44 @@
     "jakob-cheese-tools"
   ],
   "bundle": [
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/decals-city-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/decals-industry-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/decals-city-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/decals-industry-jakob.zip",
+    "../../sub/all-docklands-jakob",
+    "../../sub/all-railway-jakob",
     "../../sub/jakob-power-plants",
     "../../sub/jakob-skyscraper-button",
     "../../sub/jakob-small-post",
     "../../sub/alt-menu-jakob",
+    "../../sub/ow-alt-needs-jakob",
+    "../../sub/ow-alt-needs-jakob",
+    "../../sub/ow-factory-complex-jakob",
+    "../../sub/ow-pescatarians-jakob",
     "../../sub/ow-seafood-jakob",
+    "../../sub/ow-terraced-houses-jakob",
     "../../sub/ow-music-school-jakob",
     "../ui-compact-menu",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/cheese-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/hemp-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/olive-oil-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/olives-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ropes-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/sardines-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/suits-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/tea-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/tools-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/vegetables-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ow-calamari-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ow-cheese-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ow-flax-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ow-hemp-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ow-herbs-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ow-linen-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ow-olive-oil-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ow-ropes-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ow-tools-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ow-vegetables-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/models-railway-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/infotip-jakob.zip"
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/cheese-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/hemp-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/olive-oil-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/olives-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/ropes-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/sardines-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/suits-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/tea-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/tools-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/vegetables-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/ow-calamari-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/ow-cheese-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/ow-flax-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/ow-hemp-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/ow-herbs-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/ow-linen-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/ow-olive-oil-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/ow-ropes-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/ow-tools-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/ow-vegetables-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/models-railway-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.5/infotip-jakob.zip"
   ],
   "Category": {
     "Chinese": "插件",