From 7f200815d40dc992e91a3a3edefbe8fe65e3f241 Mon Sep 17 00:00:00 2001
From: AZiggurat <ziggurat0001@protonmail.com>
Date: Thu, 24 Aug 2023 19:16:49 +0300
Subject: [PATCH 01/63] small siphoning ui fixes, siphoning description change
 and adding totalPerDayDelta for alicorns

---
 game.js          | 26 ++++++++++++++++++++------
 res/i18n/en.json |  3 ++-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/game.js b/game.js
index 72080d224b..33735b5b44 100644
--- a/game.js
+++ b/game.js
@@ -3573,11 +3573,21 @@ dojo.declare("com.nuclearunicorn.game.ui.GamePage", null, {
 			//console.error("Unable to fetch resource stack for resName '" + resName + "'");
 			return;
 		}
-		stack.push({
-			name: $I("res.stack.buildings"),
-			type: "perDay",
-			value: this.getEffect(res.name + "PerDay")
-		});
+		if (resName == "necrocorn"){
+			console.error(this.getEffect("necrocornPerDay") + this.religion.pactsManager.getSiphonedCorruption(1));
+			console.error("ncr");
+			stack.push({
+				name: $I("res.stack.buildings"),
+				type: "perDay",
+				value: this.getEffect("necrocornPerDay") + this.religion.pactsManager.getSiphonedCorruption(1)
+			});
+		}else{
+			stack.push({
+				name: $I("res.stack.buildings"),
+				type: "perDay",
+				value: this.getEffect(res.name + "PerDay")
+			});
+		}
 		if(resName == "necrocorn"){
 			var corruptionStack = [];
 			corruptionStack.push({
@@ -3963,9 +3973,13 @@ dojo.declare("com.nuclearunicorn.game.ui.GamePage", null, {
 				resStringDay = this.processResourcePerTickStack(resStackDay, res, 0), //processResourcePerTickStack can work with perDay stack
 				resPerDay = this.getResourcePerDay(res.name);
 				if (this.opts.usePercentageResourceValues){
+					resStringDay = "<br>" + resStringDay;
 					resStringDay += "<br> " + $I("res.netGain") + ": " + this.getDisplayValueExt(resPerDay, true, true);
 				}
-			return resString + resStringDay;
+			var totalPerDayDelta =  "<br>" + $I("res.netGainPerDay") + ": " + 
+			this.getDisplayValueExt(resPerTick * this.calendar.ticksPerDay + this.getEffect("alicornPerDay"))
+			;
+			return resString + resStringDay + totalPerDayDelta;
 		}
 		return resString;
 	},
diff --git a/res/i18n/en.json b/res/i18n/en.json
index 3b6a1910d1..67598c2071 100644
--- a/res/i18n/en.json
+++ b/res/i18n/en.json
@@ -773,7 +773,7 @@
     "policy.republic.label" : "Republic",
     "policy.republic.desc" : "Best for large societies. Highly promoted leaders will provide a small bonus to the production of all kittens.",
     "policy.siphoning.label" : "Siphoning",
-    "policy.siphoning.desc" : "Pacts consume alicorns and slow down production instead of consuming necrocorns. If there is not enough of either pacts also consume necrocorns.",
+    "policy.siphoning.desc" : "Pacts consume alicorns and slow down corruption instead of consuming necrocorns. Lack of either is compensated by consuming necrocorns.",
     "policy.socialism.label" : "Socialism",
     "policy.socialism.desc" : "Has no effect",
     "policy.spaceBasedTerraforming.label" : "Space-based terraforming",
@@ -1030,6 +1030,7 @@
     "res.effect": "Effect",
     "res.effects": "Effects",
     "res.netGain": "Net gain",
+    "res.netGainPerDay": "Net delta per day",
     "res.notify.msg": "You will be notified when {0} will be available.",
     "res.notify.ready.title": "Enough resource to buy",
     "res.notify.ready": "The {0} is ready",

From 33f10f47625aaf3a8a65a6e7211e6645184059e8 Mon Sep 17 00:00:00 2001
From: AZiggurat <ziggurat0001@protonmail.com>
Date: Thu, 24 Aug 2023 19:20:46 +0300
Subject: [PATCH 02/63] get rid of debug things

---
 game.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/game.js b/game.js
index 33735b5b44..a8a8ae7640 100644
--- a/game.js
+++ b/game.js
@@ -3574,8 +3574,6 @@ dojo.declare("com.nuclearunicorn.game.ui.GamePage", null, {
 			return;
 		}
 		if (resName == "necrocorn"){
-			console.error(this.getEffect("necrocornPerDay") + this.religion.pactsManager.getSiphonedCorruption(1));
-			console.error("ncr");
 			stack.push({
 				name: $I("res.stack.buildings"),
 				type: "perDay",

From 72ba86539518761019137e824157bec3930f76b6 Mon Sep 17 00:00:00 2001
From: AZiggurat <ziggurat0001@protonmail.com>
Date: Fri, 25 Aug 2023 15:51:00 +0300
Subject: [PATCH 03/63] improve description

---
 res/i18n/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/i18n/en.json b/res/i18n/en.json
index 67598c2071..830f5b91d1 100644
--- a/res/i18n/en.json
+++ b/res/i18n/en.json
@@ -773,7 +773,7 @@
     "policy.republic.label" : "Republic",
     "policy.republic.desc" : "Best for large societies. Highly promoted leaders will provide a small bonus to the production of all kittens.",
     "policy.siphoning.label" : "Siphoning",
-    "policy.siphoning.desc" : "Pacts consume alicorns and slow down corruption instead of consuming necrocorns. Lack of either is compensated by consuming necrocorns.",
+    "policy.siphoning.desc" : "Pacts consume alicorns and slow down corruption instead of consuming necrocorns. Lack of alicorns or corruption is compensated by consuming necrocorns.",
     "policy.socialism.label" : "Socialism",
     "policy.socialism.desc" : "Has no effect",
     "policy.spaceBasedTerraforming.label" : "Space-based terraforming",

From 49d31e39145843d657c3ea0379931d88da53da4c Mon Sep 17 00:00:00 2001
From: Arima B <cheshire.panther@gmail.com>
Date: Mon, 4 Sep 2023 02:53:27 +0000
Subject: [PATCH 04/63] Merged in feature/spaceport-cherrypick (pull request
 #1227)

Spaceport cherrypick

* mobile feature flags

* remove map.jsx from the code

* cherry pick of the spaceport PR

* version bump
---
 changelog.txt     |   4 +
 core.js           |  83 +++++++------
 game.js           |  15 ++-
 index.html        |   3 +-
 js/buildings.js   | 139 +++++++++++++++-------
 js/jsx/map.jsx.js | 297 ----------------------------------------------
 js/science.js     |   3 +-
 res/i18n/en.json  |   7 +-
 test/game.test.js |  39 ++++++
 test/setup.js     |   1 -
 10 files changed, 207 insertions(+), 384 deletions(-)
 delete mode 100644 js/jsx/map.jsx.js

diff --git a/changelog.txt b/changelog.txt
index 7083dc4bd3..841a3536f2 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+v 1.4.9.3
+Major:
+* Spaceport
+
 v 1.4.9.2
 Major:
 * Queue
diff --git a/core.js b/core.js
index 117d666720..34c9a078b4 100644
--- a/core.js
+++ b/core.js
@@ -1978,6 +1978,12 @@ dojo.declare("com.nuclearunicorn.game.ui.BuildingStackableBtnController", com.nu
         }
 	},
 
+	/**
+	 * Ultimate entry point to building construction
+	 * @param {*} model 
+	 * @param {*} maxBld 
+	 * 
+	 */
 	build: function(model, maxBld){
 		var meta = model.metadata;
 		var counter = 0;
@@ -1985,48 +1991,55 @@ dojo.declare("com.nuclearunicorn.game.ui.BuildingStackableBtnController", com.nu
 			maxBld = meta.limitBuild - meta.val;
 		}
 
-        if (model.enabled && this.hasResources(model) || this.game.devMode ){
-	        while (this.hasResources(model) && maxBld > 0){
-				this.incrementValue(model);
-				this.payPrice(model);
+		
+        if (!model.enabled && !this.game.devMode){
+			return 0;
+		}
+		
+		while ((this.game.devMode || this.hasResources(model)) && maxBld > 0){
+			this.incrementValue(model);
+			this.payPrice(model);
 
-	            counter++;
-	            maxBld--;
-	        }
+			counter++;
+			maxBld--;
+		}
+		
+		if (!counter){
+			return 0;
+		}
 
-	        if (counter > 1) {
-		        this.game.msg($I("construct.all.msg", [meta.label, counter]), "notice");
-			}
+		if (counter > 1) {
+			this.game.msg($I("construct.all.msg", [meta.label, counter]), "notice");
+		}
 
-			if (meta.breakIronWill) {
-				this.game.ironWill = false;
-				var liberty = this.game.science.getPolicy("liberty");
-				liberty.calculateEffects(liberty, this.game);
-				var zebraOutpostMeta = this.game.bld.getBuildingExt("zebraOutpost").meta;
-				zebraOutpostMeta.calculateEffects(zebraOutpostMeta, this.game);
-				zebraOutpostMeta.jammed = false;
-				this.game.diplomacy.onLeavingIW();
-			}
+		if (meta.breakIronWill) {
+			this.game.ironWill = false;
+			var liberty = this.game.science.getPolicy("liberty");
+			liberty.calculateEffects(liberty, this.game);
+			var zebraOutpostMeta = this.game.bld.getBuildingExt("zebraOutpost").meta;
+			zebraOutpostMeta.calculateEffects(zebraOutpostMeta, this.game);
+			zebraOutpostMeta.jammed = false;
+			this.game.diplomacy.onLeavingIW();
+		}
 
-			if (meta.unlocks) {
-				this.game.unlock(meta.unlocks);
-			}
+		if (meta.unlocks) {
+			this.game.unlock(meta.unlocks);
+		}
 
-			if (meta.calculateEffects){
-				meta.calculateEffects(meta, this.game);
-				this.game.calendar.cycleEffectsBasics(meta.effects, meta.name); //(Only relevant for space buildings)
-			}
-			if (meta.unlockScheme && meta.val >= meta.unlockScheme.threshold) {
-				this.game.ui.unlockScheme(meta.unlockScheme.name);
-			}
+		if (meta.calculateEffects){
+			meta.calculateEffects(meta, this.game);
+			this.game.calendar.cycleEffectsBasics(meta.effects, meta.name); //(Only relevant for space buildings)
+		}
+		if (meta.unlockScheme && meta.val >= meta.unlockScheme.threshold) {
+			this.game.ui.unlockScheme(meta.unlockScheme.name);
+		}
 
-			if (meta.upgrades) {
-				if (meta.updateEffects) {
-					meta.updateEffects(meta, this.game);
-				}
-				this.game.upgrade(meta.upgrades);
+		if (meta.upgrades) {
+			if (meta.updateEffects) {
+				meta.updateEffects(meta, this.game);
 			}
-        }
+			this.game.upgrade(meta.upgrades);
+		}
 
 		return counter;
     },
diff --git a/game.js b/game.js
index 4d00c82127..0c0a63479f 100644
--- a/game.js
+++ b/game.js
@@ -1795,23 +1795,28 @@ dojo.declare("com.nuclearunicorn.game.ui.GamePage", null, {
 	featureFlags: {
 		VILLAGE_MAP: {
 			beta: true,
-			main: false
+			main: false,
+			mobile: false
 		},
 		SPACE_EXPL: {
 			beta: true,
-			main: false
+			main: false,
+			mobile: false
 		},
 		MAUSOLEUM_PACTS:{
 			beta: true,
-			main: true
+			main: true,
+			mobile: true
 		},
 		QUEUE:{
 			beta: true,
-			main: true
+			main: true,
+			mobile: true
 		},
 		QUEUE_REDSHIFT: {
 			beta: true,
-			main: false
+			main: false,
+			mobile: true
 		}
 	},
 
diff --git a/index.html b/index.html
index e325c976a3..1ddee3832a 100644
--- a/index.html
+++ b/index.html
@@ -65,7 +65,7 @@
 
 		<script type="text/javascript">
 
-			var version = "1492";
+			var version = "1493";
 			var buildRevision = 0;
 
 			var loadingProgress = 0,
@@ -140,7 +140,6 @@
 					"js/jsx/mid.jsx",
 					"js/jsx/toolbar.jsx",
 					"js/jsx/chiral.jsx",
-					"js/jsx/map.jsx",
 					"js/jsx/queue.jsx",
 
 					//required for defining IReactAware, will be relied upon by js/space
diff --git a/js/buildings.js b/js/buildings.js
index 7f1e74eb24..4e87fc45a4 100644
--- a/js/buildings.js
+++ b/js/buildings.js
@@ -773,38 +773,79 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 	},
 	{
 		name: "warehouse",
-		label: $I("buildings.warehouse.label"),
-		description: $I("buildings.warehouse.desc"),
-		prices: [
-			{ name : "beam", val: 1.5 },
-			{ name : "slab", val: 2 }
-		],
-		priceRatio: 1.15,
-		effects: {
-			"catnipMax": 0,
-			"woodMax": 0,
-			"mineralsMax": 0,
-			"coalMax": 0,
-			"ironMax": 0,
-			"titaniumMax": 0,
-			"goldMax": 0
+		stages: [
+			{
+				label: $I("buildings.warehouse.label"),
+				description: $I("buildings.warehouse.desc"),
+				flavor: $I("buildings.warehouse.flavor"),
+				prices: [
+					{ name : "beam", val: 1.5 },
+					{ name : "slab", val: 2 }
+				],
+				priceRatio: 1.15,
+				effects: {
+					"catnipMax": 0,
+					"woodMax": 0,
+					"mineralsMax": 0,
+					"coalMax": 0,
+					"ironMax": 0,
+					"titaniumMax": 0,
+					"goldMax": 0
+					},
+				stageUnlocked: true,
+				togglable: false
 			},
-		calculateEffects: function(self, game){
-			var effects = {
-				"catnipMax": 0,
-				"woodMax": 150,
-				"mineralsMax": 200,
-				"coalMax": 30,
-				"ironMax": 25,
-				"titaniumMax": 10,
-				"goldMax": 5
-			};
-
-			if (game.workshop.get("silos").researched){
-				effects["catnipMax"] = 750;
+			{
+				label: $I("buildings.spaceport.label"),
+				description: $I("buildings.spaceport.desc"),
+				flavor: $I("buildings.spaceport.flavor"),
+				prices: [
+					{ name: "titanium", val: 10000 },
+					{ name: "eludium", val: 500 },
+					{ name: "kerosene", val: 1000 },
+					{ name: "blueprint", val: 500 },
+					{ name: "starcharts", val: 100000 },
+				],
+				priceRatio: 1.15,
+				effects: {
+					"moonBaseStorageBonus": 0,
+					"planetCrackerStorageBonus": 0,
+					"cryostationStorageBonus": 0,
+					"energyConsumption": 0,
+					"starchartPerTickCon": 0
+				},
+				stageUnlocked: true,
+				togglable: true
 			}
-
-			self.effects = game.resPool.addBarnWarehouseRatio(effects);
+		],
+		calculateEffects: function(self, game){
+			var stageMeta = self.stages[self.stage];
+            if (self.stage == 0){
+                var effects = {
+					"catnipMax": 0,
+					"woodMax": 150,
+					"mineralsMax": 200,
+					"coalMax": 30,
+					"ironMax": 25,
+					"titaniumMax": 10,
+					"goldMax": 5
+				};
+	
+				if (game.workshop.get("silos").researched){
+					effects["catnipMax"] = 750;
+				}
+	
+				self.effects = game.resPool.addBarnWarehouseRatio(effects);
+            } else if (self.stage == 1){
+                var effects = {
+					"moonBaseStorageBonus": 0.01,
+					"planetCrackerStorageBonus": 0.01 ,
+					"cryostationStorageBonus": 0.01,
+					"energyConsumption": 40	
+                };
+                stageMeta.effects = effects;
+            }
+			
 		},
 		flavor: $I("buildings.warehouse.flavor"),
 		unlockScheme: {
@@ -2217,6 +2258,17 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 						isTemporary: true //can't exploit buy manipulating pollution in postApocalypse
 					});
 		}
+		/**
+		 * Spaceport will use a much steper price ratio for starcharts to be a dedicated starchart sinker
+		 */
+		if (bld.get("name") == "warehouse" && bld.get("stage") == 1){
+			for (var i = 0; i < prices.length; i++) {
+				if (prices[i].name == "starcharts"){
+					prices[i].val = prices[i].val * Math.pow(1.6, bld.get("val"));
+				}
+			}
+		}
+
 		return prices;
 	 },
 
@@ -2771,7 +2823,7 @@ dojo.declare("classes.ui.btn.BuildingBtnModernController", com.nuclearunicorn.ga
 		return !this.game.opts.hideSell;
 	},
 
-    build: function(model, maxBld){
+    build: function(model, opts){
 		var counter = this.inherited(arguments);
 
 		//update stats
@@ -2876,28 +2928,33 @@ dojo.declare("classes.ui.btn.StagingBldBtnController", classes.ui.btn.BuildingBt
 
 	downgrade: function(model) {
 		if (this.game.opts.noConfirm) {
-			this.deltagrade(this, model, -1);
+			this.deltagrade(model, -1);
 		} else {
 			var self = this;
 			this.game.ui.confirm("", $I("buildings.downgrade.confirmation.msg"), function() {
-				self.deltagrade(self, model, -1);
+				self.deltagrade.apply(self, model, -1);
 			});
 		}
 	},
 
 	upgrade: function(model) {
 		if (this.game.opts.noConfirm) {
-			this.deltagrade(this, model, +1);
+			this.deltagrade(model, +1);
 		} else {
 			var self = this;
 			this.game.ui.confirm("", $I("buildings.upgrade.confirmation.msg"), function() {
-				self.deltagrade(self, model, +1);
+				self.deltagrade.apply(self, model, +1);
 			});
 		}
 	},
 
-	deltagrade: function(self, model, delta) {
-		var metadataRaw = self.getMetadataRaw(model);
+	/**
+	 * Upgrade or downgrade building 
+	 * @param {*} model 
+	 * @param {*} delta 
+	 */
+	deltagrade: function(model, delta) {
+		var metadataRaw = this.getMetadataRaw(model);
 		var undo = this.game.registerUndoChange();
 		undo.addEvent("building", {
 			action:"deltagrade",
@@ -2911,7 +2968,7 @@ dojo.declare("classes.ui.btn.StagingBldBtnController", classes.ui.btn.BuildingBt
 				metaId: model.options.building,
 				val: metadataRaw.val
 			});
-			self.sellInternal(model, 0, false /*requireSellLink*/);
+			this.sellInternal(model, 0, false /*requireSellLink*/);
 		}
 		metadataRaw.stage += delta;
 		if (!metadataRaw.stage) {metadataRaw.stage = Math.max(0, delta);}
@@ -2919,10 +2976,10 @@ dojo.declare("classes.ui.btn.StagingBldBtnController", classes.ui.btn.BuildingBt
 		metadataRaw.val = 0;	//TODO: fix by using separate value flags
 		metadataRaw.on = 0;
 		if (metadataRaw.calculateEffects){
-			metadataRaw.calculateEffects(metadataRaw, self.game);
+			metadataRaw.calculateEffects(metadataRaw, this.game);
 		}
-		self.game.upgrade(metadataRaw.upgrades);
-		self.game.render();
+		this.game.upgrade(metadataRaw.upgrades);
+		this.game.render();
 	},
 
 	getMetadataRaw: function(model) {
diff --git a/js/jsx/map.jsx.js b/js/jsx/map.jsx.js
deleted file mode 100644
index 7015447eb5..0000000000
--- a/js/jsx/map.jsx.js
+++ /dev/null
@@ -1,297 +0,0 @@
-WMapTile = React.createClass({
-    getInitialState: function() {
-        return {
-            isFocused: false
-        };
-    },
-    
-    getDefaultProperties: function(){
-        return {
-            x: 0,
-            y: 0,
-            data: {
-                level: 0,
-                cp: 0
-            },
-            onMouseDown: null,
-            onMouseUp: null,
-            scale: 0,
-            isSelected: false,
-            isActive: false
-        };
-    },
-
-    render: function(){
-        var data = this.props.data || {
-            level: 0,
-            cp: 0
-        };
-
-        var toLevel = game.village.map.toLevel(this.props.x, this.props.y);
-        var percentExplored = (data.cp / toLevel) * 100;
-
-
-        var tileClass = "";
-        var fillBracket = percentExplored / 10;     //100/10 where 100 is xp to level (vary), 10 is 10% increments from 0% to 90%
-        /*if (fillBracket > 0){
-            tileClass = " dots-" + Math.round(fillBracket);
-        }*/
-
-        if (this.state.isFocused){
-            tileClass += " focused";
-        }
-        if (this.props.isSelected){
-            tileClass += " selected";
-        }
-        if (this.props.isActive){
-            tileClass += " active";
-        }
-
-        if(!data.unlocked){
-            tileClass += " locked";
-        }
-
-        var scale = (1 - this.props.scale/2);
-
-        return $r("div", {
-            className: "map-cell" + tileClass,
-            onClick: this.onClick,
-            onMouseOver: this.onMouseOver, 
-            onMouseOut: this.onMouseOut,
-
-            style: {
-                //backgroundColor: "rgb(" + (255 - 7*data.level) + ","  + (255 - 20*data.level) + ",255, 0.6)",
-                backgroundColor: "rgb(255,"  + (200 - 20*data.level) + ",50, 0.6)",
-                width: (35 * scale) + "px",
-                height: (35 * scale) + "px"
-            }
-        },
-            /*$r("svg", null, 
-                $r("rect", {style: {fill: "url(#dots-" + Math.round(fillBracket) + ") #aaa"}})
-            ),*/
-
-            $r("span", {className: "coord"}, this.state.isFocused ? "[" + this.props.x + "," + this.props.y + "]" : "..."),
-            data && $r("div", {className: "label"}, data.title),
-            data.cp ? $r("progress", {value: percentExplored, max: 100}): null,
-            this.state.isFocused && 
-                ($r("div", {className: "tooltip-content"}, 
-                    [data ? 
-                        $r("div", {className: "label"}, [
-                            data.type && $r("div", null, "Terrain:" + data.type),
-                            $r("div", null, "lv." + data.level + " ["+ data.cp.toFixed() + "/" + toLevel.toFixed() + "cp]("+ percentExplored.toFixed() + "%)")
-                        ]) 
-                        : $r("div", {className: "label"}, "Nothing interesting here")]
-                ))
-        );
-    },
-
-    onClick: function(e){
-        this.props.onClick(e, this.props.x, this.props.y);
-    },
-
-    onMouseOver: function(){
-        this.setState({isFocused: true});
-        this.props.onFocus(this.props.x, this.props.y);
-    },
-
-    onMouseOut: function(){
-        this.setState({isFocused: false});
-        this.props.onBlur(this.props.x, this.props.y);
-    }
-});
-
-WMapViewport = React.createClass({
-    getDefaultProperties: function(){
-        return {dataset: {}, exploredLevel: 0};
-    },
-    getInitialState: function(){
-        return {
-            dataset: this.props.dataset, 
-            focusedNode: null,
-            selectedNode: game.village.map.selectedNode,
-            expeditionNode: game.village.map.expeditionNode
-        };
-    },
-
-    render: function(){
-        var expLevel = this.props.exploredLevel;
-
-        var scale = 0;   
-        if (expLevel > 10){
-            scale = 0.2;
-        }    
-        if (expLevel > 50){
-            scale = 0.4;
-        } 
-        if (expLevel > 100){
-            scale = 0.6;
-        } 
-        /*if (expLevel > 15){
-            scale = 0.8;
-        }*/
-
-        var selectedNode = this.state.selectedNode,
-            expeditionNode = this.state.expeditionNode;
-
-        var rows = [];
-        for (var i = 0; i < 7 * (1+scale); i++){
-
-            var cells = [];
-            for (var j = 0; j < 7 * (1+scale); j++){
-                var isNodeSelected = selectedNode && (selectedNode.x == i && selectedNode.y == j);
-                var isNodeActive = expeditionNode && (expeditionNode.x == i && expeditionNode.y == j);
-                cells.push(
-                    $r(WMapTile, {x: i, y: j, 
-                        data: this.state.dataset[i+"_"+j],
-                        onClick: this.onClick,
-                        onFocus: this.onFocus,
-                        onBlur: this.onBlur,
-                        scale: scale,
-                        isSelected: isNodeSelected,
-                        isActive: isNodeActive
-                    })
-                );
-            }
-
-            var row = $r("div", {className: "map-row"}, cells);
-            rows.push(row);
-        }
-        
-        var nodeBlock = null;
-        if (selectedNode){
-            var x = selectedNode.x,
-                y = selectedNode.y,
-                data = this.getTileData(x, y);
-
-            var toLevel = game.village.map.toLevel(x, y);
-            var percentExplored = (data.cp / toLevel) * 100;
-
-
-            nodeBlock = $r("div", null, [
-                "[" + x + "," + y + "]",
-                $r("div", null, "lv." + data.level + " ["+ data.cp.toFixed() + "/" + toLevel.toFixed() + "cp]("+ percentExplored.toFixed() + "%)"),
-                $r("div", null, "Exp. cost:" + this.getExplorationPrice(x, y).toFixed(2) + " cp/sec"),
-                $r("div", {className: "btn nosel modern"}, 
-                    $r("div", {className: "btnContent", onClick: this.startExpedition}, "Explore")
-                )
-            ]);
-        }
-
-
-        return $r("div", {className:"map-container"},[
-            $r("div", {className:"map-viewport"}, 
-                rows
-            ),
-            $r("div", {className:"map-dashboard"},
-                /*$r("div", null, "Expedition supplies: 100%"),*/
-                $r("div", null, "Map region:"),
-                selectedNode ? 
-                    nodeBlock : "N/A"
-            )
-        ]);
-    },
-
-    onClick: function(e, x, y){
-        var selectedNode = {x: x, y: y};
-        this.setState({selectedNode: selectedNode});
-        game.village.map.selectedNode = selectedNode;
-    },
-
-    onFocus: function(x, y){
-        this.setState({focusedNode: {x: x, y: y}});
-    },
-
-    onBlur: function(x, y){
-        var focusedNode = this.state.focusedNode;
-        if (focusedNode && focusedNode.x == x && focusedNode.y == y){
-            this.setState({focusedNode: null});
-        }
-    },
-
-    componentDidMount: function(){
-        this._handler = dojo.subscribe("ui/update", function(game){
-            this.update();
-        }.bind(this));
-    },
-
-    componentWillUnmount: function(){
-        if (this._handler){
-            dojo.unsubscribe(this._handler);
-        }
-    },
-
-    update: function(){
-        this.setState({dataset: this.state.dataset});
-    },
-
-    startExpedition: function(){
-        var selectedNode = this.state.selectedNode;
-        if (selectedNode){
-            var expeditionNode = {x: selectedNode.x, y:selectedNode.y};
-            this.setState({expeditionNode: expeditionNode});
-            game.village.map.expeditionNode = expeditionNode;
-        }
-    },
-
-    getTileData: function(x, y){
-        var dataset = this.state.dataset,
-            id = x + "_" + y;
-
-        var data = dataset[id];
-        if (!data){
-            data = {
-                level: 0, 
-                cp: 0
-            };
-            dataset[id] = data;
-        }
-        return data;
-    },
-
-    //todo: move to map
-    getExplorationPrice: function(x, y){
-        var data = this.getTileData(x,y),
-            explorePower = 1 * (1 + game.village.map.getExploreRatio()),
-            price = explorePower * Math.pow(1.01, data.level);
-        
-        return price;
-    }
-});
-
-WMapSection = React.createClass({
-    getDefaultProperties: function(){
-        return {map: game.village.map};
-    },
-
-    getInitialState: function(){
-        return {map: this.props.map};
-    },
-
-    render: function(){   
-        if (!this.state.map){
-            return null;
-        }
-
-        var map = this.state.map,
-            mapDataset = map.villageData;
-
-        return $r("div", null, [
-            $r("div", null, "Explored: " + map.exploredLevel + "% (Price reduction: " + (map.getPriceReduction() * 100).toFixed(3) + "%)"),
-            $r("div", null, "Exploration bonus: " + (map.getExploreRatio() * 10).toFixed() + "%"),
-            $r("a", {className:"link", href:"#", onClick: this.resetMap}, "Reset map"),
-            $r(WMapViewport, {dataset: mapDataset, exploredLevel: map.exploredLevel})
-        ]);
-    },
-
-    componentDidMount: function(){
-        var self = this;
-        dojo.subscribe("ui/update", function(game){
-            self.setState({map: game.village.map});
-        });
-    },
-
-    resetMap: function(){
-        game.village.map.resetMap();
-        game.render();  //some messy case here
-    }
-});
\ No newline at end of file
diff --git a/js/science.js b/js/science.js
index 337069bb8c..0acdffde5d 100644
--- a/js/science.js
+++ b/js/science.js
@@ -641,7 +641,8 @@ dojo.declare("classes.managers.ScienceManager", com.nuclearunicorn.core.TabManag
 		],
 		unlocks: {
 			upgrades: ["eludiumCracker", "eludiumReflectors", "eludiumHuts", "mWReactor" /*, "eludiumDrill"*/],
-			crafts: ["eludium"]
+			crafts: ["eludium"],
+			stages: [{bld:"warehouse", stage:1}],
 		}
 	},
 	{
diff --git a/res/i18n/en.json b/res/i18n/en.json
index 03abefeec4..62f95419b2 100644
--- a/res/i18n/en.json
+++ b/res/i18n/en.json
@@ -204,6 +204,9 @@
     "buildings.smelter.flavor": "Watch your whiskers!",
     "buildings.solarfarm.label": "Solar Farm",
     "buildings.solarfarm.desc": "Provides an additional source of energy depending on the seasons.",
+    "buildings.spaceport.label": "Spaceport",
+    "buildings.spaceport.desc": "Increases the storage capacity of buildings in space by 1%, but consumes starcharts for each building affected.  Does not affect science or antimatter.",
+    "buildings.spaceport.flavor": "I want the fancy yarn imported from Yarn.",
     "buildings.steamworks.label": "Steamworks",
     "buildings.steamworks.desc": "When active, significantly reduces your coal production. Does nothing useful by default, but can do a lot of cool stuff once upgraded.",
     "buildings.steamworks.flavor": "I just nap here and it looks like I'm working",
@@ -1182,8 +1185,8 @@
     "science.acoustics.label": "Acoustics",
     "science.acoustics.desc": "Acoustics is the study of sound. Though not obviously useful, in a long run it may benefit civilizations thriving for cultural and religious development.",
     "science.acoustics.effectDesc": "Unlocks Chapels",
-    "science.advExogeology.label": "Advanced Exogeology",
-    "science.advExogeology.desc": "Advanced Exogeology studies new methods of unobtainium processing",
+    "science.advExogeology.label": "Exometallurgy",
+    "science.advExogeology.desc": "Exometallurgy studies new methods of unobtainium processing",
     "science.advExogeology.effectDesc": "Unlocks Eludium and Eludium upgrades",
     "science.agriculture.label": "Agriculture",
     "science.agriculture.desc": "The basis of all civilised life, Agriculture allows the working of land for food. Agriculture can significantly improve your food production.",
diff --git a/test/game.test.js b/test/game.test.js
index 05814aedd4..38b3b462a1 100644
--- a/test/game.test.js
+++ b/test/game.test.js
@@ -53,6 +53,15 @@ const _build = (id, val) => {
     controller.build(model, val);
 };
 
+const _get = (id) => {
+    let controller = new classes.ui.btn.StagingBldBtnController(game);
+    let model = controller.fetchModel({
+        key: id,
+        building: id
+    });
+    return model;
+}
+
 //----------------------------------
 //  Basic building and unlocks
 //  Effects and metadata processing
@@ -408,4 +417,34 @@ test("Queue should correctly add and remove items", () => {
 
     //console.error(queue.queueItems);
     expect(queue.queueItems[1].value).toBe(11);
+});
+
+//--------------------------------
+//      Spaceport test
+//--------------------------------
+
+test("Spaceports should be unlocked correctly and have a custom price logic applied", () => {
+    game.science.get("advExogeology").researched = true;
+    game.update();
+
+
+    let controller = new classes.ui.btn.StagingBldBtnController(game);
+    let model = controller.fetchModel({
+        key: "warehouse",
+        building: "warehouse"
+    });
+    controller.deltagrade(model, 1);
+    expect(game.bld.get("warehouse").stage).toBe(1);
+    expect(_get("warehouse").prices.find(price => price.name == "starcharts").val).toBe(100000);
+
+
+    //do not check prices
+    game.devMode = true;
+    _build("warehouse",10);
+    expect(game.bld.get("warehouse").val).toBe(10);
+
+    game.update();
+    expect(Math.round(_get("warehouse").prices.find(price => price.name == "titanium").val)).toBe(40456);
+    //starchart price should skyroket due to the custom price ratio
+    expect(Math.round(_get("warehouse").prices.find(price => price.name == "starcharts").val)).toBe(44481378);
 });
\ No newline at end of file
diff --git a/test/setup.js b/test/setup.js
index 851657ae53..044d5db2dd 100644
--- a/test/setup.js
+++ b/test/setup.js
@@ -102,7 +102,6 @@ try {
     require("../js/math");
     require("../game");
     require("../js/jsx/left.jsx");
-    require("../js/jsx/map.jsx");
     require("../js/ui");
     require("../js/toolbar");
 

From 57ef510d36a9a0d99fd8c8032dc9df4f7b3b6420 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 4 Sep 2023 11:04:38 -0400
Subject: [PATCH 05/63] Fix that deltagrading would fail if noConfirm was false

---
 js/buildings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/buildings.js b/js/buildings.js
index 4e87fc45a4..2d954d5f80 100644
--- a/js/buildings.js
+++ b/js/buildings.js
@@ -2932,7 +2932,7 @@ dojo.declare("classes.ui.btn.StagingBldBtnController", classes.ui.btn.BuildingBt
 		} else {
 			var self = this;
 			this.game.ui.confirm("", $I("buildings.downgrade.confirmation.msg"), function() {
-				self.deltagrade.apply(self, model, -1);
+				self.deltagrade.apply(self, [model, -1]);
 			});
 		}
 	},
@@ -2943,7 +2943,7 @@ dojo.declare("classes.ui.btn.StagingBldBtnController", classes.ui.btn.BuildingBt
 		} else {
 			var self = this;
 			this.game.ui.confirm("", $I("buildings.upgrade.confirmation.msg"), function() {
-				self.deltagrade.apply(self, model, +1);
+				self.deltagrade.apply(self, [model, +1]);
 			});
 		}
 	},

From 3897c8d8779d5dcf0172e51ac350d15158ea6980 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 4 Sep 2023 11:08:42 -0400
Subject: [PATCH 06/63] Fix prices of Spaceport building

---
 js/buildings.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/js/buildings.js b/js/buildings.js
index 2d954d5f80..0e470b4bc3 100644
--- a/js/buildings.js
+++ b/js/buildings.js
@@ -804,15 +804,14 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 					{ name: "eludium", val: 500 },
 					{ name: "kerosene", val: 1000 },
 					{ name: "blueprint", val: 500 },
-					{ name: "starcharts", val: 100000 },
+					{ name: "starchart", val: 100000 },
 				],
 				priceRatio: 1.15,
 				effects: {
 					"moonBaseStorageBonus": 0,
 					"planetCrackerStorageBonus": 0,
 					"cryostationStorageBonus": 0,
-					"energyConsumption": 0,
-					"starchartPerTickCon": 0
+					"energyConsumption": 0
 				},
 				stageUnlocked: true,
 				togglable: true
@@ -2263,7 +2262,7 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 		 */
 		if (bld.get("name") == "warehouse" && bld.get("stage") == 1){
 			for (var i = 0; i < prices.length; i++) {
-				if (prices[i].name == "starcharts"){
+				if (prices[i].name == "starchart"){
 					prices[i].val = prices[i].val * Math.pow(1.6, bld.get("val"));
 				}
 			}

From bf61dc80d3aba6613eb689dc49328a9a44bbd842 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 4 Sep 2023 11:09:53 -0400
Subject: [PATCH 07/63] Fix that Warehouse effects didn't work

---
 js/buildings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/buildings.js b/js/buildings.js
index 0e470b4bc3..6992b5d72a 100644
--- a/js/buildings.js
+++ b/js/buildings.js
@@ -834,7 +834,7 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 					effects["catnipMax"] = 750;
 				}
 	
-				self.effects = game.resPool.addBarnWarehouseRatio(effects);
+				stageMeta.effects = game.resPool.addBarnWarehouseRatio(effects);
             } else if (self.stage == 1){
                 var effects = {
 					"moonBaseStorageBonus": 0.01,

From 76eb52805bfa1d72ed299c89ae7a64a4544f0b79 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 4 Sep 2023 11:16:13 -0400
Subject: [PATCH 08/63] Tweak descriptions a bit

---
 game.js          | 13 +++++++++++++
 res/i18n/en.json |  5 ++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/game.js b/game.js
index 0c0a63479f..773d125049 100644
--- a/game.js
+++ b/game.js
@@ -1062,6 +1062,19 @@ dojo.declare("com.nuclearunicorn.game.EffectsManager", null, {
                 title: $I("effectsMgr.statics.queueCap"),
                 type: "fixed"
 			},
+			//Spaceports
+			"moonBaseStorageBonus": {
+				title: $I( "effectsMgr.statics.moonBaseStorageBonus.title" ),
+				type: "ratio"
+			},
+			"planetCrackerStorageBonus": {
+				title: $I( "effectsMgr.statics.planetCrackerStorageBonus.title" ),
+				type: "ratio"
+			},
+			"cryostationStorageBonus": {
+				title: $I( "effectsMgr.statics.cryostationStorageBonus.title" ),
+				type: "ratio"
+			},
 			// cycleEffects
 			"spaceElevator-prodTransferBonus": {
                 title: $I("effectsMgr.statics.spaceElevator-prodTransferBonus.title"),
diff --git a/res/i18n/en.json b/res/i18n/en.json
index 62f95419b2..bf189653f9 100644
--- a/res/i18n/en.json
+++ b/res/i18n/en.json
@@ -205,7 +205,7 @@
     "buildings.solarfarm.label": "Solar Farm",
     "buildings.solarfarm.desc": "Provides an additional source of energy depending on the seasons.",
     "buildings.spaceport.label": "Spaceport",
-    "buildings.spaceport.desc": "Increases the storage capacity of buildings in space by 1%, but consumes starcharts for each building affected.  Does not affect science or antimatter.",
+    "buildings.spaceport.desc": "Increases the storage capacity of buildings in space by 1%. Does not affect science or antimatter.",
     "buildings.spaceport.flavor": "I want the fancy yarn imported from Yarn.",
     "buildings.steamworks.label": "Steamworks",
     "buildings.steamworks.desc": "When active, significantly reduces your coal production. Does nothing useful by default, but can do a lot of cool stuff once upgraded.",
@@ -381,6 +381,7 @@
     "effectsMgr.statics.crackerRatio.title": "Cracker bonus",
     "effectsMgr.statics.craftRatio.title": "Craft bonus",
     "effectsMgr.statics.cryochamberSupport.title": "Cryochamber support",
+    "effectsMgr.statics.cryostationStorageBonus.title": "Cryostation capacity bonus",
     "effectsMgr.statics.cryostation-coalMax.title": "Cryostation - Max Coal",
     "effectsMgr.statics.cryostation-ironMax.title": "Cryostation - Max Iron",
     "effectsMgr.statics.cryostation-mineralsMax.title": "Cryostation - Max Minerals",
@@ -461,6 +462,7 @@
     "effectsMgr.statics.manuscriptCost.title": "Manuscript {0} cost",
     "effectsMgr.statics.maxKittens.title": "Kittens",
     "effectsMgr.statics.maxKittensRatio.title": "Max kittens ratio",
+    "effectsMgr.statics.moonBaseStorageBonus.title": "Moon Base capacity bonus",
     "effectsMgr.statics.moonOutpost-unobtainiumPerTickSpace.title": "Lunar Outpost - Unobtainium conversion",
     "effectsMgr.statics.mysticismBonus.title" : "Mysticism Bonus",
     "effectsMgr.statics.necrocornPerDay.pact.title": "Necrocorn consumption",
@@ -479,6 +481,7 @@
     "effectsMgr.statics.pactGlobalResourceRatio.title": "Storage per pyramid",
     "effectsMgr.statics.pollutionRatio.title": "Pollution production",
     "effectsMgr.statics.policyFakeBought.title": "1.25 policy cost multiplier",
+    "effectsMgr.statics.planetCrackerStorageBonus.title": "Planet Cracker capacity bonus",
     "effectsMgr.statics.planetCracker-uraniumPerTickSpace.title": "Planet Cracker - Uranium conversion",
     "effectsMgr.statics.priceRatio.title": "Building's prices",
     "effectsMgr.statics.prodTransferBonus.title": "Transferred cath production bonus",

From 987634028bb00e67c158474164e4766125c1e2f1 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 4 Sep 2023 11:27:06 -0400
Subject: [PATCH 09/63] Add back in the part where spaceports affect space
 storage

---
 js/buildings.js |  3 +++
 js/space.js     | 38 ++++++++++++++++++++------------------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/js/buildings.js b/js/buildings.js
index 6992b5d72a..0a9ed0ba2c 100644
--- a/js/buildings.js
+++ b/js/buildings.js
@@ -846,6 +846,9 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
             }
 			
 		},
+		upgrades: {
+			spaceBuilding: ["moonBase", "planetCracker", "cryostation"]
+		},
 		flavor: $I("buildings.warehouse.flavor"),
 		unlockScheme: {
 			name: "minimalist",
diff --git a/js/space.js b/js/space.js
index 0145b626ce..46ebc72eb9 100644
--- a/js/space.js
+++ b/js/space.js
@@ -393,15 +393,16 @@ dojo.declare("classes.managers.SpaceManager", com.nuclearunicorn.core.TabManager
 				"energyConsumption" : 0
 			},
 			calculateEffects: function(self, game){
+				var spaceportRatio = 1 + game.getEffect( "moonBaseStorageBonus" );
 				var effects = {
-					"catnipMax"         : 45000,
-					"woodMax"           : 25000,
-					"mineralsMax"       : 30000,
-					"coalMax"           : 3500,
-					"ironMax"           : 9000,
-					"titaniumMax"       : 1250,
-					"oilMax"            : 3500,
-					"unobtainiumMax"    : 150,
+					"catnipMax"         : 45000 * spaceportRatio,
+					"woodMax"           : 25000 * spaceportRatio,
+					"mineralsMax"       : 30000 * spaceportRatio,
+					"coalMax"           : 3500 * spaceportRatio,
+					"ironMax"           : 9000 * spaceportRatio,
+					"titaniumMax"       : 1250 * spaceportRatio,
+					"oilMax"            : 3500 * spaceportRatio,
+					"unobtainiumMax"    : 150 * spaceportRatio,
 					"energyConsumption" : 0
 				};
 				effects["energyConsumption"] = game.workshop.get("amBases").researched ? 5 : 10;
@@ -440,7 +441,7 @@ dojo.declare("classes.managers.SpaceManager", com.nuclearunicorn.core.TabManager
 			calculateEffects: function (self, game){
 				self.effects = {
 					"uraniumPerTickSpace" : 0.3 * (1 + game.getEffect("crackerRatio")),
-					"uraniumMax" : 1750
+					"uraniumMax" : 1750 * (1 + game.getEffect("planetCrackerStorageBonus"))
 				};
 			}
         },{
@@ -661,16 +662,17 @@ dojo.declare("classes.managers.SpaceManager", com.nuclearunicorn.core.TabManager
 				"unobtainiumMax": 0
 			},
             calculateEffects: function(self, game){
+				var ratio = 1 + game.getEffect("cryostationStorageBonus");
 				self.effects = {
-					"woodMax"       : 200000,
-					"mineralsMax"   : 200000,
-					"coalMax"       : 25000,
-					"ironMax"       : 50000,
-					"titaniumMax"   : 7500,
-					//"oilMax"        : 25000,
-					"oilMax"        : 7500,
-					"uraniumMax"    : 5000,
-					"unobtainiumMax": 750
+					"woodMax"       : 200000 * ratio,
+					"mineralsMax"   : 200000 * ratio,
+					"coalMax"       : 25000 * ratio,
+					"ironMax"       : 50000 * ratio,
+					"titaniumMax"   : 7500 * ratio,
+					//"oilMax"        : 25000 * ratio,
+					"oilMax"        : 7500 * ratio,
+					"uraniumMax"    : 5000 * ratio,
+					"unobtainiumMax": 750 * ratio
 				};
             },
 			unlockScheme: {

From b8e60ef2b45901d889bb64eb7d7b8603f968476f Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 4 Sep 2023 11:30:17 -0400
Subject: [PATCH 10/63] Update test to check for proper price

---
 test/game.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/game.test.js b/test/game.test.js
index 38b3b462a1..54f1dc66f5 100644
--- a/test/game.test.js
+++ b/test/game.test.js
@@ -435,7 +435,7 @@ test("Spaceports should be unlocked correctly and have a custom price logic appl
     });
     controller.deltagrade(model, 1);
     expect(game.bld.get("warehouse").stage).toBe(1);
-    expect(_get("warehouse").prices.find(price => price.name == "starcharts").val).toBe(100000);
+    expect(_get("warehouse").prices.find(price => price.name == "starchart").val).toBe(100000);
 
 
     //do not check prices

From 6e6eabb0e5165710237639472cf9ae6aafc92b03 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 4 Sep 2023 11:31:22 -0400
Subject: [PATCH 11/63] Update test to check for proper price

---
 test/game.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/game.test.js b/test/game.test.js
index 54f1dc66f5..ceaf877c8c 100644
--- a/test/game.test.js
+++ b/test/game.test.js
@@ -446,5 +446,5 @@ test("Spaceports should be unlocked correctly and have a custom price logic appl
     game.update();
     expect(Math.round(_get("warehouse").prices.find(price => price.name == "titanium").val)).toBe(40456);
     //starchart price should skyroket due to the custom price ratio
-    expect(Math.round(_get("warehouse").prices.find(price => price.name == "starcharts").val)).toBe(44481378);
+    expect(Math.round(_get("warehouse").prices.find(price => price.name == "starchart").val)).toBe(44481378);
 });
\ No newline at end of file

From 6eb2428effac0a59c7ec96889cb5575243f0a8c8 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 4 Sep 2023 11:38:18 -0400
Subject: [PATCH 12/63] Ugly hack for spaceport dependency ordering

---
 game.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/game.js b/game.js
index 773d125049..ffe57729d7 100644
--- a/game.js
+++ b/game.js
@@ -4972,6 +4972,7 @@ dojo.declare("com.nuclearunicorn.game.ui.GamePage", null, {
 				pacts: this.religion.pactsManager.pacts.map(getName),
 				challenges: this.challenges.challenges.map(getName)
 			};
+		this.upgrade({ buildings: ["warehouse"]});
 		this.upgrade(metaKeys);
 		this.upgrade({policies: ["authocracy"]});
 	},

From 46ed3942033e1bb2065d181dd003e46063f1f464 Mon Sep 17 00:00:00 2001
From: Arima B <cheshire.panther@gmail.com>
Date: Wed, 27 Sep 2023 09:11:50 +0000
Subject: [PATCH 13/63] Merged in chore/tabindex (pull request #1230)

Support tabindex and keyboard navigation for buttons

* basic tabIndex support

* fix gear icon toggle + some css tweaks

* fix tab toggling gear icon

* toggle option for collapsible groups
---
 core.js                     | 19 ++++++++++++++++++-
 index.html                  |  8 ++++----
 js/jsx/left.jsx.js          | 33 +++++++++++++++++++++++++++++----
 kg-workspace.code-workspace | 18 +++++++++++++++++-
 res/default.css             |  6 +++++-
 5 files changed, 73 insertions(+), 11 deletions(-)

diff --git a/core.js b/core.js
index 34c9a078b4..706ba1bfc3 100644
--- a/core.js
+++ b/core.js
@@ -851,7 +851,8 @@ dojo.declare("com.nuclearunicorn.game.ui.Button", com.nuclearunicorn.core.Contro
 			style: {
 				position: "relative",
 				display: this.model.visible ? "block" : "none"
-			}
+			},
+			tabIndex: 0
 		}, btnContainer);
 
 		if (this.model.twoRow) {
@@ -879,6 +880,7 @@ dojo.declare("com.nuclearunicorn.game.ui.Button", com.nuclearunicorn.core.Contro
 		this.updateVisible();
 
 		dojo.connect(this.domNode, "onclick", this, "onClick");
+		dojo.connect(this.domNode, "onkeypress", this, "onKeyPress");
 
 		this.afterRender();
 	},
@@ -906,6 +908,12 @@ dojo.declare("com.nuclearunicorn.game.ui.Button", com.nuclearunicorn.core.Contro
 
 	},
 
+	onKeyPress: function(event){
+		if (event.key == "Enter"){
+			this.onClick(event);
+		}
+	},
+
 	afterRender: function(){
 
 		var prices = this.model.prices;
@@ -2256,6 +2264,7 @@ dojo.declare("com.nuclearunicorn.game.ui.Panel", [com.nuclearunicorn.game.ui.Con
 
 		this.toggle = dojo.create("div", {
 			innerHTML: this.collapsed ? "+" : "-",
+			tabIndex: 0,
 			className: "toggle" + (this.collapsed ? " collapsed" : ""),
 			style: {
 				float: "right"
@@ -2277,6 +2286,7 @@ dojo.declare("com.nuclearunicorn.game.ui.Panel", [com.nuclearunicorn.game.ui.Con
 		dojo.connect(this.toggle, "onclick", this, function(){
 			this.collapse(!this.collapsed);
 		});
+		dojo.connect(this.toggle, "onkeypress", this, "onKeyPress");
 
 		this.panelDiv = panel;
 
@@ -2288,6 +2298,13 @@ dojo.declare("com.nuclearunicorn.game.ui.Panel", [com.nuclearunicorn.game.ui.Con
 		return this.contentDiv;
 	},
 
+
+	onKeyPress: function(event){
+		if (event.key == "Enter"){
+			this.collapse(!this.collapsed);
+		}
+	},
+
 	collapse: function(isCollapsed){
 		this.collapsed = isCollapsed;
 
diff --git a/index.html b/index.html
index 1ddee3832a..a0e91830d8 100644
--- a/index.html
+++ b/index.html
@@ -318,7 +318,7 @@
 				<div style="padding-left: 10px; min-width: 0px; max-width: 400px; overflow: hidden; text-overflow: ellipsis;">
 					<span class="gameTitle">Kittens Game </span>
 					<span style="font-size: small;">
-						by <a href="http://kittensgame.com/" class="copyright" target="_blank">bloodrizer</a>
+						by <a href="http://kittensgame.com/" class="copyright" target="_blank" tabindex="-1">bloodrizer</a>
 					</span>
 					<!--- a Dark Souls of incremental gaming -->
 
@@ -331,9 +331,9 @@
 					</span>
 
 					<span style="font-size: small;">
-						<a href="http://kittensgame.com/alpha" title="experimental, unstable" target="_blank" style="opacity:0.6;">&alpha;</a>
-						<a href="http://kittensgame.com/beta" title="experimental, stable" target="_blank">&beta;</a>
-						<a href="http://kittensgame.com/web" title="RC, nighty build" target="_blank">ML</a>
+						<a href="http://kittensgame.com/alpha" tabindex="0" title="experimental, unstable" target="_blank" style="opacity:0.6;">&alpha;</a>
+						<a href="http://kittensgame.com/beta" tabindex="0" title="experimental, stable" target="_blank">&beta;</a>
+						<a href="http://kittensgame.com/web" tabindex="0" title="RC, nighty build" target="_blank">ML</a>
 					</span>
 				</div>
 
diff --git a/js/jsx/left.jsx.js b/js/jsx/left.jsx.js
index 8b2e3b005d..e79e73089c 100644
--- a/js/jsx/left.jsx.js
+++ b/js/jsx/left.jsx.js
@@ -573,7 +573,9 @@ WResourceTable = React.createClass({
                 $r("div", {className:"res-toolbar right"}, 
                     $r("a", {
                         className: "link" + (this.state.isEditMode ? " toggled" : ""), 
-                        onClick: this.toggleEdit
+                        onClick: this.toggleEdit,
+                        onKeyDown: this.onKeyDown,
+                        tabIndex: 0
                     }, "⚙"),
                     $r(WTooltip, {body:"?"}, 
                         $I("left.resources.tip"))
@@ -604,6 +606,12 @@ WResourceTable = React.createClass({
         ]);
     },
 
+    onKeyDown: function(event){
+        if (event.keyCode == 13){
+            this.toggleEdit();
+        }
+    },
+
     toggleEdit: function(){
         this.setState({isEditMode: !this.state.isEditMode});
     },
@@ -663,7 +671,9 @@ WCraftTable = React.createClass({
                 $r("div", {className:"res-toolbar right"}, 
                     $r("a", {
                         className: "link" + (this.state.isEditMode ? " toggled" : ""), 
-                        onClick: this.toggleEdit
+                        onClick: this.toggleEdit,
+                        onKeyDown: this.onKeyDown,
+                        tabIndex: 0
                     }, "⚙")
                 )
             ]),
@@ -674,6 +684,12 @@ WCraftTable = React.createClass({
         ]);
     },
 
+    onKeyDown: function(event){
+        if (event.keyCode == 13){
+            this.toggleEdit();
+        }
+    },
+
     toggleEdit: function(){
         this.setState({isEditMode: !this.state.isEditMode});
     },
@@ -828,9 +844,12 @@ WTooltip = React.createClass({
     },
 
     render: function(){
-        return $r("div", {className: "tooltip-block", 
+        return $r("div", {
+            tabIndex: 0,
+            className: "tooltip-block", 
             onMouseOver: this.onMouseOver, 
-            onMouseOut: this.onMouseOut
+            onMouseOut: this.onMouseOut,
+            onKeyDown: this.onKeyDown
         }, [
             this.props.body || $r("div", {className: "tooltip-icon"}, "[?]"),
             this.state.showTooltip ? $r("div", {className: "tooltip-content"}, 
@@ -843,6 +862,12 @@ WTooltip = React.createClass({
         this.setState({showTooltip: true});
     },
 
+    onKeyDown: function(e){
+        if (e.keyCode == 13){
+            this.setState({showTooltip: !this.state.showTooltip});
+        }
+    },
+
     onMouseOut: function(){
         this.setState({showTooltip: false});
     }
diff --git a/kg-workspace.code-workspace b/kg-workspace.code-workspace
index 75422b1efb..f54fc98fe1 100644
--- a/kg-workspace.code-workspace
+++ b/kg-workspace.code-workspace
@@ -5,6 +5,22 @@
 		}
 	],
 	"settings": {
-		"jestrunner.configPath": "jest.config.unittest.json"
+		"jestrunner.configPath": "jest.config.unittest.json",
+		"files.exclude": {
+			"**/.git": true,
+			"**/.svn": true,
+			"**/.hg": true,
+			"**/CVS": true,
+			"**/.DS_Store": true,
+			"**/Thumbs.db": true,
+			"**/.apivcs": true,
+			"**/.designer.json": true,
+			"**/.exchange_modules_tmp": true,
+			"**/.exchange.xml": true,
+			"**/.gitignore": true,
+			"**/.mvn": true,
+			"**/.vscode": true,
+			".mule": true
+		}
 	}
 }
\ No newline at end of file
diff --git a/res/default.css b/res/default.css
index 09b7f8b4f0..393b4408db 100644
--- a/res/default.css
+++ b/res/default.css
@@ -139,7 +139,7 @@ div#gameLog {
 }
 
 .bldTopContainer > a, .bldTopContainer > span {
-    opacity: 0.7;
+    color: #666666;
     text-decoration: none;
 }
 
@@ -147,6 +147,10 @@ div#gameLog {
     color: black;
 }
 
+.bldTopContainer > a.activeTab {
+    color: #444444;
+}
+
 .resourceRow {
     white-space: nowrap;
 }

From 0150a8caad78d8192201e47651077c5293693efd Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 2 Oct 2023 11:43:37 -0400
Subject: [PATCH 14/63] Add automation description to Oil Well

---
 js/buildings.js  | 12 ++++++++++--
 res/i18n/en.json |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/js/buildings.js b/js/buildings.js
index 0a9ed0ba2c..8b37c157e3 100644
--- a/js/buildings.js
+++ b/js/buildings.js
@@ -1340,10 +1340,18 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 		},
 		isAutomationEnabled: null,
 		calculateEffects: function(self, game) {
+			//The upgrade that optionally increases oil prod at the cost of energy:
 			var hasPumpjack = game.workshop.get("pumpjack").researched;
 			self.togglable = hasPumpjack;
-			if (self.isAutomationEnabled == null && hasPumpjack) {
-				self.isAutomationEnabled = true;
+
+			if (hasPumpjack) {
+				self.description = $I("buildings.oilWell.desc") + "<br>" + $I("buildings.oilWell.desc.automation");
+				if (self.isAutomationEnabled == null) { //force non-null value
+					self.isAutomationEnabled = true;
+				}
+			} else {
+				self.description = $I("buildings.oilWell.desc");
+				self.isAutomationEnabled = null;
 			}
 
 			var oilRatio = 1 + game.getEffect("oilWellRatio");
diff --git a/res/i18n/en.json b/res/i18n/en.json
index bf189653f9..82164ca150 100644
--- a/res/i18n/en.json
+++ b/res/i18n/en.json
@@ -187,6 +187,7 @@
     "buildings.observatory.flavor": "Yearning to one day catch the red light fairy",
     "buildings.oilWell.label": "Oil Well",
     "buildings.oilWell.desc": "Produces a bit of oil, +1500 to maximum oil limit",
+    "buildings.oilWell.desc.automation": "Automation consumes energy for more oil production.",
     "buildings.oilWell.flavor": "Rise early, work hard, strike oil.",
     "buildings.pasture.label": "Pasture",
     "buildings.pasture.desc": "Provides an alternative source of food, which reduces catnip consumption.",

From efb1bcf6fe9c9e661d6fc49eea719ceae0b9ffab Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 2 Oct 2023 11:50:37 -0400
Subject: [PATCH 15/63] Minor tweak to line break on Temporal Accelerator

---
 js/time.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/time.js b/js/time.js
index 3ace07db93..178ae7578e 100644
--- a/js/time.js
+++ b/js/time.js
@@ -388,7 +388,7 @@ dojo.declare("classes.managers.TimeManager", com.nuclearunicorn.core.TabManager,
     },{
         name: "temporalAccelerator",
         label: $I("time.cfu.temporalAccelerator.label"),
-        description: $I("time.cfu.temporalAccelerator.desc") +"\n" + $I("time.cfu.temporalAccelerator.desc2"),
+        description: $I("time.cfu.temporalAccelerator.desc") + "<br>" + $I("time.cfu.temporalAccelerator.desc2"),
         prices: [
             { name : "timeCrystal", val: 10 },
             { name : "relic", val: 1000 }

From 71657641995551ac532b6f6aae87f776cb22fe41 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 2 Oct 2023 12:08:13 -0400
Subject: [PATCH 16/63] Add automation description for calciner

---
 js/buildings.js  | 8 ++++++--
 res/i18n/en.json | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/js/buildings.js b/js/buildings.js
index 8b37c157e3..65edc45c2d 100644
--- a/js/buildings.js
+++ b/js/buildings.js
@@ -1107,8 +1107,12 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 			self.effects["steelPerTickProd"] = 0;
 
 			var steelRatio = game.getEffect("calcinerSteelRatio");
-			if (steelRatio != 0){
-
+			if (steelRatio == 0) {
+				self.description = $I("buildings.calciner.desc");
+				self.isAutomationEnabled = null;
+			} else {
+				self.description = $I("buildings.calciner.desc") + "<br>" +
+					$I("buildings.calciner.desc.automation", [(100 * steelRatio).toFixed()]);
 				if (self.isAutomationEnabled == null) {
 					self.isAutomationEnabled = true;
 				}
diff --git a/res/i18n/en.json b/res/i18n/en.json
index 82164ca150..05f668bf90 100644
--- a/res/i18n/en.json
+++ b/res/i18n/en.json
@@ -140,6 +140,7 @@
     "buildings.broadcasttower.desc": "Generates culture and happiness. More effective with high energy production.",
     "buildings.calciner.label": "Calciner",
     "buildings.calciner.desc": "A highly effective source of metal. Consumes 1.5 minerals and 0.02 oil per tick. Produces iron and a small amount of titanium",
+    "buildings.calciner.desc.automation": "Automation converts {0}% of iron output into steel.",
     "buildings.chapel.label": "Chapel",
     "buildings.chapel.desc": "Produces a bit of culture and faith per tick. May be improved with religious upgrades",
     "buildings.chronosphere.label": "Chronosphere",

From ff3f80e07e8afb8324da7e52419bfb437690ddf6 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 2 Oct 2023 12:20:16 -0400
Subject: [PATCH 17/63] Add automation description to Factory

---
 js/buildings.js  | 2 ++
 res/i18n/en.json | 1 +
 2 files changed, 3 insertions(+)

diff --git a/js/buildings.js b/js/buildings.js
index 65edc45c2d..c9619a6a1a 100644
--- a/js/buildings.js
+++ b/js/buildings.js
@@ -1434,8 +1434,10 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 
 			effects["energyConsumption"] = 2;
 			if(game.workshop.get("carbonSequestration").researched){
+				self.description = $I("buildings.factory.desc") + "<br>" + $I("buildings.factory.desc.automation");
 				self.isAutomationEnabled = (self.isAutomationEnabled === null) ? true : self.isAutomationEnabled;
 			} else {
+				self.description = $I("buildings.factory.desc");
 				self.isAutomationEnabled = null;
 			}
 			effects["energyConsumption"] *= (self.isAutomationEnabled)? 2 : 1;
diff --git a/res/i18n/en.json b/res/i18n/en.json
index 05f668bf90..96681e3c30 100644
--- a/res/i18n/en.json
+++ b/res/i18n/en.json
@@ -149,6 +149,7 @@
     "buildings.dataCenter.desc": "Increases total effect of compendia on your max science",
     "buildings.factory.label": "Factory",
     "buildings.factory.desc": "Improves craft effectiveness",
+    "buildings.factory.desc.automation": "Automation cleans pollution from the air.",
     "buildings.field.label": "Catnip Field",
     "buildings.field.desc": "Plant some catnip to grow in the village. Fields have +50% production in Spring and -75% production in Winter",
     "buildings.field.flavor": "'Nip as far as the eye can see.",

From 3161c2c48e3eba62b7a7ad33a4f6a79698fb6b50 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 2 Oct 2023 12:32:17 -0400
Subject: [PATCH 18/63] Add automation description to Reactors

---
 js/buildings.js  | 10 ++++++++--
 res/i18n/en.json |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/js/buildings.js b/js/buildings.js
index c9619a6a1a..e23ebd8ed8 100644
--- a/js/buildings.js
+++ b/js/buildings.js
@@ -1469,8 +1469,14 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 		isAutomationEnabled: null,
 		calculateEffects: function(self, game) {
 			self.effects["uraniumPerTick"] = -0.001 * (1 - game.getEffect("uraniumRatio"));
-			if (self.isAutomationEnabled == null && game.workshop.get("thoriumReactors").researched) {
-				self.isAutomationEnabled = true;
+			if (game.workshop.get("thoriumReactors").researched) {
+				self.description = $I("buildings.reactor.desc") + "<br>" + $I("buildings.reactor.desc.automation");
+				if (self.isAutomationEnabled == null ) {
+					self.isAutomationEnabled = true; //force non-null value
+				}
+			} else {
+				self.description = $I("buildings.reactor.desc");
+				self.isAutomationEnabled = null;
 			}
 		},
 		action: function(self, game) {
diff --git a/res/i18n/en.json b/res/i18n/en.json
index 96681e3c30..b609aca80d 100644
--- a/res/i18n/en.json
+++ b/res/i18n/en.json
@@ -199,6 +199,7 @@
     "buildings.quarry.flavor": "It's full of mice! Wait, wrong 'quarry'",
     "buildings.reactor.label": "Reactor",
     "buildings.reactor.desc": "Provides a 5% boost to production while active. Requires uranium to operate.",
+    "buildings.reactor.desc.automation": "Automation consumes thorium to produce more energy.",
     "buildings.reactor.flavor": "Glowing mice are much easier to catch!",
     "buildings.refineCatnip.label": "Refine catnip",
     "buildings.refineCatnip.desc": "Refine catnip into catnip wood",

From df6ac97a669e75544efbc411be128d0ec3807b38 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 2 Oct 2023 12:40:52 -0400
Subject: [PATCH 19/63] Add automation description to Temporal Press

---
 js/time.js       | 12 ++++++++++--
 res/i18n/en.json |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/js/time.js b/js/time.js
index 178ae7578e..14e14b550a 100644
--- a/js/time.js
+++ b/js/time.js
@@ -452,9 +452,17 @@ dojo.declare("classes.managers.TimeManager", com.nuclearunicorn.core.TabManager,
             "energyConsumption": 5
         },
         calculateEffects: function(self, game){
-            if (self.isAutomationEnabled == null && game.challenges.getChallenge("1000Years").on > 1) {
-                self.isAutomationEnabled = false;
+            if (game.challenges.getChallenge("1000Years").on > 1) {
+                //Completing the challenge 2 or more times unlocks the automation feature
+                self.description = $I("time.cfu.temporalPress.desc") + "<br>" + $I("time.cfu.temporalPress.desc.automation");
+                if (self.isAutomationEnabled == null) { //force non-null value
+                    self.isAutomationEnabled = false;
+                }
+            } else {
+                self.description = $I("time.cfu.temporalPress.desc");
+                self.isAutomationEnabled = null;
             }
+
             self.effects["shatterYearBoost"] = (self.isAutomationEnabled)? 5 * game.calendar.yearsPerCycle : game.calendar.yearsPerCycle; //25 or 5 currently
             self.limitBuild = game.getEffect("temporalPressCap");
             self.priceRatio = Math.max(1.01, 1.1 - game.challenges.getChallenge("1000Years").on * 0.001); //first 90 completions of 1000Years make priceRatio cheaper
diff --git a/res/i18n/en.json b/res/i18n/en.json
index b609aca80d..36494c6975 100644
--- a/res/i18n/en.json
+++ b/res/i18n/en.json
@@ -1536,6 +1536,7 @@
     "time.cfu.temporalBattery.desc": "Improves your flux energy capacity by 25%",
     "time.cfu.temporalPress.label": "Temporal Press",
     "time.cfu.temporalPress.desc": "Allows for fine tuning of shattering",
+    "time.cfu.temporalPress.desc.automation": "Automation tweaks the custom shatter amount.",
     "time.cfu.temporalImpedance.label": "Time Impedance",
     "time.cfu.temporalImpedance.desc": "Delay effect of Dark Future temporal penalty by 1000 years.",
     "time.cfu.timeBoiler.label": "Time Boiler",

From 691277fe8b27bb6df1cef3f5ca4780fe3f177e48 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 2 Oct 2023 12:46:06 -0400
Subject: [PATCH 20/63] Add automation description to Chrono Furnace

---
 js/time.js       | 2 +-
 res/i18n/en.json | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/time.js b/js/time.js
index 14e14b550a..fae0134b23 100644
--- a/js/time.js
+++ b/js/time.js
@@ -300,7 +300,7 @@ dojo.declare("classes.managers.TimeManager", com.nuclearunicorn.core.TabManager,
     },{
         name: "blastFurnace",
         label: $I("time.cfu.blastFurnace.label"),
-        description: $I("time.cfu.blastFurnace.desc"),
+        description: $I("time.cfu.blastFurnace.desc") + "<br>" + $I("time.cfu.blastFurnace.desc2"),
         prices: [
             { name : "timeCrystal", val: 25 },
             { name : "relic", val: 5 }
diff --git a/res/i18n/en.json b/res/i18n/en.json
index 36494c6975..04a61e6db6 100644
--- a/res/i18n/en.json
+++ b/res/i18n/en.json
@@ -1527,6 +1527,7 @@
     "time.AccelerateTimeBtn.tooltip.accelerated": "Accelerated time flow",
     "time.cfu.blastFurnace.label": "Chrono Furnace",
     "time.cfu.blastFurnace.desc": "Operates on chronoheat. Increases the maximum heat limit by 100.",
+    "time.cfu.blastFurnace.desc2": "Automation skips one year into the future for each 100% of fuel consumed.",
     "time.cfu.ressourceRetrieval.label": "Resource Retrieval",
     "time.cfu.ressourceRetrieval.desc": "Retrieve part of your yearly resources when you burn TC",
     "time.cfu.temporalAccelerator.label": "Temporal Accelerator",

From 22b1618c57c6ca889b9a438f5839c50e298c074e Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 2 Oct 2023 12:59:04 -0400
Subject: [PATCH 21/63] Add automation description to Steamworks

---
 js/buildings.js  | 19 +++++++++++++++----
 res/i18n/en.json |  1 +
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/js/buildings.js b/js/buildings.js
index e23ebd8ed8..32c9bb9c6e 100644
--- a/js/buildings.js
+++ b/js/buildings.js
@@ -1219,17 +1219,28 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 				}
 			}
 			self.effects["manuscriptPerTickProd"] = amt;
+
+			//Update description to explain what automation does:
+			if (game.workshop.get("factoryAutomation").researched) {
+				self.description = $I("buildings.steamworks.desc") + "<br>" + $I("buildings.steamworks.desc.automation");
+			} else {
+				self.description = $I("buildings.steamworks.desc");
+			}
 		},
 		jammed: false,
 		togglableOnOff: true,
 		isAutomationEnabled: null,
 		action: function(self, game) {
-			if (self.on < 1 || self.jammed || !game.workshop.get("factoryAutomation").researched) {
+			if (game.workshop.get("factoryAutomation").researched) {
+				if (self.isAutomationEnabled == null) { //force non-null value
+					self.isAutomationEnabled = true;
+				}
+			} else {
+				self.isAutomationEnabled = null;
 				return;
 			}
-
-			if (self.isAutomationEnabled == null) {
-				self.isAutomationEnabled = true;
+			if (self.on < 1 || self.jammed) {
+				return;
 			}
 
 			var wood = game.resPool.get("wood");
diff --git a/res/i18n/en.json b/res/i18n/en.json
index 04a61e6db6..c7aebeaff3 100644
--- a/res/i18n/en.json
+++ b/res/i18n/en.json
@@ -213,6 +213,7 @@
     "buildings.spaceport.flavor": "I want the fancy yarn imported from Yarn.",
     "buildings.steamworks.label": "Steamworks",
     "buildings.steamworks.desc": "When active, significantly reduces your coal production. Does nothing useful by default, but can do a lot of cool stuff once upgraded.",
+    "buildings.steamworks.desc.automation": "Automation crafts some materials if they're at the limit.",
     "buildings.steamworks.flavor": "I just nap here and it looks like I'm working",
     "buildings.brewery.label": "Brewery",
     "buildings.brewery.desc": "Brew catnip into a spicy drink. Boosts festival effects.",

From 3f29afc62bbcf96c17a3b1e75fb0a5577e72e861 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 2 Oct 2023 13:06:38 -0400
Subject: [PATCH 22/63] Don't show "automation disabled" message if it's not
 unlocked yet

---
 core.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core.js b/core.js
index 34c9a078b4..3308955f54 100644
--- a/core.js
+++ b/core.js
@@ -1280,7 +1280,7 @@ ButtonModernHelper = {
 		}, tooltip);
 
 
-		if (model.metadata && model.metadata.isAutomationEnabled !== undefined){	//TODO: use proper metadata flag
+		if (model.metadata && typeof(model.metadata.isAutomationEnabled) == "boolean"){ //undefined or null don't count here
 			dojo.create("div", {
 				innerHTML: model.metadata.isAutomationEnabled ? $I("btn.aon.tooltip") : $I("btn.aoff.tooltip"),
 				className: "desc small" + (model.metadata.isAutomationEnabled ? " auto-on" : " auto-off")
@@ -1499,7 +1499,7 @@ dojo.declare("com.nuclearunicorn.game.ui.BuildingBtnController", com.nuclearunic
 				}
 			};
 		}
-		if (typeof(model.metadata.isAutomationEnabled) != "undefined" && model.metadata.isAutomationEnabled !== null) {
+		if (typeof(model.metadata.isAutomationEnabled) == "boolean") {
 			model.toggleAutomationLink = {
 				title: model.metadata.isAutomationEnabled ? "A" : "*",
 				tooltip: model.metadata.isAutomationEnabled ? $I("btn.aon.tooltip") : $I("btn.aoff.tooltip"),

From d246716b28297a217c5324ea523392ab4edf0f60 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 2 Oct 2023 13:22:45 -0400
Subject: [PATCH 23/63] Fix errors when unresearching certain upgrades

---
 core.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core.js b/core.js
index 3308955f54..abe1f22a9b 100644
--- a/core.js
+++ b/core.js
@@ -1461,6 +1461,10 @@ dojo.declare("com.nuclearunicorn.game.ui.ButtonModern", com.nuclearunicorn.game.
 
 	updateLink: function(buttonLink, modelLink) {
 		if (buttonLink) {
+			if (!modelLink) { //This only ever happens if I mess around with console commands
+				dojo.destroy(buttonLink.link);
+				return;
+			}
 			buttonLink.link.textContent = modelLink.title;
 			if (modelLink.cssClass) {buttonLink.link.className = modelLink.cssClass;}
 			if (modelLink.tooltip) {buttonLink.link.title = modelLink.tooltip;}

From bdf6ab52d612f796d2529db8b6af8c6a0886b598 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 2 Oct 2023 13:31:01 -0400
Subject: [PATCH 24/63] Tooltip updates always fetch latest description

---
 core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core.js b/core.js
index abe1f22a9b..a12f59cb2c 100644
--- a/core.js
+++ b/core.js
@@ -1275,7 +1275,7 @@ ButtonModernHelper = {
 
 		// description
 		var descDiv = dojo.create("div", {
-			innerHTML: model.description,
+			innerHTML: controller.getDescription(model),
 			className: "desc"
 		}, tooltip);
 

From 9c40005a6f81b8af13f5480a99af75af605255e0 Mon Sep 17 00:00:00 2001
From: Alma Buru <cheshire.panther@gmail.com>
Date: Wed, 11 Oct 2023 02:35:44 -0700
Subject: [PATCH 25/63] tweaking spaceport scaling

---
 js/buildings.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/buildings.js b/js/buildings.js
index 32c9bb9c6e..29f582211d 100644
--- a/js/buildings.js
+++ b/js/buildings.js
@@ -837,9 +837,9 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 				stageMeta.effects = game.resPool.addBarnWarehouseRatio(effects);
             } else if (self.stage == 1){
                 var effects = {
-					"moonBaseStorageBonus": 0.01,
-					"planetCrackerStorageBonus": 0.01 ,
-					"cryostationStorageBonus": 0.01,
+					"moonBaseStorageBonus": 0.008,
+					"planetCrackerStorageBonus": 0.008 ,
+					"cryostationStorageBonus": 0.008,
 					"energyConsumption": 40	
                 };
                 stageMeta.effects = effects;
@@ -2297,7 +2297,7 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 		if (bld.get("name") == "warehouse" && bld.get("stage") == 1){
 			for (var i = 0; i < prices.length; i++) {
 				if (prices[i].name == "starchart"){
-					prices[i].val = prices[i].val * Math.pow(1.6, bld.get("val"));
+					prices[i].val = prices[i].val * Math.pow(1.35, bld.get("val"));
 				}
 			}
 		}

From a41fc2500e41183fdb4c5a9624dfa8e69dfd0360 Mon Sep 17 00:00:00 2001
From: Alma Buru <cheshire.panther@gmail.com>
Date: Wed, 11 Oct 2023 02:46:01 -0700
Subject: [PATCH 26/63] fix unit test

---
 test/game.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/game.test.js b/test/game.test.js
index ceaf877c8c..834a9b05e6 100644
--- a/test/game.test.js
+++ b/test/game.test.js
@@ -446,5 +446,5 @@ test("Spaceports should be unlocked correctly and have a custom price logic appl
     game.update();
     expect(Math.round(_get("warehouse").prices.find(price => price.name == "titanium").val)).toBe(40456);
     //starchart price should skyroket due to the custom price ratio
-    expect(Math.round(_get("warehouse").prices.find(price => price.name == "starchart").val)).toBe(44481378);
+    expect(Math.round(_get("warehouse").prices.find(price => price.name == "starchart").val)).toBe(8134223);
 });
\ No newline at end of file

From 8c99d1b10e2228207d4017b052ddee37077b72ed Mon Sep 17 00:00:00 2001
From: Alma Buru <cheshire.panther@gmail.com>
Date: Wed, 11 Oct 2023 03:08:56 -0700
Subject: [PATCH 27/63] reducing spaceport effect even further

---
 js/buildings.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/buildings.js b/js/buildings.js
index 29f582211d..9269e3fcbc 100644
--- a/js/buildings.js
+++ b/js/buildings.js
@@ -837,9 +837,9 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 				stageMeta.effects = game.resPool.addBarnWarehouseRatio(effects);
             } else if (self.stage == 1){
                 var effects = {
-					"moonBaseStorageBonus": 0.008,
-					"planetCrackerStorageBonus": 0.008 ,
-					"cryostationStorageBonus": 0.008,
+					"moonBaseStorageBonus": 0.0075,
+					"planetCrackerStorageBonus": 0.0075 ,
+					"cryostationStorageBonus": 0.0075,
 					"energyConsumption": 40	
                 };
                 stageMeta.effects = effects;

From 07ab27a6e58a20a389a073e5f95fe2335b539871 Mon Sep 17 00:00:00 2001
From: Brent Call <tnerbcall@gmail.com>
Date: Sat, 21 Oct 2023 20:13:34 +0000
Subject: [PATCH 28/63] Merged in spaceportBalancing (pull request #1233)

Increased Spaceport effect, decreased power consumption

* Increased Spaceport effect, decreased power consumption


Approved-by: Arima B.
---
 core.js          |  8 +++++++-
 js/buildings.js  | 20 +++++++++++++-------
 res/i18n/en.json |  2 +-
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/core.js b/core.js
index 78fe5e53fd..90adaa0750 100644
--- a/core.js
+++ b/core.js
@@ -1578,8 +1578,14 @@ dojo.declare("com.nuclearunicorn.game.ui.BuildingBtnController", com.nuclearunic
 		return false;
 	},
 
+	//Called whenever we turn the building on or off.
+	//The function was previously empty, so I repurposed it for possible non-proportional calculations.
 	metadataHasChanged: function(model) {
-		// do nothing
+		var meta = model.metadata;
+		if (meta.calculateEffects){
+			meta.calculateEffects(meta, this.game);
+			this.game.calendar.cycleEffectsBasics(meta.effects, meta.name); //(Only relevant for space buildings)
+		}
 	},
 
 	off: function(model, amt) {
diff --git a/js/buildings.js b/js/buildings.js
index 9269e3fcbc..092dd156b7 100644
--- a/js/buildings.js
+++ b/js/buildings.js
@@ -836,15 +836,21 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 	
 				stageMeta.effects = game.resPool.addBarnWarehouseRatio(effects);
             } else if (self.stage == 1){
-                var effects = {
-					"moonBaseStorageBonus": 0.0075,
-					"planetCrackerStorageBonus": 0.0075 ,
-					"cryostationStorageBonus": 0.0075,
-					"energyConsumption": 40	
-                };
+			var effects = {
+					"moonBaseStorageBonus": 0.0085,
+					"planetCrackerStorageBonus": 0.0085,
+					"cryostationStorageBonus": 0.0085,
+					"energyConsumption": 5
+			};
+			if(self.on >= 10) {
+				//The first 10 Spaceports each cost 5Wt to run.
+				//The 11th Spaceport costs 6Wt to run.
+				//The 12th Spaceport costs 7Wt to run.
+				//etc.
+				effects[ "energyConsumption" ] = 0.5 * (self.on - 9) + 45 / self.on;
+			}
                 stageMeta.effects = effects;
             }
-			
 		},
 		upgrades: {
 			spaceBuilding: ["moonBase", "planetCracker", "cryostation"]
diff --git a/res/i18n/en.json b/res/i18n/en.json
index c7aebeaff3..d23ba5a759 100644
--- a/res/i18n/en.json
+++ b/res/i18n/en.json
@@ -209,7 +209,7 @@
     "buildings.solarfarm.label": "Solar Farm",
     "buildings.solarfarm.desc": "Provides an additional source of energy depending on the seasons.",
     "buildings.spaceport.label": "Spaceport",
-    "buildings.spaceport.desc": "Increases the storage capacity of buildings in space by 1%. Does not affect science or antimatter.",
+    "buildings.spaceport.desc": "Increases the storage capacity of buildings in space. Does not affect science or antimatter.",
     "buildings.spaceport.flavor": "I want the fancy yarn imported from Yarn.",
     "buildings.steamworks.label": "Steamworks",
     "buildings.steamworks.desc": "When active, significantly reduces your coal production. Does nothing useful by default, but can do a lot of cool stuff once upgraded.",

From 41a0487ab6a8fbc9c3bc5d82a883fb06cb434267 Mon Sep 17 00:00:00 2001
From: Ziggurat <ziggurat0001@protonmail.com>
Date: Wed, 25 Oct 2023 15:15:22 +0000
Subject: [PATCH 29/63] Merged in master (pull request #1234)

Redshift pacts logic bugfixes

* fix siphoning not using necrocornsNaiveFastForward
fix bug where corruption is multiplied by days and divided by ticks per day for comparison of necrocorn per day values in necrocornFastForward
---
 js/religion.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/js/religion.js b/js/religion.js
index 12be95d6b6..8bdb4d5433 100644
--- a/js/religion.js
+++ b/js/religion.js
@@ -269,19 +269,19 @@ dojo.declare("classes.managers.ReligionManager", com.nuclearunicorn.core.TabMana
 		var necrocornVal = this.game.resPool.get("necrocorn").value;
 		var corruptionWithExisting = this.game.religion.getCorruptionPerTickProduction(true);
 		var worstPerTickDelta = corruptionWithExisting * days *this.game.calendar.ticksPerDay + corruptionWithExisting;
-		if(!this.game.science.getPolicy(["siphoning"]).researched){
-			if(
-				(worstPerTickDelta >= 0)
-				||(worstPerTickDelta < 0 && necrocornVal + worstPerTickDelta * days > 0)&&
-				(this.game.resPool.get("alicorns").value - 1 + necrocornPerDay * days >= 0)){ //naive solution here
-				this.necrocornsNaiveFastForward(days, times);
-				return;
-			}
+		//if(!this.game.science.getPolicy(["siphoning"]).researched){
+		if(
+			(worstPerTickDelta >= 0)
+			||(worstPerTickDelta < 0 && necrocornVal + worstPerTickDelta * days > 0)&&
+			(this.game.resPool.get("alicorns").value - 1 + necrocornPerDay * days >= 0)){ //naive solution here
+			this.necrocornsNaiveFastForward(days, times);
+			return;
 		}
+		//}
 		var corruptionWithoutExisting = this.game.religion.getCorruptionPerTickProduction(false);
 		//here we chech if the necrocorns will get into cycles of being produced and spent, which also works with syphening
-		if(corruptionWithExisting * days/this.game.calendar.ticksPerDay + necrocornPerDay < 0 &&
-		corruptionWithoutExisting * days/this.game.calendar.ticksPerDay + necrocornPerDay > 0
+		if(corruptionWithExisting * this.game.calendar.ticksPerDay + necrocornPerDay < 0 &&
+		corruptionWithoutExisting * this.game.calendar.ticksPerDay + necrocornPerDay > 0
 		){
 			var alicornsResult = this.game.resPool.get("alicorns").value - 1 + necrocornPerDay * days;
 			var alicornsSpent = necrocornPerDay * days;

From 88fa5baeceb91fe992173efb95e445fd0e59a091 Mon Sep 17 00:00:00 2001
From: Ziggurat <ziggurat0001@protonmail.com>
Date: Sat, 28 Oct 2023 00:30:32 +0000
Subject: [PATCH 30/63] Merged in
 Ziggurat/set-queue_redshift-flag-to-true-on-main-1698452752943 (pull request
 #1237)

set QUEUE_REDSHIFT flag to true on main
---
 game.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game.js b/game.js
index a8a8ae7640..7285579548 100644
--- a/game.js
+++ b/game.js
@@ -1811,7 +1811,7 @@ dojo.declare("com.nuclearunicorn.game.ui.GamePage", null, {
 		},
 		QUEUE_REDSHIFT: {
 			beta: true,
-			main: false
+			main: true
 		}
 	},
 

From 1a1a9054c1a373d3eab2c0d7856b66d990d44295 Mon Sep 17 00:00:00 2001
From: Ziggurat <ziggurat0001@protonmail.com>
Date: Sat, 28 Oct 2023 00:46:45 +0000
Subject: [PATCH 31/63] Merged in dev/beta (pull request #1238)

master -> Dev/beta

* small siphoning ui fixes, siphoning description change and adding totalPerDayDelta for alicorns

* improve description

* Merged in master (pull request #1225)

Siphoning and pacts ui improvements
* fix siphoning not using necrocornsNaiveFastForward
fix bug where corruption is multiplied by days and divided by ticks per day for comparison of necrocorn per day values in necrocornFastForward

* Merged in master (pull request #1234)

Redshift pacts logic bugfixes

* fix siphoning not using necrocornsNaiveFastForward
fix bug where corruption is multiplied by days and divided by ticks per day for comparison of necrocorn per day values in necrocornFastForward
* Merged in Ziggurat/set-queue_redshift-flag-to-true-on-main-1698452752943 (pull request #1237)

set QUEUE_REDSHIFT flag to true on main
* Merged bloodrizer/kitten-game:master into AZiggurat/kitten-game-ziggurats-fork:master
* Merged bloodrizer/kitten-game:dev/beta into AZiggurat/kitten-game-ziggurats-fork:dev/beta
* Merge branch 'master' into dev/beta

# Conflicts:
#	game.js
---
 game.js          | 26 +++++++++++++++++++-------
 js/religion.js   | 20 ++++++++++----------
 res/i18n/en.json |  3 ++-
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/game.js b/game.js
index ffe57729d7..e2fd81ebdf 100644
--- a/game.js
+++ b/game.js
@@ -1828,7 +1828,7 @@ dojo.declare("com.nuclearunicorn.game.ui.GamePage", null, {
 		},
 		QUEUE_REDSHIFT: {
 			beta: true,
-			main: false,
+			main: true,
 			mobile: true
 		}
 	},
@@ -3591,11 +3591,19 @@ dojo.declare("com.nuclearunicorn.game.ui.GamePage", null, {
 			//console.error("Unable to fetch resource stack for resName '" + resName + "'");
 			return;
 		}
-		stack.push({
-			name: $I("res.stack.buildings"),
-			type: "perDay",
-			value: this.getEffect(res.name + "PerDay")
-		});
+		if (resName == "necrocorn"){
+			stack.push({
+				name: $I("res.stack.buildings"),
+				type: "perDay",
+				value: this.getEffect("necrocornPerDay") + this.religion.pactsManager.getSiphonedCorruption(1)
+			});
+		}else{
+			stack.push({
+				name: $I("res.stack.buildings"),
+				type: "perDay",
+				value: this.getEffect(res.name + "PerDay")
+			});
+		}
 		if(resName == "necrocorn"){
 			var corruptionStack = [];
 			corruptionStack.push({
@@ -3981,9 +3989,13 @@ dojo.declare("com.nuclearunicorn.game.ui.GamePage", null, {
 				resStringDay = this.processResourcePerTickStack(resStackDay, res, 0), //processResourcePerTickStack can work with perDay stack
 				resPerDay = this.getResourcePerDay(res.name);
 				if (this.opts.usePercentageResourceValues){
+					resStringDay = "<br>" + resStringDay;
 					resStringDay += "<br> " + $I("res.netGain") + ": " + this.getDisplayValueExt(resPerDay, true, true);
 				}
-			return resString + resStringDay;
+			var totalPerDayDelta =  "<br>" + $I("res.netGainPerDay") + ": " + 
+			this.getDisplayValueExt(resPerTick * this.calendar.ticksPerDay + this.getEffect("alicornPerDay"))
+			;
+			return resString + resStringDay + totalPerDayDelta;
 		}
 		return resString;
 	},
diff --git a/js/religion.js b/js/religion.js
index 5c54e54d6c..68c87f2be4 100644
--- a/js/religion.js
+++ b/js/religion.js
@@ -269,19 +269,19 @@ dojo.declare("classes.managers.ReligionManager", com.nuclearunicorn.core.TabMana
 		var necrocornVal = this.game.resPool.get("necrocorn").value;
 		var corruptionWithExisting = this.game.religion.getCorruptionPerTickProduction(true);
 		var worstPerTickDelta = corruptionWithExisting * days *this.game.calendar.ticksPerDay + corruptionWithExisting;
-		if(!this.game.science.getPolicy(["siphoning"]).researched){
-			if(
-				(worstPerTickDelta >= 0)
-				||(worstPerTickDelta < 0 && necrocornVal + worstPerTickDelta * days > 0)&&
-				(this.game.resPool.get("alicorns").value - 1 + necrocornPerDay * days >= 0)){ //naive solution here
-				this.necrocornsNaiveFastForward(days, times);
-				return;
-			}
+		//if(!this.game.science.getPolicy(["siphoning"]).researched){
+		if(
+			(worstPerTickDelta >= 0)
+			||(worstPerTickDelta < 0 && necrocornVal + worstPerTickDelta * days > 0)&&
+			(this.game.resPool.get("alicorns").value - 1 + necrocornPerDay * days >= 0)){ //naive solution here
+			this.necrocornsNaiveFastForward(days, times);
+			return;
 		}
+		//}
 		var corruptionWithoutExisting = this.game.religion.getCorruptionPerTickProduction(false);
 		//here we chech if the necrocorns will get into cycles of being produced and spent, which also works with syphening
-		if(corruptionWithExisting * days/this.game.calendar.ticksPerDay + necrocornPerDay < 0 &&
-		corruptionWithoutExisting * days/this.game.calendar.ticksPerDay + necrocornPerDay > 0
+		if(corruptionWithExisting * this.game.calendar.ticksPerDay + necrocornPerDay < 0 &&
+		corruptionWithoutExisting * this.game.calendar.ticksPerDay + necrocornPerDay > 0
 		){
 			var alicornsResult = this.game.resPool.get("alicorns").value - 1 + necrocornPerDay * days;
 			var alicornsSpent = necrocornPerDay * days;
diff --git a/res/i18n/en.json b/res/i18n/en.json
index d23ba5a759..5604953c4f 100644
--- a/res/i18n/en.json
+++ b/res/i18n/en.json
@@ -788,7 +788,7 @@
     "policy.republic.label" : "Republic",
     "policy.republic.desc" : "Best for large societies. Highly promoted leaders will provide a small bonus to the production of all kittens.",
     "policy.siphoning.label" : "Siphoning",
-    "policy.siphoning.desc" : "Pacts consume alicorns and slow down production instead of consuming necrocorns. If there is not enough of either pacts also consume necrocorns.",
+    "policy.siphoning.desc" : "Pacts consume alicorns and slow down corruption instead of consuming necrocorns. Lack of alicorns or corruption is compensated by consuming necrocorns.",
     "policy.socialism.label" : "Socialism",
     "policy.socialism.desc" : "Has no effect",
     "policy.spaceBasedTerraforming.label" : "Space-based terraforming",
@@ -1045,6 +1045,7 @@
     "res.effect": "Effect",
     "res.effects": "Effects",
     "res.netGain": "Net gain",
+    "res.netGainPerDay": "Net delta per day",
     "res.notify.msg": "You will be notified when {0} will be available.",
     "res.notify.ready.title": "Enough resource to buy",
     "res.notify.ready": "The {0} is ready",

From 2caf901235a4f28bf3901101c521a39ceab6ec6d Mon Sep 17 00:00:00 2001
From: Ziggurat <ziggurat0001@protonmail.com>
Date: Sat, 28 Oct 2023 10:04:51 +0000
Subject: [PATCH 32/63] Merged in dev/beta (pull request #1240)

Dev/beta (master -> beta)

* small siphoning ui fixes, siphoning description change and adding totalPerDayDelta for alicorns

* get rid of debug things

* improve description

* Merged in master (pull request #1225)

Siphoning and pacts ui improvements
* fix siphoning not using necrocornsNaiveFastForward
fix bug where corruption is multiplied by days and divided by ticks per day for comparison of necrocorn per day values in necrocornFastForward

* Merged in master (pull request #1234)

Redshift pacts logic bugfixes

* fix siphoning not using necrocornsNaiveFastForward
fix bug where corruption is multiplied by days and divided by ticks per day for comparison of necrocorn per day values in necrocornFastForward
* Merged in Ziggurat/set-queue_redshift-flag-to-true-on-main-1698452752943 (pull request #1237)

set QUEUE_REDSHIFT flag to true on main
* Merged bloodrizer/kitten-game:master into AZiggurat/kitten-game-ziggurats-fork:master
* Merged bloodrizer/kitten-game:dev/beta into AZiggurat/kitten-game-ziggurats-fork:dev/beta
* Merge branch 'master' into dev/beta

# Conflicts:
#	game.js

From c9f660133bbd8bb08758ba73f8e6b9476fcf78fe Mon Sep 17 00:00:00 2001
From: Pedro Zunino <pedrozunino7@gmail.com>
Date: Sat, 28 Oct 2023 18:46:46 +0000
Subject: [PATCH 33/63] Merged in feat/move-queue-items (pull request #1236)

feat: rearrange queue items

* feat: rearrange queue items
---
 js/jsx/queue.jsx.js | 61 +++++++++++++++++++++++++++++++--------------
 js/time.js          | 40 +++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 19 deletions(-)

diff --git a/js/jsx/queue.jsx.js b/js/jsx/queue.jsx.js
index d63cecd275..9525d6887f 100644
--- a/js/jsx/queue.jsx.js
+++ b/js/jsx/queue.jsx.js
@@ -13,27 +13,34 @@ WQueueItem = React.createClass({
 
     render: function(){
         var item = this.props.item;
+        var buttons = [
+            $r("a", {
+                href: "#", 
+                onClick: this.removeOne,
+            }, "[-]")];
+
+        if (item.value) {
+            buttons.push($r("a", {
+                href: "#", 
+                onClick: this.removeAll,
+            }, "[x]"));
+        }
+
+        if (!this.props.isLast) {
+            buttons.push($r("a", {
+                href: "#", 
+                onClick: this.pushBack,
+            }, "[↓]"));
+        }
 
-        if (item.value){
-            buttons = [
-                $r("a", {
-                    href: "#", 
-                    onClick: this.removeOne,
-                }, "[-]"),
-                $r("a", {
-                    href: "#", 
-                    onClick: this.removeAll,
-                }, "[x]")
-            ]
-        } else {
-            buttons = [
-                $r("a", {
-                    href: "#", 
-                    onClick: this.removeOne,
-                }, "[x]")
-            ]
+        if (this.props.index > 0) {
+                buttons.push($r("a", {
+                href: "#", 
+                onClick: this.pushFront,
+            }, "[↑]"));
         }
 
+
         //TODO: red indicator when can't process
         //TODO: attach tooltip as if it is a button
         return $r("div", {}, 
@@ -46,6 +53,16 @@ WQueueItem = React.createClass({
         ].concat(buttons));
     },
 
+    pushBack: function(){
+        var i = this.props.index;
+        this.props.queueManager.pushBack(i);
+    },
+
+    pushFront: function(){
+        var i = this.props.index;
+        this.props.queueManager.pushFront(i);
+    },
+
     removeOne: function(){
         var i = this.props.index;
         this.props.queueManager.remove(i, 1);
@@ -167,7 +184,13 @@ WQueue = React.createClass({
         
         for (var i in queueItems){
             var item = queueItems[i];
-            items.push($r(WQueueItem, {item: item, index: i, queueManager: queueManager, game: game}));
+            items.push($r(WQueueItem, {
+                item: item,
+                index: i,
+                isLast: i == queueItems.length - 1,
+                queueManager: queueManager,
+                game: game
+            }));
         }
         return $r("div", {}, 
             items
diff --git a/js/time.js b/js/time.js
index fae0134b23..89d15cabfb 100644
--- a/js/time.js
+++ b/js/time.js
@@ -1782,6 +1782,46 @@ dojo.declare("classes.queue.manager", null,{
         return true;
     },
 
+    /**
+     * Pushes item back in the queue based on the queue group number (index)
+     * @param {*} index 
+     * 
+     * @returns true if element was moved successfully and false otherwise
+     */
+    pushBack: function(index){
+        console.log("pushback", index);
+        if (index < 0 || index >= this.queueItems.length - 1 ){
+            console.warn("queue#remove - invalid index", index);
+            return false;
+        }
+
+        var item = this.queueItems[index];
+        this.queueItems[index] = this.queueItems[index + 1];
+        this.queueItems[index + 1] = item;
+
+        return true;
+    },
+
+    /**
+     * Pushes item to the front in the queue based on the queue group number (index)
+     * @param {*} index 
+     * 
+     * @returns true if element was moved successfully and false otherwise
+     */
+    pushFront: function(index){
+        console.log("pushfront", index);
+        if (index < 1 || index >= this.queueItems.length){
+            console.warn("queue#remove - invalid index", index);
+            return false;
+        }
+        
+        var item = this.queueItems[index];
+        this.queueItems[index] = this.queueItems[index - 1];
+        this.queueItems[index - 1] = item;
+
+        return true;
+    },
+
     /**
      * Return a list of sub-options for a building queue
      * in a form of [{

From 4d460e498deec577d1d564cc2f5cffe6a3b86dd0 Mon Sep 17 00:00:00 2001
From: plcp <matthieu@daumas.me>
Date: Sun, 29 Oct 2023 00:03:13 +0000
Subject: [PATCH 34/63] Merged in bsk/emptySky (pull request #1229)

Sattelite penalty under repeated BSK

* Sattelite penalty under repeated BSK


Approved-by: Brent Call
---
 game.js          | 5 +++++
 js/challenges.js | 8 ++++++--
 js/resources.js  | 2 +-
 js/space.js      | 5 +++++
 res/i18n/en.json | 1 +
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/game.js b/game.js
index e2fd81ebdf..f4938dcb41 100644
--- a/game.js
+++ b/game.js
@@ -1225,6 +1225,11 @@ dojo.declare("com.nuclearunicorn.game.EffectsManager", null, {
 				type: "ratio"
 			},
 
+			"bskSattelitePenalty" : {
+				title: $I("effectsMgr.statics.bskSattelitePenalty.title"),
+				type: "ratio"
+			},
+
 			"blsCorruptionRatio": {
 				title: $I("effectsMgr.statics.blsCorruptionRatio.title"),
 				type: "ratio"
diff --git a/js/challenges.js b/js/challenges.js
index 0cd6439d02..792fcb894f 100644
--- a/js/challenges.js
+++ b/js/challenges.js
@@ -235,16 +235,20 @@ dojo.declare("classes.managers.ChallengesManager", com.nuclearunicorn.core.TabMa
 		researched: false,
 		unlocked: false,
         effects: {
-            "corruptionBoostRatioChallenge": 0.1
+			"corruptionBoostRatioChallenge": 0.1,
+			"bskSattelitePenalty": 0
         },
 		stackOptions: {
-			"corruptionBoostRatioChallenge": { LDRLimit: 2 }
+			"corruptionBoostRatioChallenge": { LDRLimit: 2 },
+			"bskSattelitePenalty": { LDRLimit: 30 }
 		},
         calculateEffects: function(self, game){
             if (self.active) {
                 self.effects["corruptionBoostRatioChallenge"] = 0;
+                self.effects["bskSattelitePenalty"] = 0.1 * (game.ironWill ? 0 : (self.on || 0));
             }else{
 				self.effects["corruptionBoostRatioChallenge"] = 0.1;
+				self.effects["bskSattelitePenalty"] = 0;
 			}
 			game.upgrade(self.upgrades);
         },
diff --git a/js/resources.js b/js/resources.js
index ac6989ef0a..812b94bc64 100644
--- a/js/resources.js
+++ b/js/resources.js
@@ -687,7 +687,7 @@ dojo.declare("classes.managers.ResourceManager", com.nuclearunicorn.core.TabMana
 		for (var i in this.resources){
 			var res = this.resources[i];
 			if (res.name == "sorrow"){
-				res.maxValue = 16 + (game.getEffect("blsLimit") || 0);
+				res.maxValue = 17 + (game.getEffect("blsLimit") || 0);
 				res.value = res.value > res.maxValue ? res.maxValue : res.value;
 				continue;
 			}
diff --git a/js/space.js b/js/space.js
index 46ebc72eb9..49885f8e83 100644
--- a/js/space.js
+++ b/js/space.js
@@ -276,6 +276,11 @@ dojo.declare("classes.managers.SpaceManager", com.nuclearunicorn.core.TabManager
 				else {
 					self.effects["energyConsumption"] = 1;
 				}
+
+				if (game.challenges.isActive("blackSky")) {
+					self.effects['starchartPerTickBaseSpace'] *= 1 / (1 + game.getEffect('bskSattelitePenalty'));
+				}
+
 				game.upgrade(self.upgrades); //this way observatories won't have to use action
 			},
 			upgrades: {
diff --git a/res/i18n/en.json b/res/i18n/en.json
index 5604953c4f..46a4be4c8b 100644
--- a/res/i18n/en.json
+++ b/res/i18n/en.json
@@ -364,6 +364,7 @@
     "effectsMgr.statics.boostFromLeader.title": "Boost From Leader",
     "effectsMgr.statics.breweryConsumptionRatio.title": "Brewery consumption ratio",
     "effectsMgr.statics.broadcastTowerRatio.title": "Broadcast Tower bonus",
+    "effectsMgr.statics.bskSattelitePenalty.title": "Satellite base penalty",
     "effectsMgr.statics.cadBlueprintCraftRatio.title": "Blueprint craft bonus",
     "effectsMgr.statics.calcinerRatio.title": "Calciner bonus",
     "effectsMgr.statics.calcinerSteelCraftRatio.title": "Steel Plants's Calciner bonus",

From 094e8c54c608a0367719b5e81c7247433cc7776b Mon Sep 17 00:00:00 2001
From: bloodrizer <cheshire.panther@gmail.com>
Date: Sat, 28 Oct 2023 17:14:03 -0700
Subject: [PATCH 35/63] Squashed commit of the following:

commit 4d460e498deec577d1d564cc2f5cffe6a3b86dd0
Author: plcp <matthieu@daumas.me>
Date:   Sun Oct 29 00:03:13 2023 +0000

    Merged in bsk/emptySky (pull request #1229)

    Sattelite penalty under repeated BSK

    * Sattelite penalty under repeated BSK

    Approved-by: Brent Call

commit c9f660133bbd8bb08758ba73f8e6b9476fcf78fe
Author: Pedro Zunino <pedrozunino7@gmail.com>
Date:   Sat Oct 28 18:46:46 2023 +0000

    Merged in feat/move-queue-items (pull request #1236)

    feat: rearrange queue items

    * feat: rearrange queue items

commit 2caf901235a4f28bf3901101c521a39ceab6ec6d
Author: Ziggurat <ziggurat0001@protonmail.com>
Date:   Sat Oct 28 10:04:51 2023 +0000

    Merged in dev/beta (pull request #1240)

    Dev/beta (master -> beta)

    * small siphoning ui fixes, siphoning description change and adding totalPerDayDelta for alicorns

    * get rid of debug things

    * improve description

    * Merged in master (pull request #1225)

    Siphoning and pacts ui improvements
    * fix siphoning not using necrocornsNaiveFastForward
    fix bug where corruption is multiplied by days and divided by ticks per day for comparison of necrocorn per day values in necrocornFastForward

    * Merged in master (pull request #1234)

    Redshift pacts logic bugfixes

    * fix siphoning not using necrocornsNaiveFastForward
    fix bug where corruption is multiplied by days and divided by ticks per day for comparison of necrocorn per day values in necrocornFastForward
    * Merged in Ziggurat/set-queue_redshift-flag-to-true-on-main-1698452752943 (pull request #1237)

    set QUEUE_REDSHIFT flag to true on main
    * Merged bloodrizer/kitten-game:master into AZiggurat/kitten-game-ziggurats-fork:master
    * Merged bloodrizer/kitten-game:dev/beta into AZiggurat/kitten-game-ziggurats-fork:dev/beta
    * Merge branch 'master' into dev/beta

    # Conflicts:
    #	game.js

commit 1a1a9054c1a373d3eab2c0d7856b66d990d44295
Author: Ziggurat <ziggurat0001@protonmail.com>
Date:   Sat Oct 28 00:46:45 2023 +0000

    Merged in dev/beta (pull request #1238)

    master -> Dev/beta

    * small siphoning ui fixes, siphoning description change and adding totalPerDayDelta for alicorns

    * improve description

    * Merged in master (pull request #1225)

    Siphoning and pacts ui improvements
    * fix siphoning not using necrocornsNaiveFastForward
    fix bug where corruption is multiplied by days and divided by ticks per day for comparison of necrocorn per day values in necrocornFastForward

    * Merged in master (pull request #1234)

    Redshift pacts logic bugfixes

    * fix siphoning not using necrocornsNaiveFastForward
    fix bug where corruption is multiplied by days and divided by ticks per day for comparison of necrocorn per day values in necrocornFastForward
    * Merged in Ziggurat/set-queue_redshift-flag-to-true-on-main-1698452752943 (pull request #1237)

    set QUEUE_REDSHIFT flag to true on main
    * Merged bloodrizer/kitten-game:master into AZiggurat/kitten-game-ziggurats-fork:master
    * Merged bloodrizer/kitten-game:dev/beta into AZiggurat/kitten-game-ziggurats-fork:dev/beta
    * Merge branch 'master' into dev/beta

    # Conflicts:
    #	game.js

commit 07ab27a6e58a20a389a073e5f95fe2335b539871
Author: Brent Call <tnerbcall@gmail.com>
Date:   Sat Oct 21 20:13:34 2023 +0000

    Merged in spaceportBalancing (pull request #1233)

    Increased Spaceport effect, decreased power consumption

    * Increased Spaceport effect, decreased power consumption

    Approved-by: Arima B.

commit 8c99d1b10e2228207d4017b052ddee37077b72ed
Author: Alma Buru <cheshire.panther@gmail.com>
Date:   Wed Oct 11 03:08:56 2023 -0700

    reducing spaceport effect even further

commit a41fc2500e41183fdb4c5a9624dfa8e69dfd0360
Author: Alma Buru <cheshire.panther@gmail.com>
Date:   Wed Oct 11 02:46:01 2023 -0700

    fix unit test

commit 9c40005a6f81b8af13f5480a99af75af605255e0
Author: Alma Buru <cheshire.panther@gmail.com>
Date:   Wed Oct 11 02:35:44 2023 -0700

    tweaking spaceport scaling

commit cb8156a0126a9ae5adb692a658d6e5d163633e0a
Merge: 46ed3942 bdf6ab52
Author: Brent Call <tnerbcall@gmail.com>
Date:   Wed Oct 4 02:14:00 2023 +0000

    Merged in automationDescriptions (pull request #1231)

    Automation Descriptions

    Approved-by: Arima B.

commit bdf6ab52d612f796d2529db8b6af8c6a0886b598
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Oct 2 13:31:01 2023 -0400

    Tooltip updates always fetch latest description

commit d246716b28297a217c5324ea523392ab4edf0f60
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Oct 2 13:22:45 2023 -0400

    Fix errors when unresearching certain upgrades

commit 3f29afc62bbcf96c17a3b1e75fb0a5577e72e861
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Oct 2 13:06:38 2023 -0400

    Don't show "automation disabled" message if it's not unlocked yet

commit 22b1618c57c6ca889b9a438f5839c50e298c074e
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Oct 2 12:59:04 2023 -0400

    Add automation description to Steamworks

commit 691277fe8b27bb6df1cef3f5ca4780fe3f177e48
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Oct 2 12:46:06 2023 -0400

    Add automation description to Chrono Furnace

commit df6ac97a669e75544efbc411be128d0ec3807b38
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Oct 2 12:40:52 2023 -0400

    Add automation description to Temporal Press

commit 3161c2c48e3eba62b7a7ad33a4f6a79698fb6b50
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Oct 2 12:32:17 2023 -0400

    Add automation description to Reactors

commit ff3f80e07e8afb8324da7e52419bfb437690ddf6
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Oct 2 12:20:16 2023 -0400

    Add automation description to Factory

commit 71657641995551ac532b6f6aae87f776cb22fe41
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Oct 2 12:08:13 2023 -0400

    Add automation description for calciner

commit efb1bcf6fe9c9e661d6fc49eea719ceae0b9ffab
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Oct 2 11:50:37 2023 -0400

    Minor tweak to line break on Temporal Accelerator

commit 0150a8caad78d8192201e47651077c5293693efd
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Oct 2 11:43:37 2023 -0400

    Add automation description to Oil Well

commit 46ed3942033e1bb2065d181dd003e46063f1f464
Author: Arima B <cheshire.panther@gmail.com>
Date:   Wed Sep 27 09:11:50 2023 +0000

    Merged in chore/tabindex (pull request #1230)

    Support tabindex and keyboard navigation for buttons

    * basic tabIndex support

    * fix gear icon toggle + some css tweaks

    * fix tab toggling gear icon

    * toggle option for collapsible groups

commit 852a6a626bcacad560c835aeba28ccbcd1759adc
Merge: 49d31e39 6eb2428e
Author: Brent Call <tnerbcall@gmail.com>
Date:   Mon Sep 4 18:25:09 2023 +0000

    Merged in deltagradeFix (pull request #1228)

    Tweaks to Spaceport Cherrypick

commit 6eb2428effac0a59c7ec96889cb5575243f0a8c8
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Sep 4 11:38:18 2023 -0400

    Ugly hack for spaceport dependency ordering

commit 6e6eabb0e5165710237639472cf9ae6aafc92b03
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Sep 4 11:31:22 2023 -0400

    Update test to check for proper price

commit b8e60ef2b45901d889bb64eb7d7b8603f968476f
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Sep 4 11:30:17 2023 -0400

    Update test to check for proper price

commit 987634028bb00e67c158474164e4766125c1e2f1
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Sep 4 11:27:06 2023 -0400

    Add back in the part where spaceports affect space storage

commit 76eb52805bfa1d72ed299c89ae7a64a4544f0b79
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Sep 4 11:16:13 2023 -0400

    Tweak descriptions a bit

commit bf61dc80d3aba6613eb689dc49328a9a44bbd842
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Sep 4 11:09:53 2023 -0400

    Fix that Warehouse effects didn't work

commit 3897c8d8779d5dcf0172e51ac350d15158ea6980
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Sep 4 11:08:42 2023 -0400

    Fix prices of Spaceport building

commit 57ef510d36a9a0d99fd8c8032dc9df4f7b3b6420
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Sep 4 11:04:38 2023 -0400

    Fix that deltagrading would fail if noConfirm was false

commit 49d31e39145843d657c3ea0379931d88da53da4c
Author: Arima B <cheshire.panther@gmail.com>
Date:   Mon Sep 4 02:53:27 2023 +0000

    Merged in feature/spaceport-cherrypick (pull request #1227)

    Spaceport cherrypick

    * mobile feature flags

    * remove map.jsx from the code

    * cherry pick of the spaceport PR

    * version bump

commit 3283ad9eec3273bbf8c327505b2cea9b45f8f8b2
Merge: e7111a90 f4966d45
Author: Ziggurat <ziggurat0001@protonmail.com>
Date:   Tue Jul 25 17:07:20 2023 +0000

    Merged in master (pull request #1221)

    small ui fix [beta]

commit e7111a90d51e2fcc63a4382be1cb77bd063adfd9
Merge: 219a328f 12fb103c
Author: Ziggurat <ziggurat0001@protonmail.com>
Date:   Sat Jul 22 11:19:44 2023 +0000

    Merged in dev/beta (pull request #1218)

    Dev/beta

commit 12fb103c6ad6437e7b6735a579acc4df3e8489e3
Merge: 3d8d1f9c 9d1dbcd1
Author: AZiggurat <ziggurat0001@protonmail.com>
Date:   Sat Jul 22 14:16:09 2023 +0300

    Merge branch 'master' into dev/beta

    # Conflicts:
    #	core.js

commit 3d8d1f9cfcca2958eef40f86f9901d19bf54e6d2
Merge: 4b24da0f 219a328f
Author: Ziggurat <ziggurat0001@protonmail.com>
Date:   Sat Jul 22 11:11:59 2023 +0000

    Merged bloodrizer/kitten-game:dev/beta into AZiggurat/kitten-game-ziggurats-fork:dev/beta

commit 219a328ff0aa456b8f51e9ae13cb8c9fea3e4961
Author: Brent Call <tnerbcall@gmail.com>
Date:   Fri Jul 21 08:53:06 2023 +0000

    Merged in upgradingSellAll (pull request #1217)

    Upgrading Auto-Sell All + Merge master into dev/beta

    * When unassigning engineers, prioritize engineers doing nothing

    * Merged in engineerQoL (pull request #1213)

    Engineer QoL Improvement
    * Hide aspects of the policy UI panel that aren't relevant in the moment

    * Merged in hidePoliciesWhenEmpty (pull request #1214)
    * Quick-crafting links use correct recipe prices as modified by upgrades

    * Merged in craftLinkFix (pull request #1215)
    * Sell all of a building when upgrading or downgrading it

    * Merge branch 'master' of https://bitbucket.org/bloodrizer/kitten-game into upgradingSellAll

    * Add ability to undo sell buildings

    * Add ability to undo upgrades/downgrades

    Approved-by: Arima B.

commit 4b24da0ffb2f3fe514db8818caedb966b0b79ccd
Merge: b30e920c d4902ef9
Author: Ziggurat <ziggurat0001@protonmail.com>
Date:   Fri Jun 30 17:39:06 2023 +0000

    Merged bloodrizer/kitten-game:dev/beta into AZiggurat/kitten-game-ziggurats-fork:dev/beta

commit d4902ef9a9d72e13d816d5a64d89f59919131cb2
Merge: 06aa91b4 32a4795a
Author: Ziggurat <ziggurat0001@protonmail.com>
Date:   Fri Jun 30 17:38:26 2023 +0000

    Merged in master (pull request #1204)

    change alicorn siphoning ui [beta]

commit b30e920c7e40b6b894e73b87d0af86f7d235ca96
Merge: e30fc2b8 06aa91b4
Author: Ziggurat <ziggurat0001@protonmail.com>
Date:   Wed Jun 28 14:06:14 2023 +0000

    Merged bloodrizer/kitten-game:dev/beta into AZiggurat/kitten-game-ziggurats-fork:dev/beta

commit 06aa91b4f4608b1e55d3f441eb1193850abc1449
Merge: 740e431e fde579c3
Author: Ziggurat <ziggurat0001@protonmail.com>
Date:   Wed Jun 28 14:01:38 2023 +0000

    Merged in master (pull request #1201)

    make HG bonus affect mausoleum karma per millenium beta

commit 740e431e25953f2fedc77239eb21c2c65571afdd
Merge: ed0d5bb9 15620989
Author: Brent Call <tnerbcall@gmail.com>
Date:   Sun Jun 25 00:27:10 2023 +0000

    Merged in kittenLazinessTweak (pull request #1195)

    Tweak Kitten Laziness Calculation

commit ed0d5bb9f695008773a03020328c4bc357666521
Merge: f4002ba8 4da3f45a
Author: bloodrizer <cheshire.panther@gmail.com>
Date:   Fri Jun 16 19:08:07 2023 -0700

    Merge branch 'master' into dev/beta

commit e30fc2b86bfb47fa156de2b5ae0960fe7b0d9999
Merge: 95f70803 47a7ffda
Author: Ziggurat <ziggurat0001@protonmail.com>
Date:   Sat Jun 10 17:14:43 2023 +0000

    Merged in master (pull request #67)

    fix ui bug that subtracts the siphoned corruption necrocorn consumption twice

commit 95f708039f1e5a928ed861011004bca0745f8cd4
Merge: 887e1eed f4002ba8
Author: Ziggurat <ziggurat0001@protonmail.com>
Date:   Sat Jun 10 17:13:02 2023 +0000

    Merged bloodrizer/kitten-game:dev/beta into AZiggurat/kitten-game-ziggurats-fork:dev/beta

commit f4002ba86a71056270fe97b39adb886d83eea802
Merge: ad29f9f3 78e67a94
Author: bloodrizer <cheshire.panther@gmail.com>
Date:   Mon Jun 5 21:34:17 2023 -0700

    Merge branch 'master' into dev/beta

commit ad29f9f30c3f57a87d5a456842e9b724b95b830d
Merge: a2bb16f5 890f85db
Author: Brent Call <tnerbcall@gmail.com>
Date:   Tue Jun 6 04:32:55 2023 +0000

    Merged in newStats (pull request #1196)

    Add 2 New Stats to Stats Page

    Approved-by: Arima B.

commit 890f85db8783f41291e83d6354b25892c0c2339f
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Fri Jun 2 23:42:57 2023 -0400

    Added new statistics for Transcendence Tier & Challenges completed

commit 156209894c1220b70cccdbe18f9392641c30f8da
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon May 22 21:41:37 2023 -0400

    Tweak internal calculation & display values of kitten laziness

commit a2bb16f54311e0c4c7a899d1ceebb12db5112f82
Merge: ee3bf3bf 6b8ba525
Author: Brent Call <tnerbcall@gmail.com>
Date:   Tue May 23 00:53:11 2023 +0000

    Merged in removeDuplicateTests (pull request #1194)

    Remove duplicated unit tests

commit 6b8ba525f2d02a1e1fb8101e030ded396e755fa6
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon May 22 20:20:32 2023 -0400

    Remove duplicated tests from game.test.js

commit 262abe6fc2cd5b6a2c6fbc208f73105a39c47ed0
Merge: 133f4ac3 ee3bf3bf
Author: Brent Call <tnerbcall@gmail.com>
Date:   Tue May 23 00:01:01 2023 +0000

    Merged bloodrizer/kitten-game:dev/beta into brent-s-personal-workspace/kitten-game:dev/beta

commit ee3bf3bf56dc0259290976411b3a1b260c3b27a2
Merge: fe4c3c53 65d9eb01
Author: Brent Call <tnerbcall@gmail.com>
Date:   Thu May 18 03:07:51 2023 +0000

    Merged in ironWillActive (pull request #1192)

    Show when Iron Will is active

commit 65d9eb018100ea149258fce19cf49b5ce1bd0b6b
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Wed May 17 21:44:51 2023 -0400

    Show when IW mode is active

commit 133f4ac3537d0f7b66bbbe8d726ef29e61e4aa09
Merge: 42a0c0d0 fe4c3c53
Author: Brent Call <tnerbcall@gmail.com>
Date:   Thu May 18 01:37:55 2023 +0000

    Merged bloodrizer/kitten-game:dev/beta into brent-s-personal-workspace/kitten-game:dev/beta

commit fe4c3c53e68ee078bdc6447a68814537d2387d1c
Merge: 1b8f7e9d 95f80ea2
Author: Brent Call <tnerbcall@gmail.com>
Date:   Sat May 6 00:08:14 2023 +0000

    Merged in embassyTooltip (pull request #1191)

    Embassy Tooltip Shows Resource Chances

commit 95f80ea2bd628f66b07adfa0933ea032f555a0cd
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Fri May 5 13:14:59 2023 -0400

    Added unlock requirement: do 50 trades to see resource chances

commit 801f419d8c01ac5d5012db21747adc97dc6038e0
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon May 1 10:26:51 2023 -0400

    Increase spice amount from trading when the chance is over 100%

commit a5bd344578153b61f6df4f74400b236c1b47236c
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon May 1 09:53:18 2023 -0400

    Fix display to 1 decimal place of precision

commit e5cc510813969aabf499c3a97035f5d79fb8ab3b
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon May 1 06:38:28 2023 -0400

    Display chance to get resources in embassy tooltips

commit 1b8f7e9dde0a0b8b7a72fe19edc413170838aa62
Author: bloodrizer <cheshire.panther@gmail.com>
Date:   Wed Apr 26 20:03:47 2023 -0700

    restoring broken es and fr merges

commit efa66fada8c837e72c3b1f0de542dde582ad33db
Author: bloodrizer <cheshire.panther@gmail.com>
Date:   Wed Apr 26 19:19:00 2023 -0700

    splitting tests for better readability

commit 11372fcd9f5fd673dcdf0a90d8666ccc60ace474
Author: bloodrizer <cheshire.panther@gmail.com>
Date:   Wed Apr 26 18:42:12 2023 -0700

    i18n upmerge

commit 96e20e6492943654263bcac8e6f3b304e2b85218
Author: Brent Call <tnerbcall@gmail.com>
Date:   Thu Apr 27 01:15:14 2023 +0000

    Merged in challengeTests (pull request #1184)

    ChallengeTests

    * Add test for Energy Challenge

    * Add tests for Pacifism & Atheism

    * Add test for Black Sky Challenge

    * Add tests for Anarchy Challenge

    * Better test descriptions

    * Add tests for Winter Challenge

    * Merge branch 'master' of https://bitbucket.org/bloodrizer/kitten-game into challengeTests

    Fix merge conflicts in test.js

    Approved-by: Arima B.

commit 6852b8f7ce1de142ad58e43d3b7507ceded67379
Merge: 270234ee f70962df
Author: Brent Call <tnerbcall@gmail.com>
Date:   Thu Apr 27 02:04:12 2023 +0000

    Merged in listChallengeReward_v2 (pull request #1185)

    List Challenge Rewards

commit 270234ee2ace1f07a0337b437d066266383fda62
Author: bloodrizer <cheshire.panther@gmail.com>
Date:   Wed Apr 26 18:58:36 2023 -0700

    i18n merge

commit f70962dfe9e50545bcd080ecb71eef0c7c753a16
Merge: 13d2bedf a840f2aa
Author: Brent Call <tnerbcall@gmail.com>
Date:   Wed Apr 26 22:51:12 2023 +0000

    Merged bloodrizer/kitten-game:dev/beta into brent-s-personal-workspace/kitten-game:listChallengeReward_v2

commit 13d2bedf1b1bc7eab1bc2ccce92e05c69ecb280a
Merge: 2831e18a 5eade419
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Wed Apr 26 17:55:39 2023 -0400

    Merge branch 'master' into listChallengeReward_v2

commit a840f2aad50f87d7a71fe185f257efa8a256584f
Author: bloodrizer <cheshire.panther@gmail.com>
Date:   Tue Apr 25 22:27:33 2023 -0700

    lang merge script

commit 2831e18a96534495c3e071e93a4070458b878d8e
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Apr 24 23:13:39 2023 -0400

    Tweak noStack behavior to require 1 completion

commit de10e4857f5b56fabf19daec83c902350284a4b7
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Apr 24 22:40:07 2023 -0400

    Implement stackOptions for Challenges.

commit 1e972a290714afa859c028a2a227a4923c460db7
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Apr 24 21:18:49 2023 -0400

    Add more comments to the code.

commit 611b0d82e0923a1510f320ba5428cb0946fdf0b3
Merge: dc436898 39b92c39
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Mon Apr 24 21:09:53 2023 -0400

    Merge branch 'master' into wip/listChallengeReward

commit dc436898911dce6462a65b745006e0b7402fa6be
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Thu Apr 20 20:02:01 2023 -0400

    Update list elements exactly as needed & no more.

commit b8485e437adc66019f92fc67b043387839fd5918
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Thu Apr 20 19:20:20 2023 -0400

    Fix visual bug if a Challenge is already completed but not unlocked yet.

commit 1db56899d039eca1b156bc7c0aa3566969a0340a
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Thu Apr 20 19:12:42 2023 -0400

    Fix more merge errors

commit ed533dd95c8513c4de663ca6fa8e32e659dbf56d
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Thu Apr 20 19:09:54 2023 -0400

    Fix merge error

commit 9cff0dc3cc7ce450b9e76bc3aa84d2fc23ce5fcf
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Thu Apr 20 19:02:12 2023 -0400

    Hide button to toggle Challenge effects unless relevant

commit 612606e10ac7f4dc949eb660f03e4421d3ba8ef8
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Thu Apr 20 18:24:45 2023 -0400

    Use a button to toggle visibility of effects summary

commit 42352c9eae5ba512cb7924bc67e5f7047d3ca25e
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Thu Apr 20 17:49:11 2023 -0400

    Require game.detailedChallengeInfo

commit 7b5908aec7f8fdbdb702fff6e4d87d94c10c6f52
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Thu Apr 20 17:37:22 2023 -0400

    Format the display effects properly

commit faa7ce4dff821311bd48758aecb4651b1e82a7a5
Merge: 976d24b0 1e77a9bb
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Thu Apr 20 17:25:14 2023 -0400

    Merge branch 'effectDisplayRework' into wip/listChallengeReward

    Merged effectDisplayRework into wip/listChallengeReward

commit 976d24b0a19039f38341371ae28180268152556b
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Thu Apr 20 15:32:24 2023 -0400

    Display the list of Challenge effects at the *bottom* of Challenge UI

commit 2287e4176d3124148e2832550b7255387609b32d
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Wed Apr 19 17:58:56 2023 -0400

    Hide Challenge effects list if list is empty.

commit 82f472e50998687216b479fb47fd3f3636941126
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Wed Apr 19 17:47:21 2023 -0400

    Update effects list whenever it changes.

commit 816a828107043d7580bc6b6081ee6daa9d0e2ee6
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Wed Apr 19 17:38:08 2023 -0400

    Hide a Challenge effects list if that Challenge isn't unlocked yet.

commit bf208db2c26267b49fbb88591e44c8c23ca3b29c
Author: Brent-Call <tnerbcall@comcast.net>
Date:   Wed Apr 19 15:56:04 2023 -0400

    Create one challenge effects panel per challenge
---
 changelog.txt               |   4 +
 core.js                     | 152 +++++++---
 game.js                     |  74 +++--
 index.html                  |  11 +-
 js/buildings.js             | 251 ++++++++++++----
 js/calendar.js              |   6 +-
 js/challenges.js            | 192 +++++++++++-
 js/diplomacy.js             | 162 +++++++++-
 js/jsx/left.jsx.js          |  33 +-
 js/jsx/map.jsx.js           | 297 ------------------
 js/jsx/queue.jsx.js         |  61 ++--
 js/religion.js              |   6 +-
 js/resources.js             |   5 +-
 js/science.js               |   3 +-
 js/space.js                 |  43 +--
 js/stats.js                 |  21 ++
 js/time.js                  |  62 +++-
 js/village.js               |   4 +-
 js/workshop.js              |   6 +-
 kg-workspace.code-workspace |  18 +-
 res/default.css             |   6 +-
 res/i18n/en.json            |  25 +-
 test/challenges.test.js     | 572 +++++++++++++++++++++++++++++++++++
 test/game.test.js           | 581 +++---------------------------------
 test/setup.js               |   1 -
 tools/update-lang.sh        |   4 +
 26 files changed, 1537 insertions(+), 1063 deletions(-)
 delete mode 100644 js/jsx/map.jsx.js
 create mode 100644 test/challenges.test.js
 create mode 100755 tools/update-lang.sh

diff --git a/changelog.txt b/changelog.txt
index 7083dc4bd3..841a3536f2 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+v 1.4.9.3
+Major:
+* Spaceport
+
 v 1.4.9.2
 Major:
 * Queue
diff --git a/core.js b/core.js
index 0c6b523d17..90adaa0750 100644
--- a/core.js
+++ b/core.js
@@ -683,6 +683,25 @@ dojo.declare("com.nuclearunicorn.game.ui.ButtonController", null, {
 		this.game.resPool.payPrices(model.prices);
 		model.prices = this.getPrices(model);
 	},
+	
+	payPriceForUndoRefund: function(model) {
+		//Shamelessly copied from the refund code, except we'll lose resources instead of gaining them!
+		if (!model.prices.length){
+			console.warn("unable pay prices for undo refund a building, no prices specified in metadata :O");
+			return;
+		}
+		for( var i = 0; i < model.prices.length; i++){
+			var price = model.prices[i];
+
+			var res = this.game.resPool.get(price.name);
+			if (res.isRefundable(this.game) && !price.isTemporary) {
+				this.game.resPool.addResEvent(price.name, -price.val * model.refundPercentage);
+			} else {
+				// No refund to undo
+			}
+		}
+		model.prices = this.getPrices(model);
+	},
 
 	clickHandler: function(model, event){
 		model.handler.apply(this, [model, event]);
@@ -832,7 +851,8 @@ dojo.declare("com.nuclearunicorn.game.ui.Button", com.nuclearunicorn.core.Contro
 			style: {
 				position: "relative",
 				display: this.model.visible ? "block" : "none"
-			}
+			},
+			tabIndex: 0
 		}, btnContainer);
 
 		if (this.model.twoRow) {
@@ -860,6 +880,7 @@ dojo.declare("com.nuclearunicorn.game.ui.Button", com.nuclearunicorn.core.Contro
 		this.updateVisible();
 
 		dojo.connect(this.domNode, "onclick", this, "onClick");
+		dojo.connect(this.domNode, "onkeypress", this, "onKeyPress");
 
 		this.afterRender();
 	},
@@ -887,6 +908,12 @@ dojo.declare("com.nuclearunicorn.game.ui.Button", com.nuclearunicorn.core.Contro
 
 	},
 
+	onKeyPress: function(event){
+		if (event.key == "Enter"){
+			this.onClick(event);
+		}
+	},
+
 	afterRender: function(){
 
 		var prices = this.model.prices;
@@ -1256,12 +1283,12 @@ ButtonModernHelper = {
 
 		// description
 		var descDiv = dojo.create("div", {
-			innerHTML: model.description,
+			innerHTML: controller.getDescription(model),
 			className: "desc"
 		}, tooltip);
 
 
-		if (model.metadata && model.metadata.isAutomationEnabled !== undefined){	//TODO: use proper metadata flag
+		if (model.metadata && typeof(model.metadata.isAutomationEnabled) == "boolean"){ //undefined or null don't count here
 			dojo.create("div", {
 				innerHTML: model.metadata.isAutomationEnabled ? $I("btn.aon.tooltip") : $I("btn.aoff.tooltip"),
 				className: "desc small" + (model.metadata.isAutomationEnabled ? " auto-on" : " auto-off")
@@ -1442,6 +1469,10 @@ dojo.declare("com.nuclearunicorn.game.ui.ButtonModern", com.nuclearunicorn.game.
 
 	updateLink: function(buttonLink, modelLink) {
 		if (buttonLink) {
+			if (!modelLink) { //This only ever happens if I mess around with console commands
+				dojo.destroy(buttonLink.link);
+				return;
+			}
 			buttonLink.link.textContent = modelLink.title;
 			if (modelLink.cssClass) {buttonLink.link.className = modelLink.cssClass;}
 			if (modelLink.tooltip) {buttonLink.link.title = modelLink.tooltip;}
@@ -1480,7 +1511,7 @@ dojo.declare("com.nuclearunicorn.game.ui.BuildingBtnController", com.nuclearunic
 				}
 			};
 		}
-		if (typeof(model.metadata.isAutomationEnabled) != "undefined" && model.metadata.isAutomationEnabled !== null) {
+		if (typeof(model.metadata.isAutomationEnabled) == "boolean") {
 			model.toggleAutomationLink = {
 				title: model.metadata.isAutomationEnabled ? "A" : "*",
 				tooltip: model.metadata.isAutomationEnabled ? $I("btn.aon.tooltip") : $I("btn.aoff.tooltip"),
@@ -1547,8 +1578,14 @@ dojo.declare("com.nuclearunicorn.game.ui.BuildingBtnController", com.nuclearunic
 		return false;
 	},
 
+	//Called whenever we turn the building on or off.
+	//The function was previously empty, so I repurposed it for possible non-proportional calculations.
 	metadataHasChanged: function(model) {
-		// do nothing
+		var meta = model.metadata;
+		if (meta.calculateEffects){
+			meta.calculateEffects(meta, this.game);
+			this.game.calendar.cycleEffectsBasics(meta.effects, meta.name); //(Only relevant for space buildings)
+		}
 	},
 
 	off: function(model, amt) {
@@ -1614,7 +1651,7 @@ dojo.declare("com.nuclearunicorn.game.ui.BuildingBtnController", com.nuclearunic
 	},
 
 	/**
-	 * Returns true if building was sold
+	 * Returns the number of buildings sold.
 	 */
 	sell: function(event, model){
 		var building = model.metadata;
@@ -1623,26 +1660,29 @@ dojo.declare("com.nuclearunicorn.game.ui.BuildingBtnController", com.nuclearunic
 		// But, proceed with normal action as well if true returned.
 		if (building.canSell) {
 			if(!building.canSell(building, this.game)) {
-				return false;
+				return 0;
 			}
 		}
 
+		var start = building.val;
 		var end = building.val - 1;
 		if (end > 0 && event && event.shiftKey) { //no need to confirm if selling just 1
 			end = 0;
 			if (this.game.opts.noConfirm) {
 				this.sellInternal(model, end, true /*requireSellLink*/);
-				return true;
+				return start;
 			} else {
 				var self = this;
+				var amtSold = 0;
 				this.game.ui.confirm($("sell.all.confirmation.title"), $I("sell.all.confirmation.msg"), function() {
 					self.sellInternal(model, end, true /*requireSellLink*/);
-					return true;
+					amtSold = start;
 				});
+				return amtSold;
 			}
 		} else if (end >= 0) {
 			this.sellInternal(model, end, true /*requireSellLink*/);
-			return true;
+			return start - end; //Should be just 1 if you do the algebra
 		}
 	},
 
@@ -1956,6 +1996,12 @@ dojo.declare("com.nuclearunicorn.game.ui.BuildingStackableBtnController", com.nu
         }
 	},
 
+	/**
+	 * Ultimate entry point to building construction
+	 * @param {*} model 
+	 * @param {*} maxBld 
+	 * 
+	 */
 	build: function(model, maxBld){
 		var meta = model.metadata;
 		var counter = 0;
@@ -1963,48 +2009,55 @@ dojo.declare("com.nuclearunicorn.game.ui.BuildingStackableBtnController", com.nu
 			maxBld = meta.limitBuild - meta.val;
 		}
 
-        if (model.enabled && this.hasResources(model) || this.game.devMode ){
-	        while (this.hasResources(model) && maxBld > 0){
-				this.incrementValue(model);
-				this.payPrice(model);
+		
+        if (!model.enabled && !this.game.devMode){
+			return 0;
+		}
+		
+		while ((this.game.devMode || this.hasResources(model)) && maxBld > 0){
+			this.incrementValue(model);
+			this.payPrice(model);
 
-	            counter++;
-	            maxBld--;
-	        }
+			counter++;
+			maxBld--;
+		}
+		
+		if (!counter){
+			return 0;
+		}
 
-	        if (counter > 1) {
-		        this.game.msg($I("construct.all.msg", [meta.label, counter]), "notice");
-			}
+		if (counter > 1) {
+			this.game.msg($I("construct.all.msg", [meta.label, counter]), "notice");
+		}
 
-			if (meta.breakIronWill) {
-				this.game.ironWill = false;
-				var liberty = this.game.science.getPolicy("liberty");
-				liberty.calculateEffects(liberty, this.game);
-				var zebraOutpostMeta = this.game.bld.getBuildingExt("zebraOutpost").meta;
-				zebraOutpostMeta.calculateEffects(zebraOutpostMeta, this.game);
-				zebraOutpostMeta.jammed = false;
-				this.game.diplomacy.onLeavingIW();
-			}
+		if (meta.breakIronWill) {
+			this.game.ironWill = false;
+			var liberty = this.game.science.getPolicy("liberty");
+			liberty.calculateEffects(liberty, this.game);
+			var zebraOutpostMeta = this.game.bld.getBuildingExt("zebraOutpost").meta;
+			zebraOutpostMeta.calculateEffects(zebraOutpostMeta, this.game);
+			zebraOutpostMeta.jammed = false;
+			this.game.diplomacy.onLeavingIW();
+		}
 
-			if (meta.unlocks) {
-				this.game.unlock(meta.unlocks);
-			}
+		if (meta.unlocks) {
+			this.game.unlock(meta.unlocks);
+		}
 
-			if (meta.calculateEffects){
-				meta.calculateEffects(meta, this.game);
-				this.game.calendar.cycleEffectsBasics(meta.effects, meta.name); //(Only relevant for space buildings)
-			}
-			if (meta.unlockScheme && meta.val >= meta.unlockScheme.threshold) {
-				this.game.ui.unlockScheme(meta.unlockScheme.name);
-			}
+		if (meta.calculateEffects){
+			meta.calculateEffects(meta, this.game);
+			this.game.calendar.cycleEffectsBasics(meta.effects, meta.name); //(Only relevant for space buildings)
+		}
+		if (meta.unlockScheme && meta.val >= meta.unlockScheme.threshold) {
+			this.game.ui.unlockScheme(meta.unlockScheme.name);
+		}
 
-			if (meta.upgrades) {
-				if (meta.updateEffects) {
-					meta.updateEffects(meta, this.game);
-				}
-				this.game.upgrade(meta.upgrades);
+		if (meta.upgrades) {
+			if (meta.updateEffects) {
+				meta.updateEffects(meta, this.game);
 			}
-        }
+			this.game.upgrade(meta.upgrades);
+		}
 
 		return counter;
     },
@@ -2221,6 +2274,7 @@ dojo.declare("com.nuclearunicorn.game.ui.Panel", [com.nuclearunicorn.game.ui.Con
 
 		this.toggle = dojo.create("div", {
 			innerHTML: this.collapsed ? "+" : "-",
+			tabIndex: 0,
 			className: "toggle" + (this.collapsed ? " collapsed" : ""),
 			style: {
 				float: "right"
@@ -2242,6 +2296,7 @@ dojo.declare("com.nuclearunicorn.game.ui.Panel", [com.nuclearunicorn.game.ui.Con
 		dojo.connect(this.toggle, "onclick", this, function(){
 			this.collapse(!this.collapsed);
 		});
+		dojo.connect(this.toggle, "onkeypress", this, "onKeyPress");
 
 		this.panelDiv = panel;
 
@@ -2253,6 +2308,13 @@ dojo.declare("com.nuclearunicorn.game.ui.Panel", [com.nuclearunicorn.game.ui.Con
 		return this.contentDiv;
 	},
 
+
+	onKeyPress: function(event){
+		if (event.key == "Enter"){
+			this.collapse(!this.collapsed);
+		}
+	},
+
 	collapse: function(isCollapsed){
 		this.collapsed = isCollapsed;
 
diff --git a/game.js b/game.js
index 7285579548..f4938dcb41 100644
--- a/game.js
+++ b/game.js
@@ -1062,6 +1062,19 @@ dojo.declare("com.nuclearunicorn.game.EffectsManager", null, {
                 title: $I("effectsMgr.statics.queueCap"),
                 type: "fixed"
 			},
+			//Spaceports
+			"moonBaseStorageBonus": {
+				title: $I( "effectsMgr.statics.moonBaseStorageBonus.title" ),
+				type: "ratio"
+			},
+			"planetCrackerStorageBonus": {
+				title: $I( "effectsMgr.statics.planetCrackerStorageBonus.title" ),
+				type: "ratio"
+			},
+			"cryostationStorageBonus": {
+				title: $I( "effectsMgr.statics.cryostationStorageBonus.title" ),
+				type: "ratio"
+			},
 			// cycleEffects
 			"spaceElevator-prodTransferBonus": {
                 title: $I("effectsMgr.statics.spaceElevator-prodTransferBonus.title"),
@@ -1212,6 +1225,11 @@ dojo.declare("com.nuclearunicorn.game.EffectsManager", null, {
 				type: "ratio"
 			},
 
+			"bskSattelitePenalty" : {
+				title: $I("effectsMgr.statics.bskSattelitePenalty.title"),
+				type: "ratio"
+			},
+
 			"blsCorruptionRatio": {
 				title: $I("effectsMgr.statics.blsCorruptionRatio.title"),
 				type: "ratio"
@@ -1795,23 +1813,28 @@ dojo.declare("com.nuclearunicorn.game.ui.GamePage", null, {
 	featureFlags: {
 		VILLAGE_MAP: {
 			beta: true,
-			main: false
+			main: false,
+			mobile: false
 		},
 		SPACE_EXPL: {
 			beta: true,
-			main: false
+			main: false,
+			mobile: false
 		},
 		MAUSOLEUM_PACTS:{
 			beta: true,
-			main: true
+			main: true,
+			mobile: true
 		},
 		QUEUE:{
 			beta: true,
-			main: true
+			main: true,
+			mobile: true
 		},
 		QUEUE_REDSHIFT: {
 			beta: true,
-			main: true
+			main: true,
+			mobile: true
 		}
 	},
 
@@ -4946,25 +4969,28 @@ dojo.declare("com.nuclearunicorn.game.ui.GamePage", null, {
 
 	calculateAllEffects: function() {
 		// TODO: delegate this to managers? Can't be done in load unfortunately.
-		this.upgrade({
-			tech: this.science.techs.map(function(item){return item.name;}),
-			policies: this.science.policies.map(function(item){return item.name;}),
-			perks: this.prestige.perks.map(function(item){return item.name;}),
-			jobs: this.village.jobs.map(function(item){return item.name;}),
-			crafts: this.workshop.crafts.map(function(item){return item.name;}),
-			upgrades: this.workshop.upgrades.map(function(item){return item.name;}),
-			buildings: this.bld.buildingsData.map(function(item){return item.name;}),
-			spaceMission: this.space.programs.map(function(item){return item.name;}),
-			spaceBuilding: this.space.spaceBuildingsMap,
-			planet: this.space.planets.map(function(item){return item.name;}),
-			chronoforge: this.time.chronoforgeUpgrades.map(function(item){return item.name;}),
-			voidSpace: this.time.voidspaceUpgrades.map(function(item){return item.name;}),
-			zigguratUpgrades: this.religion.zigguratUpgrades.map(function(item){return item.name;}),
-			religion: this.religion.religionUpgrades.map(function(item){return item.name;}),
-			transcendenceUpgrades: this.religion.transcendenceUpgrades.map(function(item){return item.name;}),
-			pacts: this.religion.pactsManager.pacts.map(function(item){return item.name;}),
-			challenges: this.challenges.challenges.map(function(item){return item.name;})
-		});
+		var getName = function(item){return item.name;};
+		var metaKeys = {
+				tech: this.science.techs.map(getName),
+				policies: this.science.policies.map(getName),
+				perks: this.prestige.perks.map(getName),
+				jobs: this.village.jobs.map(getName),
+				crafts: this.workshop.crafts.map(getName),
+				upgrades: this.workshop.upgrades.map(getName),
+				buildings: this.bld.buildingsData.map(getName),
+				spaceMission: this.space.programs.map(getName),
+				spaceBuilding: this.space.spaceBuildingsMap,
+				planet: this.space.planets.map(getName),
+				chronoforge: this.time.chronoforgeUpgrades.map(getName),
+				voidSpace: this.time.voidspaceUpgrades.map(getName),
+				zigguratUpgrades: this.religion.zigguratUpgrades.map(getName),
+				religion: this.religion.religionUpgrades.map(getName),
+				transcendenceUpgrades: this.religion.transcendenceUpgrades.map(getName),
+				pacts: this.religion.pactsManager.pacts.map(getName),
+				challenges: this.challenges.challenges.map(getName)
+			};
+		this.upgrade({ buildings: ["warehouse"]});
+		this.upgrade(metaKeys);
 		this.upgrade({policies: ["authocracy"]});
 	},
 
diff --git a/index.html b/index.html
index e325c976a3..a0e91830d8 100644
--- a/index.html
+++ b/index.html
@@ -65,7 +65,7 @@
 
 		<script type="text/javascript">
 
-			var version = "1492";
+			var version = "1493";
 			var buildRevision = 0;
 
 			var loadingProgress = 0,
@@ -140,7 +140,6 @@
 					"js/jsx/mid.jsx",
 					"js/jsx/toolbar.jsx",
 					"js/jsx/chiral.jsx",
-					"js/jsx/map.jsx",
 					"js/jsx/queue.jsx",
 
 					//required for defining IReactAware, will be relied upon by js/space
@@ -319,7 +318,7 @@
 				<div style="padding-left: 10px; min-width: 0px; max-width: 400px; overflow: hidden; text-overflow: ellipsis;">
 					<span class="gameTitle">Kittens Game </span>
 					<span style="font-size: small;">
-						by <a href="http://kittensgame.com/" class="copyright" target="_blank">bloodrizer</a>
+						by <a href="http://kittensgame.com/" class="copyright" target="_blank" tabindex="-1">bloodrizer</a>
 					</span>
 					<!--- a Dark Souls of incremental gaming -->
 
@@ -332,9 +331,9 @@
 					</span>
 
 					<span style="font-size: small;">
-						<a href="http://kittensgame.com/alpha" title="experimental, unstable" target="_blank" style="opacity:0.6;">&alpha;</a>
-						<a href="http://kittensgame.com/beta" title="experimental, stable" target="_blank">&beta;</a>
-						<a href="http://kittensgame.com/web" title="RC, nighty build" target="_blank">ML</a>
+						<a href="http://kittensgame.com/alpha" tabindex="0" title="experimental, unstable" target="_blank" style="opacity:0.6;">&alpha;</a>
+						<a href="http://kittensgame.com/beta" tabindex="0" title="experimental, stable" target="_blank">&beta;</a>
+						<a href="http://kittensgame.com/web" tabindex="0" title="RC, nighty build" target="_blank">ML</a>
 					</span>
 				</div>
 
diff --git a/js/buildings.js b/js/buildings.js
index 37372826d3..092dd156b7 100644
--- a/js/buildings.js
+++ b/js/buildings.js
@@ -371,7 +371,7 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 						energyProduction *= 0.75;
 					} else if (season == 1) {
 						energyProduction /= 0.75;
-						energyProduction *= (1 + game.getLimitedDR(game.getEffect("summerSolarFarmRatio"), 2));
+						energyProduction *= 1 + game.getEffect("summerSolarFarmRatio"); //LDR specified in challenges.js
 					}
 
 					var seasonRatio = game.getEffect("solarFarmSeasonRatio");
@@ -773,38 +773,87 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 	},
 	{
 		name: "warehouse",
-		label: $I("buildings.warehouse.label"),
-		description: $I("buildings.warehouse.desc"),
-		prices: [
-			{ name : "beam", val: 1.5 },
-			{ name : "slab", val: 2 }
-		],
-		priceRatio: 1.15,
-		effects: {
-			"catnipMax": 0,
-			"woodMax": 0,
-			"mineralsMax": 0,
-			"coalMax": 0,
-			"ironMax": 0,
-			"titaniumMax": 0,
-			"goldMax": 0
+		stages: [
+			{
+				label: $I("buildings.warehouse.label"),
+				description: $I("buildings.warehouse.desc"),
+				flavor: $I("buildings.warehouse.flavor"),
+				prices: [
+					{ name : "beam", val: 1.5 },
+					{ name : "slab", val: 2 }
+				],
+				priceRatio: 1.15,
+				effects: {
+					"catnipMax": 0,
+					"woodMax": 0,
+					"mineralsMax": 0,
+					"coalMax": 0,
+					"ironMax": 0,
+					"titaniumMax": 0,
+					"goldMax": 0
+					},
+				stageUnlocked: true,
+				togglable: false
 			},
+			{
+				label: $I("buildings.spaceport.label"),
+				description: $I("buildings.spaceport.desc"),
+				flavor: $I("buildings.spaceport.flavor"),
+				prices: [
+					{ name: "titanium", val: 10000 },
+					{ name: "eludium", val: 500 },
+					{ name: "kerosene", val: 1000 },
+					{ name: "blueprint", val: 500 },
+					{ name: "starchart", val: 100000 },
+				],
+				priceRatio: 1.15,
+				effects: {
+					"moonBaseStorageBonus": 0,
+					"planetCrackerStorageBonus": 0,
+					"cryostationStorageBonus": 0,
+					"energyConsumption": 0
+				},
+				stageUnlocked: true,
+				togglable: true
+			}
+		],
 		calculateEffects: function(self, game){
+			var stageMeta = self.stages[self.stage];
+            if (self.stage == 0){
+                var effects = {
+					"catnipMax": 0,
+					"woodMax": 150,
+					"mineralsMax": 200,
+					"coalMax": 30,
+					"ironMax": 25,
+					"titaniumMax": 10,
+					"goldMax": 5
+				};
+	
+				if (game.workshop.get("silos").researched){
+					effects["catnipMax"] = 750;
+				}
+	
+				stageMeta.effects = game.resPool.addBarnWarehouseRatio(effects);
+            } else if (self.stage == 1){
 			var effects = {
-				"catnipMax": 0,
-				"woodMax": 150,
-				"mineralsMax": 200,
-				"coalMax": 30,
-				"ironMax": 25,
-				"titaniumMax": 10,
-				"goldMax": 5
+					"moonBaseStorageBonus": 0.0085,
+					"planetCrackerStorageBonus": 0.0085,
+					"cryostationStorageBonus": 0.0085,
+					"energyConsumption": 5
 			};
-
-			if (game.workshop.get("silos").researched){
-				effects["catnipMax"] = 750;
+			if(self.on >= 10) {
+				//The first 10 Spaceports each cost 5Wt to run.
+				//The 11th Spaceport costs 6Wt to run.
+				//The 12th Spaceport costs 7Wt to run.
+				//etc.
+				effects[ "energyConsumption" ] = 0.5 * (self.on - 9) + 45 / self.on;
 			}
-
-			self.effects = game.resPool.addBarnWarehouseRatio(effects);
+                stageMeta.effects = effects;
+            }
+		},
+		upgrades: {
+			spaceBuilding: ["moonBase", "planetCracker", "cryostation"]
 		},
 		flavor: $I("buildings.warehouse.flavor"),
 		unlockScheme: {
@@ -1064,8 +1113,12 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 			self.effects["steelPerTickProd"] = 0;
 
 			var steelRatio = game.getEffect("calcinerSteelRatio");
-			if (steelRatio != 0){
-
+			if (steelRatio == 0) {
+				self.description = $I("buildings.calciner.desc");
+				self.isAutomationEnabled = null;
+			} else {
+				self.description = $I("buildings.calciner.desc") + "<br>" +
+					$I("buildings.calciner.desc.automation", [(100 * steelRatio).toFixed()]);
 				if (self.isAutomationEnabled == null) {
 					self.isAutomationEnabled = true;
 				}
@@ -1172,17 +1225,28 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 				}
 			}
 			self.effects["manuscriptPerTickProd"] = amt;
+
+			//Update description to explain what automation does:
+			if (game.workshop.get("factoryAutomation").researched) {
+				self.description = $I("buildings.steamworks.desc") + "<br>" + $I("buildings.steamworks.desc.automation");
+			} else {
+				self.description = $I("buildings.steamworks.desc");
+			}
 		},
 		jammed: false,
 		togglableOnOff: true,
 		isAutomationEnabled: null,
 		action: function(self, game) {
-			if (self.on < 1 || self.jammed || !game.workshop.get("factoryAutomation").researched) {
+			if (game.workshop.get("factoryAutomation").researched) {
+				if (self.isAutomationEnabled == null) { //force non-null value
+					self.isAutomationEnabled = true;
+				}
+			} else {
+				self.isAutomationEnabled = null;
 				return;
 			}
-
-			if (self.isAutomationEnabled == null) {
-				self.isAutomationEnabled = true;
+			if (self.on < 1 || self.jammed) {
+				return;
 			}
 
 			var wood = game.resPool.get("wood");
@@ -1297,10 +1361,18 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 		},
 		isAutomationEnabled: null,
 		calculateEffects: function(self, game) {
+			//The upgrade that optionally increases oil prod at the cost of energy:
 			var hasPumpjack = game.workshop.get("pumpjack").researched;
 			self.togglable = hasPumpjack;
-			if (self.isAutomationEnabled == null && hasPumpjack) {
-				self.isAutomationEnabled = true;
+
+			if (hasPumpjack) {
+				self.description = $I("buildings.oilWell.desc") + "<br>" + $I("buildings.oilWell.desc.automation");
+				if (self.isAutomationEnabled == null) { //force non-null value
+					self.isAutomationEnabled = true;
+				}
+			} else {
+				self.description = $I("buildings.oilWell.desc");
+				self.isAutomationEnabled = null;
 			}
 
 			var oilRatio = 1 + game.getEffect("oilWellRatio");
@@ -1379,8 +1451,10 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 
 			effects["energyConsumption"] = 2;
 			if(game.workshop.get("carbonSequestration").researched){
+				self.description = $I("buildings.factory.desc") + "<br>" + $I("buildings.factory.desc.automation");
 				self.isAutomationEnabled = (self.isAutomationEnabled === null) ? true : self.isAutomationEnabled;
 			} else {
+				self.description = $I("buildings.factory.desc");
 				self.isAutomationEnabled = null;
 			}
 			effects["energyConsumption"] *= (self.isAutomationEnabled)? 2 : 1;
@@ -1412,8 +1486,14 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 		isAutomationEnabled: null,
 		calculateEffects: function(self, game) {
 			self.effects["uraniumPerTick"] = -0.001 * (1 - game.getEffect("uraniumRatio"));
-			if (self.isAutomationEnabled == null && game.workshop.get("thoriumReactors").researched) {
-				self.isAutomationEnabled = true;
+			if (game.workshop.get("thoriumReactors").researched) {
+				self.description = $I("buildings.reactor.desc") + "<br>" + $I("buildings.reactor.desc.automation");
+				if (self.isAutomationEnabled == null ) {
+					self.isAutomationEnabled = true; //force non-null value
+				}
+			} else {
+				self.description = $I("buildings.reactor.desc");
+				self.isAutomationEnabled = null;
 			}
 		},
 		action: function(self, game) {
@@ -2217,6 +2297,17 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 						isTemporary: true //can't exploit buy manipulating pollution in postApocalypse
 					});
 		}
+		/**
+		 * Spaceport will use a much steper price ratio for starcharts to be a dedicated starchart sinker
+		 */
+		if (bld.get("name") == "warehouse" && bld.get("stage") == 1){
+			for (var i = 0; i < prices.length; i++) {
+				if (prices[i].name == "starchart"){
+					prices[i].val = prices[i].val * Math.pow(1.35, bld.get("val"));
+				}
+			}
+		}
+
 		return prices;
 	 },
 
@@ -2619,13 +2710,38 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 			props.controller.sellInternal(model, model.metadata.val - amt, false /*requireSellLink*/);
 
 		} else if (data.action == "sell"){
-			//tbd
-			console.warn("Not implemented yet");
-		} else if (data.action == "upgrade"){
-			console.warn("Not implemented yet");
-		} else if (data.action == "downgrade"){
-			console.warn("Not implemented yet");
+			//I spent too long trying to understand why Bloodrizer did it the way she did.
+			//The meat of the function requires 2 things: the controller & the model.
+			var props = { //We need these props for later when we get the model.
+				key:            bld.name,
+				name:           bld.label,
+				description:    bld.description,
+				building:       bld.name
+			};
+			if (typeof(bld.stages) == "object"){ //Be sure to get the proper type of controller for the building we're working with
+				props.controller = new classes.ui.btn.StagingBldBtnController(this.game);
+			} else {
+				props.controller = new classes.ui.btn.BuildingBtnModernController(this.game);
+			}
+			var model = props.controller.fetchModel(props); //We need the model to actually change the data of the building
+
+			//The meat of the function: un-sell the buildings.
+			//Since buildings are sold for a 50% refund, we need to un-refund everything
+			for (var i = 0; i < amt; i += 1) {
+				props.controller.incrementValue(model);
+				props.controller.payPriceForUndoRefund(model);
+			}
+			this.game.render();
+		} else if (data.action == "deltagrade"){ //Generic term for upgrading/downgrading
+			bldMetaRaw.stage = Math.max(0, bldMetaRaw.stage - amt);
+
+			//Update because it changed when we changed stages
+			bld = new classes.BuildingMeta(bldMetaRaw).getMeta();
 		}
+
+		this.game.upgrade({ buildings: [bld.name]});
+		this.game.upgrade(bld.upgrades);
+		this.game.render();
 	}/*,
 
 	refund: function(bldId, amt, refundPercentage){
@@ -2746,7 +2862,7 @@ dojo.declare("classes.ui.btn.BuildingBtnModernController", com.nuclearunicorn.ga
 		return !this.game.opts.hideSell;
 	},
 
-    build: function(model, maxBld){
+    build: function(model, opts){
 		var counter = this.inherited(arguments);
 
 		//update stats
@@ -2763,13 +2879,14 @@ dojo.declare("classes.ui.btn.BuildingBtnModernController", com.nuclearunicorn.ga
 	},
 
 	sell: function(event, model){
-		var selled = this.inherited(arguments);
-		if (selled) {
+		var amtSold = this.inherited(arguments);
+
+		if (amtSold > 0) {
 			var undo = this.game.registerUndoChange();
 			undo.addEvent("building", {
 				action: "sell",
 				metaId: model.metadata.name,
-				val: 1
+				val: amtSold
 			});
 		}
 	},
@@ -2850,38 +2967,58 @@ dojo.declare("classes.ui.btn.StagingBldBtnController", classes.ui.btn.BuildingBt
 
 	downgrade: function(model) {
 		if (this.game.opts.noConfirm) {
-			this.deltagrade(this, model, -1);
+			this.deltagrade(model, -1);
 		} else {
 			var self = this;
 			this.game.ui.confirm("", $I("buildings.downgrade.confirmation.msg"), function() {
-				self.deltagrade(self, model, -1);
+				self.deltagrade.apply(self, [model, -1]);
 			});
 		}
 	},
 
 	upgrade: function(model) {
 		if (this.game.opts.noConfirm) {
-			this.deltagrade(this, model, +1);
+			this.deltagrade(model, +1);
 		} else {
 			var self = this;
 			this.game.ui.confirm("", $I("buildings.upgrade.confirmation.msg"), function() {
-				self.deltagrade(self, model, +1);
+				self.deltagrade.apply(self, [model, +1]);
 			});
 		}
 	},
 
-	deltagrade: function(self, model, delta) {
-		var metadataRaw = self.getMetadataRaw(model);
+	/**
+	 * Upgrade or downgrade building 
+	 * @param {*} model 
+	 * @param {*} delta 
+	 */
+	deltagrade: function(model, delta) {
+		var metadataRaw = this.getMetadataRaw(model);
+		var undo = this.game.registerUndoChange();
+		undo.addEvent("building", {
+			action:"deltagrade",
+			metaId: model.options.building,
+			val: delta
+		});
+
+		if (metadataRaw.val > 0) { //Sell until 0 are left (to refund to the player)
+			undo.addEvent("building", { //The order of these undo events matters A LOT
+				action:"sell",
+				metaId: model.options.building,
+				val: metadataRaw.val
+			});
+			this.sellInternal(model, 0, false /*requireSellLink*/);
+		}
 		metadataRaw.stage += delta;
 		if (!metadataRaw.stage) {metadataRaw.stage = Math.max(0, delta);}
 
 		metadataRaw.val = 0;	//TODO: fix by using separate value flags
 		metadataRaw.on = 0;
 		if (metadataRaw.calculateEffects){
-			metadataRaw.calculateEffects(metadataRaw, self.game);
+			metadataRaw.calculateEffects(metadataRaw, this.game);
 		}
-		self.game.upgrade(metadataRaw.upgrades);
-		self.game.render();
+		this.game.upgrade(metadataRaw.upgrades);
+		this.game.render();
 	},
 
 	getMetadataRaw: function(model) {
diff --git a/js/calendar.js b/js/calendar.js
index d525a8b462..5822a3acee 100644
--- a/js/calendar.js
+++ b/js/calendar.js
@@ -827,7 +827,7 @@ dojo.declare("com.nuclearunicorn.game.Calendar", null, {
 			var coldChance = 175;
 			var warmChance = 175;
 
-			var effect = this.game.getLimitedDR(this.game.getEffect("coldChance") * 1000, 825);
+			var effect = 1000 * this.game.getEffect("coldChance"); //LDR specified in challenges.js
 			coldChance += effect;
 			warmChance -= effect;
 			if (warmChance < 0) {
@@ -1082,10 +1082,10 @@ if (++this.cycleYear >= this.yearsPerCycle) {
 			mod += -0.15;
 		}
 		if (this.game.challenges.getChallenge("winterIsComing").on && this.weather == "cold") {
-			mod *= 1 + this.game.getLimitedDR(this.game.getEffect("coldHarshness"),1);
+			mod *= 1 + this.game.getEffect("coldHarshness"); //LDR specified in challenges.js
 		}
 		if (this.getCurSeason().name == "spring") {
-                        mod *= (1 + this.game.getLimitedDR(this.game.getEffect("springCatnipRatio"), 2));
+                        mod *= 1 + this.game.getEffect("springCatnipRatio"); //LDR specified in challenges.js
                 }
 
 		return mod;
diff --git a/js/challenges.js b/js/challenges.js
index e36ee18a61..792fcb894f 100644
--- a/js/challenges.js
+++ b/js/challenges.js
@@ -8,13 +8,27 @@ dojo.declare("classes.managers.ChallengesManager", com.nuclearunicorn.core.TabMa
 				//Challenge has no effects defined, so just return 0 for "no effect."
 				return 0;
 			}
-			if (effectName === "tradeKnowledgeRatio") {
-				//This one is specially calculated using a formula that already takes into account Challenge completions.
-				return challenge.effects[effectName];
+			//Get the base amount for the effect:
+			var amt = challenge.effects[effectName] || 0;
+			if (effectName == "kittenLaziness" ) { //Calculated in a special way just for the Anarchy Challenge
+				return amt;
 			}
-
-			//Default behavior for any stackable meta:
-			return challenge.effects[effectName] * challenge.on;
+			var stackOptions = (challenge.stackOptions || {})[effectName] || {}; //Get the stack options for this effect.  If it doesn't exist, get an empty object instead.
+			if (stackOptions.noStack) {
+				//This effect doesn't stack.  Apply only if the Challenge has been completed.
+				return challenge.researched ? amt : 0;
+			}
+			//Else, the effect stacks with Challenge completions.
+			amt *= challenge.on;
+			if (stackOptions.LDRLimit) {
+				amt = game.getLimitedDR(amt, stackOptions.LDRLimit);
+			}
+			if (stackOptions.capMagnitude) {
+				//Used for weapon efficiency in the Pacifism Challenge.
+				//Clamp amt so its magnitude is no greater than capMagnitude.
+				amt = Math.max(-stackOptions.capMagnitude, Math.min(stackOptions.capMagnitude, amt));
+			}
+			return amt;
 		}});
 		this.setEffectsCachedExisting();
 		this.reserves = new classes.reserveMan(game);
@@ -22,6 +36,13 @@ dojo.declare("classes.managers.ChallengesManager", com.nuclearunicorn.core.TabMa
 
 	currentChallenge: null,
 
+	//Challenges have an optional property named "stackOptions".
+	//stackOptions is a table where the keys are the names of effects & the values are objects with parameters that control how that effect behaves when the challenge has been completed multiple times.
+	//	noStack - If true, the effect only cares about whether or not the Challenge has been completed, but it doesn't care about the exact number of completions.
+	//			If noStack is combined with another option, noStack overrides all other options & the effect doesn't stack.
+	//	LDRLimit - Applies Limited Diminishing Returns (LDR) specifying the asymptotic limit.
+	//	capMagnitude - The magnitude of the effect will be clamped to this value, but the sign of the effect will not be changed.
+	//			If capMagnitude is combined with LDRLimit, the LDR will be applied first, then the magnitude will be capped afterwards.
     challenges:[
     {
 		name: "ironWill",
@@ -46,6 +67,12 @@ dojo.declare("classes.managers.ChallengesManager", com.nuclearunicorn.core.TabMa
 			"coldChance": 0,
 			"coldHarshness": 0
 		},
+		stackOptions: {
+			"springCatnipRatio": { LDRLimit: 2 },
+			"summerSolarFarmRatio": { LDRLimit: 2 },
+			"coldChance": { LDRLimit: 0.825 },
+			"coldHarshness": { LDRLimit: 1 }
+		},
 		calculateEffects: function(self, game){
 			if (self.active) {
 				self.effects["springCatnipRatio"] = 0;
@@ -73,14 +100,19 @@ dojo.declare("classes.managers.ChallengesManager", com.nuclearunicorn.core.TabMa
 			"masterSkillMultiplier": 0.2,
 			"kittenLaziness": 0
         },
-        calculateEffects: function(self, game){
-            if (self.active) {
-            	self.effects["masterSkillMultiplier"] = 0;
-            	self.effects["kittenLaziness"] = 0.05;
-            }else{
+		stackOptions: {
+			"masterSkillMultiplier": { LDRLimit: 4 },
+			"kittenLaziness": { LDRLimit: 0.25 }
+		},
+		calculateEffects: function(self, game){
+			if (self.active) {
+				self.effects["masterSkillMultiplier"] = 0;
+				self.effects["kittenLaziness"] = 0.5 + game.getLimitedDR(0.05 * self.on, self.stackOptions["kittenLaziness"].LDRLimit);
+			}else{
 				self.effects["masterSkillMultiplier"] = 0.2;
+				self.effects["kittenLaziness"] = 0;
 			}
-        },
+		},
 		checkCompletionCondition: function(game){
 			return game.bld.get("aiCore").val > 0;
 		}
@@ -95,6 +127,9 @@ dojo.declare("classes.managers.ChallengesManager", com.nuclearunicorn.core.TabMa
 			"energyConsumptionRatio": -0.02,
 			"energyConsumptionIncrease": 0
 		},
+		stackOptions: {
+			"energyConsumptionRatio": { LDRLimit: 1 }
+		},
 		calculateEffects: function(self, game){
 			if (self.active) {
 				self.effects["energyConsumptionRatio"] = 0;
@@ -129,6 +164,9 @@ dojo.declare("classes.managers.ChallengesManager", com.nuclearunicorn.core.TabMa
 			"manpowerMaxChallenge": 0,
 			"challengeHappiness": 0
 		},
+		stackOptions: {
+			"faithSolarRevolutionBoost": { LDRLimit: 4 }
+		},
 		calculateEffects: function(self, game) {
             if (self.active) {
 				self.effects["faithSolarRevolutionBoost"] = 0;
@@ -162,6 +200,9 @@ dojo.declare("classes.managers.ChallengesManager", com.nuclearunicorn.core.TabMa
 			"temporalPressCap" : 0,
 			"heatEfficiency": 0.1
         },
+		stackOptions: {
+			"shatterCostReduction": { LDRLimit: 1 }
+		},
         calculateEffects: function(self, game){
             if (self.active) {
         	    self.effects["shatterCostReduction"] = 0;
@@ -194,13 +235,20 @@ dojo.declare("classes.managers.ChallengesManager", com.nuclearunicorn.core.TabMa
 		researched: false,
 		unlocked: false,
         effects: {
-            "corruptionBoostRatioChallenge": 0.1
+			"corruptionBoostRatioChallenge": 0.1,
+			"bskSattelitePenalty": 0
         },
+		stackOptions: {
+			"corruptionBoostRatioChallenge": { LDRLimit: 2 },
+			"bskSattelitePenalty": { LDRLimit: 30 }
+		},
         calculateEffects: function(self, game){
             if (self.active) {
                 self.effects["corruptionBoostRatioChallenge"] = 0;
+                self.effects["bskSattelitePenalty"] = 0.1 * (game.ironWill ? 0 : (self.on || 0));
             }else{
 				self.effects["corruptionBoostRatioChallenge"] = 0.1;
+				self.effects["bskSattelitePenalty"] = 0;
 			}
 			game.upgrade(self.upgrades);
         },
@@ -224,6 +272,10 @@ dojo.declare("classes.managers.ChallengesManager", com.nuclearunicorn.core.TabMa
 			"steamworksFakeBought": 0,
 			"tradeKnowledgeRatio": 0
         },
+		stackOptions: {
+			"tradeKnowledgeRatio": { noStack: true },
+			"weaponEfficency": { capMagnitude: 1 }
+		},
         calculateEffects: function(self, game){
             if (self.active) {
                 self.effects["alicornPerTickRatio"] = 0;
@@ -390,6 +442,10 @@ dojo.declare("classes.managers.ChallengesManager", com.nuclearunicorn.core.TabMa
 				this.getChallenge("energy").unlocked = true;
 			}
 		} 
+
+		//Iron Will has special rules.  Just make the UI more obvious when the game is in IW mode:
+		this.getChallenge("ironWill").active = this.game.ironWill;
+
 		//checkCompletionCondition for functions tested for completion here
 		for(var i = 0; i < this.challenges.length; i++){
 			if(this.challenges[i].active && this.challenges[i].checkCompletionCondition && this.challenges[i].checkCompletionCondition(this.game)){
@@ -720,6 +776,76 @@ dojo.declare("classes.ui.ChallengePanel", com.nuclearunicorn.game.ui.Panel, {
 
 });
 
+dojo.declare("classes.ui.ChallengeEffectsPanel", com.nuclearunicorn.game.ui.Panel, {
+	//The name of the Challenge that this panel lists the effects of:
+	challengeName: "",
+
+	constructor: function() {
+		this.listElement = null;
+	},
+
+	//Links this panel up with the correct Challenge internally & sets the title to be "effects of [challengeName]":
+	setChallengeName: function(challengeName) {
+		this.challengeName = challengeName;
+		this.name = $I("challendge.effects.panel.label", [this.game.challenges.getChallenge(challengeName).label]);
+	},
+
+	render: function(container) {
+		var content = this.inherited(arguments);
+		this.listElement = dojo.create("ul", { style: "margin-top: 0px; margin-bottom: 0px;" }, content);
+		this.generateEffectsList();
+	},
+
+	/**
+	 * Populates the list of the Challenge's effects and/or updates it with the most recent information.
+	 * This function goes out of its way to only modify UI elements exactly as needed--no more, no less.
+	 * The list of Challenge effects will be empty if the Challenge in question isn't unlocked yet.
+	 */
+	generateEffectsList: function() {
+		var challengeData = this.game.challenges.getChallenge(this.challengeName);
+		if (!challengeData.unlocked) {
+			//Challenge isn't unlocked yet, so don't display any effects for it.
+			if (this.listElement.hasChildNodes()) {
+				dojo.empty(this.listElement);
+			}
+			return;
+		}
+		//Else, the Challenge is unlocked.
+		var childNodes = this.listElement.childNodes;
+		var i = 0;
+		for (var effectName in challengeData.effects) {
+			var displayParams = this.game.getEffectDisplayParams(effectName, challengeData.totalEffectsCached[effectName], false /*showIfZero*/);
+			//displayParams could be null if this is the sort of effect that's supposed to be hidden.
+			if (!displayParams) {
+				continue;
+			}
+			//Else, non-null therefore display this effect:
+			var textToDisplay = displayParams.displayEffectName + ": " + displayParams.displayEffectValue;
+			if (childNodes.length <= i) {
+				//Create a DOM node only if we need to.
+				dojo.create("li", { innerHTML: textToDisplay }, this.listElement);
+			} else if(dojo.attr(childNodes[i], "innerHTML") != textToDisplay) {
+				//Modify an existing DOM node only if we need to.
+				dojo.attr(childNodes[i], "innerHTML", textToDisplay);
+			}
+			i += 1;
+		}
+		while (i < childNodes.length) {
+			//Destroy any unnecessary DOM nodes.
+			dojo.destroy(childNodes[childNodes.length - 1]);
+		}
+	},
+
+	update: function() {
+		this.inherited(arguments);
+		this.generateEffectsList();
+
+		//Update visible/invisible status:
+		//Show effects panel only if the game is set to show them && there is at least 1 effect to show.
+		this.setVisible(Boolean(this.game.detailedChallengeInfo) && this.listElement.hasChildNodes());
+	}
+});
+
 dojo.declare("classes.tab.ChallengesTab", com.nuclearunicorn.game.ui.tab, {
 	render: function(container){
 		this.challengesPanel = new classes.ui.ChallengePanel($I("challendge.panel.label"), this.game.challenges);
@@ -781,11 +907,51 @@ dojo.declare("classes.tab.ChallengesTab", com.nuclearunicorn.game.ui.tab, {
 		}, this.game);
 		reclaimReservesBtn.render(container);
 		this.reclaimReservesBtn = reclaimReservesBtn;
+
+		var showChallengeEffectsBtn = new com.nuclearunicorn.game.ui.ButtonModern({
+			name: $I("challendge.effects.show.label"),
+			description: $I("challendge.effects.toggle.desc"),
+			handler: dojo.hitch(this, function() {
+				this.game.detailedChallengeInfo = !this.game.detailedChallengeInfo;
+			}),
+			controller: new com.nuclearunicorn.game.ui.ButtonController(this.game, {
+				updateVisible: function (model) {
+					var effectsPanels = this.game.challengesTab.challengeEffects; //Array of UI panels that list the Challenge effects
+					if (effectsPanels) {
+						//The button to toggle Challenge effects is visible only if there is at least 1 effect to display right now:
+						model.visible = effectsPanels.some(function(challengeEffectsPanel) {
+							return challengeEffectsPanel.listElement.hasChildNodes();
+						});
+					} else {
+						model.visible = false;
+					}
+				},
+				getName: function() {
+					return this.game.detailedChallengeInfo ? $I("challendge.effects.hide.label") : $I("challendge.effects.show.label");
+				}
+			})
+		}, this.game);
+		showChallengeEffectsBtn.render(container);
+		this.showChallengeEffectsBtn = showChallengeEffectsBtn;
+
+		//Summary of total Challenge effects:
+		this.challengeEffects = [];
+		for (var i = 0; i < this.game.challenges.challenges.length; i += 1) {
+			var effectPanel = new classes.ui.ChallengeEffectsPanel("", this.game.challenges);
+			effectPanel.game = this.game;
+			effectPanel.setChallengeName(this.game.challenges.challenges[i].name);
+			effectPanel.render(container);
+			this.challengeEffects.push(effectPanel);
+		}
 	},
 
 	update: function(){
 		this.challengesPanel.update();
 		//this.conditionsPanel.update();
 		this.applyPendingBtn.update();
+		this.showChallengeEffectsBtn.update();
+		for (var i = 0; i < this.challengeEffects.length; i += 1) {
+			this.challengeEffects[i].update();
+		}
 	}
 });
diff --git a/js/diplomacy.js b/js/diplomacy.js
index a7549527aa..188d54b37c 100644
--- a/js/diplomacy.js
+++ b/js/diplomacy.js
@@ -487,22 +487,13 @@ dojo.declare("classes.managers.DiplomacyManager", null, {
 		var raceRatio = 1 + race.energy * 0.02;
 		var currentSeason = this.game.calendar.getCurSeason().name;
 
-		var embassyEffect = this.game.ironWill ? 0.0025 : 0.01;
 		for (var i = 0; i < race.sells.length; i++) {
 			var sellResource = race.sells[i];
-			//you must be this tall to trade this rare resource
-			if (!this.game.diplomacy.isValidTrade(sellResource, race)) {
+			var tradeChance = this.getResourceTradeChance(sellResource, race);
+			if (tradeChance == 0) {
 				continue;
 			}
 
-
-			var tradeChance = sellResource.chance *
-				(1 + (
-					race.embassyPrices ?
-					this.game.getLimitedDR(race.embassyLevel * embassyEffect, 0.75) :
-					0)
-				);
-
 			var resourcePassedNormalTradeAmount = this.game.math.binominalRandomInteger(normalTradeAmount, tradeChance);
 			var resourcePassedBonusTradeAmount = this.game.math.binominalRandomInteger(bonusTradeAmount, tradeChance);
 
@@ -518,12 +509,15 @@ dojo.declare("classes.managers.DiplomacyManager", null, {
 		}
 
 		//-------------------- 35% chance to get spice + 1% per embassy lvl ------------------
+		var spiceChance = this.getSpiceTradeChance(race);
 		var spiceTradeAmount = this.game.math.binominalRandomInteger(
-			successfullTradeAmount,
-			0.35 * (1 + (race.embassyPrices ?  race.embassyLevel * embassyEffect : 0))
+			successfullTradeAmount, spiceChance
 		);
 		boughtResources["spice"] = 25 * spiceTradeAmount +
 			50 * tradeRatio * this.game.math.irwinHallRandom(spiceTradeAmount);
+		if (spiceChance > 1) { //Past 100% chance, additional embassies increase amount of spice gained.
+			boughtResources["spice"] *= spiceChance; //e.g. 150% chance -> guaranteed ×1.5 spice
+		}
 
 		//-------------- 10% chance to get blueprint ---------------
 		boughtResources["blueprint"] = Math.floor(
@@ -654,6 +648,24 @@ dojo.declare("classes.managers.DiplomacyManager", null, {
 		}
 		return min;
 	},
+	getSpiceTradeChance: function(race) {
+		var embassyEffect = this.game.ironWill ? 0.0025 : 0.01;
+		return 0.35 * (1 + (race.embassyPrices ?  race.embassyLevel * embassyEffect : 0));
+	},
+	getResourceTradeChance: function(sellResourceOpts, race) {
+		var embassyEffect = this.game.ironWill ? 0.0025 : 0.01;
+		//you must be this tall to trade this rare resource
+		if (!this.game.diplomacy.isValidTrade(sellResourceOpts, race)) {
+			return 0;
+		}
+		//Else, chance is based on embassy level:
+		return sellResourceOpts.chance *
+				(1 + (
+					race.embassyPrices ?
+					this.game.getLimitedDR(race.embassyLevel * embassyEffect, 0.75) :
+					0)
+				);
+	},
 	getMarkerCap: function(){
 		return Math.floor(
 			(this.game.religion.getZU("marker").getEffectiveValue(this.game) * 5 + 5) *
@@ -1035,6 +1047,126 @@ dojo.declare("classes.diplomacy.ui.EmbassyButtonController", com.nuclearunicorn.
 	}
 });
 
+//Embassy Buttons have a custom tooltip:
+var EmbassyButtonHelper = {
+	//This is a modified version of ButtonModernHelper.getTooltipHTML from core.js.
+	getTooltipHTML: function(controller, model) {
+		controller.fetchExtendedModel(model);
+		//throw "ButtonModern::getTooltipHTML must be implemented";
+
+		var tooltip = dojo.create("div", { className: "tooltip-inner" }, null);
+
+		if (model.tooltipName) {
+			dojo.create("div", {
+				innerHTML: model.name,
+				className: "tooltip-divider"
+			}, tooltip);
+		}
+
+		// description
+		var descDiv = dojo.create("div", {
+			innerHTML: model.description,
+			className: "desc"
+		}, tooltip);
+
+		//Remove the ability to display some properties because embassies don't have those.  You can add them back in if needed.
+		//Automation is removed.
+		//Cath pollution is removed.
+		//"Almost limited" is removed.
+
+		var prices = model.priceModels;
+		var effects = model.effectModels;
+		var flavor = model.flavor;
+		if (prices && prices != "" || effects || flavor && flavor != ""){
+			dojo.style(descDiv, "paddingBottom", "8px");
+
+			// prices
+			if (prices && prices.length){
+				dojo.style(descDiv, "borderBottom", "1px solid gray");
+				ButtonModernHelper.renderPrices(tooltip, model);	//simple prices
+			}
+
+			//You must have done a bunch of trading already (with any race) before embassies show you this advanced info:
+			var TOTAL_TRADES_TO_SEE_CHANCES = 50;
+			//Ability to render effects is replaced with this because I want to try something a little different for embassies.
+			if (controller.game.stats.getStatCurrent("totalTrades").val >= TOTAL_TRADES_TO_SEE_CHANCES) {
+				EmbassyButtonHelper.renderResourceChances(tooltip, controller.game, model.options.race);
+			}
+
+			// flavor
+
+			if (flavor && flavor != "") {
+				dojo.create("div", {
+					innerHTML: flavor,
+					className: "flavor",
+					style: {
+						paddingTop: "20px",
+						fontSize: "12px",
+						fontStyle: "italic"
+				}}, tooltip);
+			}
+
+		} else {
+			dojo.style(descDiv, "paddingBottom", "4px");
+		}
+
+		return tooltip.outerHTML;
+	},
+
+	//Create a section in the embassy tooltip that displays the chance to get resources.
+	//But we only show resources that are actually affected by embassies.  We also only show unlocked resources.
+	renderResourceChances: function(tooltip, game, race) {
+		//Build a list of each resource whose chance depends on embassies:
+		var chancesToDisplay = [];
+		for (var i = 0; i < race.sells.length; i += 1) {
+			var sellOptions = race.sells[i]; //Example: {name: "slab", value: 5, chance: 0.75, width: 0.15, minLevel: 5}
+			var sellResource = game.resPool.get(sellOptions.name); //Actual resources object.
+			if (!sellResource.unlocked) {
+				continue; //Don't display a resource that's not unlocked yet.
+			}
+			if (sellOptions.chance >= 1) {
+				continue; //Chance is fixed at 100%, therefore not based on embassies, so don't display.
+			}
+			var sellChance = Math.min(game.diplomacy.getResourceTradeChance(sellOptions, race), 1); //Cap at 100%
+			if (sellChance == 0 ) {
+				continue; //Don't display a resource that we can't get from them.
+			}
+			chancesToDisplay.push({ title: sellResource.title, chance: sellChance });
+		}
+		//Don't forget to include spice, which is special:
+		var spiceResource = game.resPool.get("spice");
+		var spiceChance = game.diplomacy.getSpiceTradeChance(race);
+		if (spiceResource.unlocked && spiceChance > 0) {
+			var spiceMulti = spiceChance > 1 ? spiceChance : undefined; //Past 100% chance, additional embassies increase spice amount.
+			spiceChance = Math.min(spiceChance, 1); //Cap at 100%
+			chancesToDisplay.push({ title: spiceResource.title, chance: spiceChance, multi: spiceMulti });
+		}
+
+		//Don't mention blueprints or titanium because neither of those is affected by embassies.
+
+		if (chancesToDisplay.length < 1) {
+			return; //Skip modifying the tooltip if there's nothing to show.
+		}
+		//Else, update the tooltip to show what embassies affect.
+		dojo.create("div", {
+			innerHTML: $I("trade.embassy.chance") + ":",
+			className: "tooltip-divider" + " resEffectsTxt",
+			style: {
+				textAlign: "center",
+				width: "100%",
+				borderBottom: "1px solid gray",
+				paddingBottom: "4px",
+				marginBottom: "8px"
+		}}, tooltip);
+		for (var i = 0; i < chancesToDisplay.length; i += 1) {
+			dojo.create("div", {
+				innerHTML: chancesToDisplay[i].title + ": " + (100 * chancesToDisplay[i].chance).toFixed(1) + "%" + (chancesToDisplay[i].multi ? ", ×" + game.getDisplayValueExt(chancesToDisplay[i].multi) : ""),
+				className: "effectName"
+			}, tooltip);
+		}
+	}
+};
+
 
 dojo.declare("classes.diplomacy.ui.EmbassyButton", com.nuclearunicorn.game.ui.ButtonModern, {
 	pinLinkHref: null,
@@ -1059,6 +1191,10 @@ dojo.declare("classes.diplomacy.ui.EmbassyButton", com.nuclearunicorn.game.ui.Bu
 		});
 	},
 
+	getTooltipHTML: function() {
+		return EmbassyButtonHelper.getTooltipHTML;
+	},
+
 	update: function(){
 		this.inherited(arguments);
 		this.pinLinkHref.link.textContent = this.race.pinned ? "[v]" : "[ ]";
diff --git a/js/jsx/left.jsx.js b/js/jsx/left.jsx.js
index 8b2e3b005d..e79e73089c 100644
--- a/js/jsx/left.jsx.js
+++ b/js/jsx/left.jsx.js
@@ -573,7 +573,9 @@ WResourceTable = React.createClass({
                 $r("div", {className:"res-toolbar right"}, 
                     $r("a", {
                         className: "link" + (this.state.isEditMode ? " toggled" : ""), 
-                        onClick: this.toggleEdit
+                        onClick: this.toggleEdit,
+                        onKeyDown: this.onKeyDown,
+                        tabIndex: 0
                     }, "⚙"),
                     $r(WTooltip, {body:"?"}, 
                         $I("left.resources.tip"))
@@ -604,6 +606,12 @@ WResourceTable = React.createClass({
         ]);
     },
 
+    onKeyDown: function(event){
+        if (event.keyCode == 13){
+            this.toggleEdit();
+        }
+    },
+
     toggleEdit: function(){
         this.setState({isEditMode: !this.state.isEditMode});
     },
@@ -663,7 +671,9 @@ WCraftTable = React.createClass({
                 $r("div", {className:"res-toolbar right"}, 
                     $r("a", {
                         className: "link" + (this.state.isEditMode ? " toggled" : ""), 
-                        onClick: this.toggleEdit
+                        onClick: this.toggleEdit,
+                        onKeyDown: this.onKeyDown,
+                        tabIndex: 0
                     }, "⚙")
                 )
             ]),
@@ -674,6 +684,12 @@ WCraftTable = React.createClass({
         ]);
     },
 
+    onKeyDown: function(event){
+        if (event.keyCode == 13){
+            this.toggleEdit();
+        }
+    },
+
     toggleEdit: function(){
         this.setState({isEditMode: !this.state.isEditMode});
     },
@@ -828,9 +844,12 @@ WTooltip = React.createClass({
     },
 
     render: function(){
-        return $r("div", {className: "tooltip-block", 
+        return $r("div", {
+            tabIndex: 0,
+            className: "tooltip-block", 
             onMouseOver: this.onMouseOver, 
-            onMouseOut: this.onMouseOut
+            onMouseOut: this.onMouseOut,
+            onKeyDown: this.onKeyDown
         }, [
             this.props.body || $r("div", {className: "tooltip-icon"}, "[?]"),
             this.state.showTooltip ? $r("div", {className: "tooltip-content"}, 
@@ -843,6 +862,12 @@ WTooltip = React.createClass({
         this.setState({showTooltip: true});
     },
 
+    onKeyDown: function(e){
+        if (e.keyCode == 13){
+            this.setState({showTooltip: !this.state.showTooltip});
+        }
+    },
+
     onMouseOut: function(){
         this.setState({showTooltip: false});
     }
diff --git a/js/jsx/map.jsx.js b/js/jsx/map.jsx.js
deleted file mode 100644
index 7015447eb5..0000000000
--- a/js/jsx/map.jsx.js
+++ /dev/null
@@ -1,297 +0,0 @@
-WMapTile = React.createClass({
-    getInitialState: function() {
-        return {
-            isFocused: false
-        };
-    },
-    
-    getDefaultProperties: function(){
-        return {
-            x: 0,
-            y: 0,
-            data: {
-                level: 0,
-                cp: 0
-            },
-            onMouseDown: null,
-            onMouseUp: null,
-            scale: 0,
-            isSelected: false,
-            isActive: false
-        };
-    },
-
-    render: function(){
-        var data = this.props.data || {
-            level: 0,
-            cp: 0
-        };
-
-        var toLevel = game.village.map.toLevel(this.props.x, this.props.y);
-        var percentExplored = (data.cp / toLevel) * 100;
-
-
-        var tileClass = "";
-        var fillBracket = percentExplored / 10;     //100/10 where 100 is xp to level (vary), 10 is 10% increments from 0% to 90%
-        /*if (fillBracket > 0){
-            tileClass = " dots-" + Math.round(fillBracket);
-        }*/
-
-        if (this.state.isFocused){
-            tileClass += " focused";
-        }
-        if (this.props.isSelected){
-            tileClass += " selected";
-        }
-        if (this.props.isActive){
-            tileClass += " active";
-        }
-
-        if(!data.unlocked){
-            tileClass += " locked";
-        }
-
-        var scale = (1 - this.props.scale/2);
-
-        return $r("div", {
-            className: "map-cell" + tileClass,
-            onClick: this.onClick,
-            onMouseOver: this.onMouseOver, 
-            onMouseOut: this.onMouseOut,
-
-            style: {
-                //backgroundColor: "rgb(" + (255 - 7*data.level) + ","  + (255 - 20*data.level) + ",255, 0.6)",
-                backgroundColor: "rgb(255,"  + (200 - 20*data.level) + ",50, 0.6)",
-                width: (35 * scale) + "px",
-                height: (35 * scale) + "px"
-            }
-        },
-            /*$r("svg", null, 
-                $r("rect", {style: {fill: "url(#dots-" + Math.round(fillBracket) + ") #aaa"}})
-            ),*/
-
-            $r("span", {className: "coord"}, this.state.isFocused ? "[" + this.props.x + "," + this.props.y + "]" : "..."),
-            data && $r("div", {className: "label"}, data.title),
-            data.cp ? $r("progress", {value: percentExplored, max: 100}): null,
-            this.state.isFocused && 
-                ($r("div", {className: "tooltip-content"}, 
-                    [data ? 
-                        $r("div", {className: "label"}, [
-                            data.type && $r("div", null, "Terrain:" + data.type),
-                            $r("div", null, "lv." + data.level + " ["+ data.cp.toFixed() + "/" + toLevel.toFixed() + "cp]("+ percentExplored.toFixed() + "%)")
-                        ]) 
-                        : $r("div", {className: "label"}, "Nothing interesting here")]
-                ))
-        );
-    },
-
-    onClick: function(e){
-        this.props.onClick(e, this.props.x, this.props.y);
-    },
-
-    onMouseOver: function(){
-        this.setState({isFocused: true});
-        this.props.onFocus(this.props.x, this.props.y);
-    },
-
-    onMouseOut: function(){
-        this.setState({isFocused: false});
-        this.props.onBlur(this.props.x, this.props.y);
-    }
-});
-
-WMapViewport = React.createClass({
-    getDefaultProperties: function(){
-        return {dataset: {}, exploredLevel: 0};
-    },
-    getInitialState: function(){
-        return {
-            dataset: this.props.dataset, 
-            focusedNode: null,
-            selectedNode: game.village.map.selectedNode,
-            expeditionNode: game.village.map.expeditionNode
-        };
-    },
-
-    render: function(){
-        var expLevel = this.props.exploredLevel;
-
-        var scale = 0;   
-        if (expLevel > 10){
-            scale = 0.2;
-        }    
-        if (expLevel > 50){
-            scale = 0.4;
-        } 
-        if (expLevel > 100){
-            scale = 0.6;
-        } 
-        /*if (expLevel > 15){
-            scale = 0.8;
-        }*/
-
-        var selectedNode = this.state.selectedNode,
-            expeditionNode = this.state.expeditionNode;
-
-        var rows = [];
-        for (var i = 0; i < 7 * (1+scale); i++){
-
-            var cells = [];
-            for (var j = 0; j < 7 * (1+scale); j++){
-                var isNodeSelected = selectedNode && (selectedNode.x == i && selectedNode.y == j);
-                var isNodeActive = expeditionNode && (expeditionNode.x == i && expeditionNode.y == j);
-                cells.push(
-                    $r(WMapTile, {x: i, y: j, 
-                        data: this.state.dataset[i+"_"+j],
-                        onClick: this.onClick,
-                        onFocus: this.onFocus,
-                        onBlur: this.onBlur,
-                        scale: scale,
-                        isSelected: isNodeSelected,
-                        isActive: isNodeActive
-                    })
-                );
-            }
-
-            var row = $r("div", {className: "map-row"}, cells);
-            rows.push(row);
-        }
-        
-        var nodeBlock = null;
-        if (selectedNode){
-            var x = selectedNode.x,
-                y = selectedNode.y,
-                data = this.getTileData(x, y);
-
-            var toLevel = game.village.map.toLevel(x, y);
-            var percentExplored = (data.cp / toLevel) * 100;
-
-
-            nodeBlock = $r("div", null, [
-                "[" + x + "," + y + "]",
-                $r("div", null, "lv." + data.level + " ["+ data.cp.toFixed() + "/" + toLevel.toFixed() + "cp]("+ percentExplored.toFixed() + "%)"),
-                $r("div", null, "Exp. cost:" + this.getExplorationPrice(x, y).toFixed(2) + " cp/sec"),
-                $r("div", {className: "btn nosel modern"}, 
-                    $r("div", {className: "btnContent", onClick: this.startExpedition}, "Explore")
-                )
-            ]);
-        }
-
-
-        return $r("div", {className:"map-container"},[
-            $r("div", {className:"map-viewport"}, 
-                rows
-            ),
-            $r("div", {className:"map-dashboard"},
-                /*$r("div", null, "Expedition supplies: 100%"),*/
-                $r("div", null, "Map region:"),
-                selectedNode ? 
-                    nodeBlock : "N/A"
-            )
-        ]);
-    },
-
-    onClick: function(e, x, y){
-        var selectedNode = {x: x, y: y};
-        this.setState({selectedNode: selectedNode});
-        game.village.map.selectedNode = selectedNode;
-    },
-
-    onFocus: function(x, y){
-        this.setState({focusedNode: {x: x, y: y}});
-    },
-
-    onBlur: function(x, y){
-        var focusedNode = this.state.focusedNode;
-        if (focusedNode && focusedNode.x == x && focusedNode.y == y){
-            this.setState({focusedNode: null});
-        }
-    },
-
-    componentDidMount: function(){
-        this._handler = dojo.subscribe("ui/update", function(game){
-            this.update();
-        }.bind(this));
-    },
-
-    componentWillUnmount: function(){
-        if (this._handler){
-            dojo.unsubscribe(this._handler);
-        }
-    },
-
-    update: function(){
-        this.setState({dataset: this.state.dataset});
-    },
-
-    startExpedition: function(){
-        var selectedNode = this.state.selectedNode;
-        if (selectedNode){
-            var expeditionNode = {x: selectedNode.x, y:selectedNode.y};
-            this.setState({expeditionNode: expeditionNode});
-            game.village.map.expeditionNode = expeditionNode;
-        }
-    },
-
-    getTileData: function(x, y){
-        var dataset = this.state.dataset,
-            id = x + "_" + y;
-
-        var data = dataset[id];
-        if (!data){
-            data = {
-                level: 0, 
-                cp: 0
-            };
-            dataset[id] = data;
-        }
-        return data;
-    },
-
-    //todo: move to map
-    getExplorationPrice: function(x, y){
-        var data = this.getTileData(x,y),
-            explorePower = 1 * (1 + game.village.map.getExploreRatio()),
-            price = explorePower * Math.pow(1.01, data.level);
-        
-        return price;
-    }
-});
-
-WMapSection = React.createClass({
-    getDefaultProperties: function(){
-        return {map: game.village.map};
-    },
-
-    getInitialState: function(){
-        return {map: this.props.map};
-    },
-
-    render: function(){   
-        if (!this.state.map){
-            return null;
-        }
-
-        var map = this.state.map,
-            mapDataset = map.villageData;
-
-        return $r("div", null, [
-            $r("div", null, "Explored: " + map.exploredLevel + "% (Price reduction: " + (map.getPriceReduction() * 100).toFixed(3) + "%)"),
-            $r("div", null, "Exploration bonus: " + (map.getExploreRatio() * 10).toFixed() + "%"),
-            $r("a", {className:"link", href:"#", onClick: this.resetMap}, "Reset map"),
-            $r(WMapViewport, {dataset: mapDataset, exploredLevel: map.exploredLevel})
-        ]);
-    },
-
-    componentDidMount: function(){
-        var self = this;
-        dojo.subscribe("ui/update", function(game){
-            self.setState({map: game.village.map});
-        });
-    },
-
-    resetMap: function(){
-        game.village.map.resetMap();
-        game.render();  //some messy case here
-    }
-});
\ No newline at end of file
diff --git a/js/jsx/queue.jsx.js b/js/jsx/queue.jsx.js
index d63cecd275..9525d6887f 100644
--- a/js/jsx/queue.jsx.js
+++ b/js/jsx/queue.jsx.js
@@ -13,27 +13,34 @@ WQueueItem = React.createClass({
 
     render: function(){
         var item = this.props.item;
+        var buttons = [
+            $r("a", {
+                href: "#", 
+                onClick: this.removeOne,
+            }, "[-]")];
+
+        if (item.value) {
+            buttons.push($r("a", {
+                href: "#", 
+                onClick: this.removeAll,
+            }, "[x]"));
+        }
+
+        if (!this.props.isLast) {
+            buttons.push($r("a", {
+                href: "#", 
+                onClick: this.pushBack,
+            }, "[↓]"));
+        }
 
-        if (item.value){
-            buttons = [
-                $r("a", {
-                    href: "#", 
-                    onClick: this.removeOne,
-                }, "[-]"),
-                $r("a", {
-                    href: "#", 
-                    onClick: this.removeAll,
-                }, "[x]")
-            ]
-        } else {
-            buttons = [
-                $r("a", {
-                    href: "#", 
-                    onClick: this.removeOne,
-                }, "[x]")
-            ]
+        if (this.props.index > 0) {
+                buttons.push($r("a", {
+                href: "#", 
+                onClick: this.pushFront,
+            }, "[↑]"));
         }
 
+
         //TODO: red indicator when can't process
         //TODO: attach tooltip as if it is a button
         return $r("div", {}, 
@@ -46,6 +53,16 @@ WQueueItem = React.createClass({
         ].concat(buttons));
     },
 
+    pushBack: function(){
+        var i = this.props.index;
+        this.props.queueManager.pushBack(i);
+    },
+
+    pushFront: function(){
+        var i = this.props.index;
+        this.props.queueManager.pushFront(i);
+    },
+
     removeOne: function(){
         var i = this.props.index;
         this.props.queueManager.remove(i, 1);
@@ -167,7 +184,13 @@ WQueue = React.createClass({
         
         for (var i in queueItems){
             var item = queueItems[i];
-            items.push($r(WQueueItem, {item: item, index: i, queueManager: queueManager, game: game}));
+            items.push($r(WQueueItem, {
+                item: item,
+                index: i,
+                isLast: i == queueItems.length - 1,
+                queueManager: queueManager,
+                game: game
+            }));
         }
         return $r("div", {}, 
             items
diff --git a/js/religion.js b/js/religion.js
index 8bdb4d5433..68c87f2be4 100644
--- a/js/religion.js
+++ b/js/religion.js
@@ -520,11 +520,11 @@ dojo.declare("classes.managers.ReligionManager", com.nuclearunicorn.core.TabMana
 			"corruptionRatio" : 0.000001
 		},
 		calculateEffects: function(self, game) {
-			self.effects["corruptionRatio"] = 0.000001 * (1 + game.getLimitedDR(game.getEffect("corruptionBoostRatioChallenge"), 2));
+			self.effects["corruptionRatio"] = 0.000001 * (1 + game.getEffect("corruptionBoostRatioChallenge")); //LDR specified in challenges.js
 		},
 		unlocked: false,
 		getEffectiveValue: function(game) {
-			return this.val * (1 + game.getLimitedDR(game.getEffect("corruptionBoostRatioChallenge"), 2));
+			return this.val * (1 + game.getEffect("corruptionBoostRatioChallenge")); //LDR specified in challenges.js
 		}
 	},{
 		name: "unicornGraveyard",
@@ -1078,7 +1078,7 @@ dojo.declare("classes.managers.ReligionManager", com.nuclearunicorn.core.TabMana
 	},
 	getSolarRevolutionRatio: function() {
 		var uncappedBonus = this.getRU("solarRevolution").on ? this.game.getUnlimitedDR(this.faith, 1000) / 100 : 0;
-		return this.game.getLimitedDR(uncappedBonus, 10 + this.game.getEffect("solarRevolutionLimit") + (this.game.challenges.getChallenge("atheism").researched ? (this.game.religion.transcendenceTier) : 0)) * (1 + this.game.getLimitedDR(this.game.getEffect("faithSolarRevolutionBoost"), 4));
+		return this.game.getLimitedDR(uncappedBonus, 10 + this.game.getEffect("solarRevolutionLimit") + (this.game.challenges.getChallenge("atheism").researched ? (this.game.religion.transcendenceTier) : 0)) * (1 + this.game.getEffect("faithSolarRevolutionBoost")/*(LDR specified in challenges.js)*/);
 	},
 
 	getApocryphaBonus: function(){
diff --git a/js/resources.js b/js/resources.js
index fa991712f4..812b94bc64 100644
--- a/js/resources.js
+++ b/js/resources.js
@@ -687,7 +687,7 @@ dojo.declare("classes.managers.ResourceManager", com.nuclearunicorn.core.TabMana
 		for (var i in this.resources){
 			var res = this.resources[i];
 			if (res.name == "sorrow"){
-				res.maxValue = 16 + (game.getEffect("blsLimit") || 0);
+				res.maxValue = 17 + (game.getEffect("blsLimit") || 0);
 				res.value = res.value > res.maxValue ? res.maxValue : res.value;
 				continue;
 			}
@@ -750,7 +750,8 @@ dojo.declare("classes.managers.ResourceManager", com.nuclearunicorn.core.TabMana
 	//All energy consumption amounts are multiplied by this number.
 	getEnergyConsumptionRatio: function() {
 		var game = this.game;
-		return (1 + game.getLimitedDR(game.getEffect("energyConsumptionRatio"), 1) + game.getEffect("energyConsumptionIncrease")) *
+		//LDR for the effect named "energyConsumptionRatio" is specified in challenges.js
+		return (1 + game.getEffect("energyConsumptionRatio") + game.getEffect("energyConsumptionIncrease")) *
 				(game.challenges.isActive("energy") ? 2 : 1);
 	},
 
diff --git a/js/science.js b/js/science.js
index 337069bb8c..0acdffde5d 100644
--- a/js/science.js
+++ b/js/science.js
@@ -641,7 +641,8 @@ dojo.declare("classes.managers.ScienceManager", com.nuclearunicorn.core.TabManag
 		],
 		unlocks: {
 			upgrades: ["eludiumCracker", "eludiumReflectors", "eludiumHuts", "mWReactor" /*, "eludiumDrill"*/],
-			crafts: ["eludium"]
+			crafts: ["eludium"],
+			stages: [{bld:"warehouse", stage:1}],
 		}
 	},
 	{
diff --git a/js/space.js b/js/space.js
index 0145b626ce..49885f8e83 100644
--- a/js/space.js
+++ b/js/space.js
@@ -276,6 +276,11 @@ dojo.declare("classes.managers.SpaceManager", com.nuclearunicorn.core.TabManager
 				else {
 					self.effects["energyConsumption"] = 1;
 				}
+
+				if (game.challenges.isActive("blackSky")) {
+					self.effects['starchartPerTickBaseSpace'] *= 1 / (1 + game.getEffect('bskSattelitePenalty'));
+				}
+
 				game.upgrade(self.upgrades); //this way observatories won't have to use action
 			},
 			upgrades: {
@@ -393,15 +398,16 @@ dojo.declare("classes.managers.SpaceManager", com.nuclearunicorn.core.TabManager
 				"energyConsumption" : 0
 			},
 			calculateEffects: function(self, game){
+				var spaceportRatio = 1 + game.getEffect( "moonBaseStorageBonus" );
 				var effects = {
-					"catnipMax"         : 45000,
-					"woodMax"           : 25000,
-					"mineralsMax"       : 30000,
-					"coalMax"           : 3500,
-					"ironMax"           : 9000,
-					"titaniumMax"       : 1250,
-					"oilMax"            : 3500,
-					"unobtainiumMax"    : 150,
+					"catnipMax"         : 45000 * spaceportRatio,
+					"woodMax"           : 25000 * spaceportRatio,
+					"mineralsMax"       : 30000 * spaceportRatio,
+					"coalMax"           : 3500 * spaceportRatio,
+					"ironMax"           : 9000 * spaceportRatio,
+					"titaniumMax"       : 1250 * spaceportRatio,
+					"oilMax"            : 3500 * spaceportRatio,
+					"unobtainiumMax"    : 150 * spaceportRatio,
 					"energyConsumption" : 0
 				};
 				effects["energyConsumption"] = game.workshop.get("amBases").researched ? 5 : 10;
@@ -440,7 +446,7 @@ dojo.declare("classes.managers.SpaceManager", com.nuclearunicorn.core.TabManager
 			calculateEffects: function (self, game){
 				self.effects = {
 					"uraniumPerTickSpace" : 0.3 * (1 + game.getEffect("crackerRatio")),
-					"uraniumMax" : 1750
+					"uraniumMax" : 1750 * (1 + game.getEffect("planetCrackerStorageBonus"))
 				};
 			}
         },{
@@ -661,16 +667,17 @@ dojo.declare("classes.managers.SpaceManager", com.nuclearunicorn.core.TabManager
 				"unobtainiumMax": 0
 			},
             calculateEffects: function(self, game){
+				var ratio = 1 + game.getEffect("cryostationStorageBonus");
 				self.effects = {
-					"woodMax"       : 200000,
-					"mineralsMax"   : 200000,
-					"coalMax"       : 25000,
-					"ironMax"       : 50000,
-					"titaniumMax"   : 7500,
-					//"oilMax"        : 25000,
-					"oilMax"        : 7500,
-					"uraniumMax"    : 5000,
-					"unobtainiumMax": 750
+					"woodMax"       : 200000 * ratio,
+					"mineralsMax"   : 200000 * ratio,
+					"coalMax"       : 25000 * ratio,
+					"ironMax"       : 50000 * ratio,
+					"titaniumMax"   : 7500 * ratio,
+					//"oilMax"        : 25000 * ratio,
+					"oilMax"        : 7500 * ratio,
+					"uraniumMax"    : 5000 * ratio,
+					"unobtainiumMax": 750 * ratio
 				};
             },
 			unlockScheme: {
diff --git a/js/stats.js b/js/stats.js
index 977d091703..6b5001bdd9 100644
--- a/js/stats.js
+++ b/js/stats.js
@@ -69,6 +69,27 @@ dojo.declare("classes.managers.StatsManager", com.nuclearunicorn.core.TabManager
                 return game.stats.getStat("totalYears").val != 0 ? game.stats.getStat("totalKittens").val / Math.ceil(game.stats.getStat("totalYears").val / 100) : 0;
             },
             unlocked: false
+        },{
+            name: "transcendenceTier",
+            title: $I("stats.transcendenceTier"),
+            val: 0,
+            calculate: function(game){
+                return game.religion.transcendenceTier;
+            },
+            unlocked: false
+        },{
+            name: "totalChallengesCompleted",
+            title: $I("stats.challenges.total"),
+            val: 0,
+            calculate: function(game){
+                var total = 0;
+                var challengeList = game.challenges.challenges;
+                for(var i = 0; i < challengeList.length; i += 1) {
+                    total += challengeList[i].on;
+                }
+                return total;
+            },
+            unlocked: false
         }
     ],
 
diff --git a/js/time.js b/js/time.js
index 9b69e6a7ee..89d15cabfb 100644
--- a/js/time.js
+++ b/js/time.js
@@ -300,7 +300,7 @@ dojo.declare("classes.managers.TimeManager", com.nuclearunicorn.core.TabManager,
     },{
         name: "blastFurnace",
         label: $I("time.cfu.blastFurnace.label"),
-        description: $I("time.cfu.blastFurnace.desc"),
+        description: $I("time.cfu.blastFurnace.desc") + "<br>" + $I("time.cfu.blastFurnace.desc2"),
         prices: [
             { name : "timeCrystal", val: 25 },
             { name : "relic", val: 5 }
@@ -388,7 +388,7 @@ dojo.declare("classes.managers.TimeManager", com.nuclearunicorn.core.TabManager,
     },{
         name: "temporalAccelerator",
         label: $I("time.cfu.temporalAccelerator.label"),
-        description: $I("time.cfu.temporalAccelerator.desc") +"\n" + $I("time.cfu.temporalAccelerator.desc2"),
+        description: $I("time.cfu.temporalAccelerator.desc") + "<br>" + $I("time.cfu.temporalAccelerator.desc2"),
         prices: [
             { name : "timeCrystal", val: 10 },
             { name : "relic", val: 1000 }
@@ -452,9 +452,17 @@ dojo.declare("classes.managers.TimeManager", com.nuclearunicorn.core.TabManager,
             "energyConsumption": 5
         },
         calculateEffects: function(self, game){
-            if (self.isAutomationEnabled == null && game.challenges.getChallenge("1000Years").on > 1) {
-                self.isAutomationEnabled = false;
+            if (game.challenges.getChallenge("1000Years").on > 1) {
+                //Completing the challenge 2 or more times unlocks the automation feature
+                self.description = $I("time.cfu.temporalPress.desc") + "<br>" + $I("time.cfu.temporalPress.desc.automation");
+                if (self.isAutomationEnabled == null) { //force non-null value
+                    self.isAutomationEnabled = false;
+                }
+            } else {
+                self.description = $I("time.cfu.temporalPress.desc");
+                self.isAutomationEnabled = null;
             }
+
             self.effects["shatterYearBoost"] = (self.isAutomationEnabled)? 5 * game.calendar.yearsPerCycle : game.calendar.yearsPerCycle; //25 or 5 currently
             self.limitBuild = game.getEffect("temporalPressCap");
             self.priceRatio = Math.max(1.01, 1.1 - game.challenges.getChallenge("1000Years").on * 0.001); //first 90 completions of 1000Years make priceRatio cheaper
@@ -1117,7 +1125,8 @@ dojo.declare("classes.ui.time.ShatterTCBtnController", com.nuclearunicorn.game.u
                     price["val"] *= (1 + (this.game.time.heat - heatMax) * 0.01);  //1% per excessive heat unit
                 }
 
-                price["val"] *= (1 + this.game.getLimitedDR(this.game.getEffect("shatterCostReduction"),1) + this.game.getEffect("shatterCostIncreaseChallenge"));
+                //LDR for the effect "shatterCostReduction" is specified in challenges.js
+                price["val"] *= (1 + this.game.getEffect("shatterCostReduction") + this.game.getEffect("shatterCostIncreaseChallenge"));
             }
             else if(price["name"] == "void"){
                 var heatMax = this.game.getEffect("heatMax");
@@ -1161,7 +1170,8 @@ dojo.declare("classes.ui.time.ShatterTCBtnController", com.nuclearunicorn.game.u
 	                    priceLoop *= (1 + (this.game.time.heat + k * heatFactor - heatMax) * 0.01);  //1% per excessive heat unit
 	                }
 
-                    priceLoop *= (1 + this.game.getLimitedDR(this.game.getEffect("shatterCostReduction"),1) +
+                    //LDR for the effect "shatterCostReduction" is specified in challenges.js
+                    priceLoop *= (1 + this.game.getEffect("shatterCostReduction") +
                         this.game.getEffect("shatterCostIncreaseChallenge"));
 
                     pricesTotal.timeCrystal += priceLoop;
@@ -1772,6 +1782,46 @@ dojo.declare("classes.queue.manager", null,{
         return true;
     },
 
+    /**
+     * Pushes item back in the queue based on the queue group number (index)
+     * @param {*} index 
+     * 
+     * @returns true if element was moved successfully and false otherwise
+     */
+    pushBack: function(index){
+        console.log("pushback", index);
+        if (index < 0 || index >= this.queueItems.length - 1 ){
+            console.warn("queue#remove - invalid index", index);
+            return false;
+        }
+
+        var item = this.queueItems[index];
+        this.queueItems[index] = this.queueItems[index + 1];
+        this.queueItems[index + 1] = item;
+
+        return true;
+    },
+
+    /**
+     * Pushes item to the front in the queue based on the queue group number (index)
+     * @param {*} index 
+     * 
+     * @returns true if element was moved successfully and false otherwise
+     */
+    pushFront: function(index){
+        console.log("pushfront", index);
+        if (index < 1 || index >= this.queueItems.length){
+            console.warn("queue#remove - invalid index", index);
+            return false;
+        }
+        
+        var item = this.queueItems[index];
+        this.queueItems[index] = this.queueItems[index - 1];
+        this.queueItems[index - 1] = item;
+
+        return true;
+    },
+
     /**
      * Return a list of sub-options for a building queue
      * in a form of [{
diff --git a/js/village.js b/js/village.js
index ffdc7de169..2f6eb0f42e 100644
--- a/js/village.js
+++ b/js/village.js
@@ -399,7 +399,7 @@ dojo.declare("classes.managers.VillageManager", com.nuclearunicorn.core.TabManag
 		}
 
 		var diligentKittens = this.game.challenges.isActive("anarchy")
-			? Math.round(this.getKittens() * (0.5 - this.game.getLimitedDR(this.game.getEffect("kittenLaziness"), 0.25)))
+			? Math.round(this.getKittens() * (1 - this.game.getEffect("kittenLaziness"))) //LDR specified in challenges.js
 			: this.getKittens();
 
 		return diligentKittens - workingKittens;
@@ -942,7 +942,7 @@ dojo.declare("classes.managers.VillageManager", com.nuclearunicorn.core.TabManag
 			bonus = 0.125;
 			break;
 		default:
-			bonus = 0.1875 * (1 + this.game.getLimitedDR(this.game.getEffect("masterSkillMultiplier"), 4));
+			bonus = 0.1875 * (1 + this.game.getEffect("masterSkillMultiplier")); //LDR specified in challenges.js
 		}
 		return bonus * (1 + this.game.getEffect("skillMultiplier"));
 	},
diff --git a/js/workshop.js b/js/workshop.js
index 7482c16db3..2ff298ae8d 100644
--- a/js/workshop.js
+++ b/js/workshop.js
@@ -663,7 +663,7 @@ dojo.declare("classes.managers.WorkshopManager", com.nuclearunicorn.core.TabMana
 			"manpowerJobRatio" : 0.5
 		},
 		calculateEffects: function(self, game){
-			self.effects["manpowerJobRatio"] = 0.5 * Math.max(0, (1 + game.getEffect("weaponEfficency"))); 
+			self.effects["manpowerJobRatio"] = 0.5 * (1 + game.getEffect("weaponEfficency")); //weaponEfficency can't go beyond -1, see challenges.js for more info
 		},
 		prices:[
 			{ name : "wood", val: 200 },
@@ -678,7 +678,7 @@ dojo.declare("classes.managers.WorkshopManager", com.nuclearunicorn.core.TabMana
 			"manpowerJobRatio" : 0.25
 		},
 		calculateEffects: function(self, game){
-			self.effects["manpowerJobRatio"] = 0.25 * Math.max(0, (1 + game.getEffect("weaponEfficency")));
+			self.effects["manpowerJobRatio"] = 0.25 * (1 + game.getEffect("weaponEfficency")); //weaponEfficency can't go beyond -1, see challenges.js for more info
 		},
 		prices:[
 			{ name : "iron", val: 1500 },
@@ -692,7 +692,7 @@ dojo.declare("classes.managers.WorkshopManager", com.nuclearunicorn.core.TabMana
 			"manpowerJobRatio" : 0.25
 		},
 		calculateEffects: function(self, game){
-			self.effects["manpowerJobRatio"] = 0.25 * Math.max(0, (1 + game.getEffect("weaponEfficency")));
+			self.effects["manpowerJobRatio"] = 0.25 * (1 + game.getEffect("weaponEfficency")); //weaponEfficency can't go beyond -1, see challenges.js for more info
 		},
 		prices:[
 			{ name : "titanium", val: 5000 },
diff --git a/kg-workspace.code-workspace b/kg-workspace.code-workspace
index 75422b1efb..f54fc98fe1 100644
--- a/kg-workspace.code-workspace
+++ b/kg-workspace.code-workspace
@@ -5,6 +5,22 @@
 		}
 	],
 	"settings": {
-		"jestrunner.configPath": "jest.config.unittest.json"
+		"jestrunner.configPath": "jest.config.unittest.json",
+		"files.exclude": {
+			"**/.git": true,
+			"**/.svn": true,
+			"**/.hg": true,
+			"**/CVS": true,
+			"**/.DS_Store": true,
+			"**/Thumbs.db": true,
+			"**/.apivcs": true,
+			"**/.designer.json": true,
+			"**/.exchange_modules_tmp": true,
+			"**/.exchange.xml": true,
+			"**/.gitignore": true,
+			"**/.mvn": true,
+			"**/.vscode": true,
+			".mule": true
+		}
 	}
 }
\ No newline at end of file
diff --git a/res/default.css b/res/default.css
index 09b7f8b4f0..393b4408db 100644
--- a/res/default.css
+++ b/res/default.css
@@ -139,7 +139,7 @@ div#gameLog {
 }
 
 .bldTopContainer > a, .bldTopContainer > span {
-    opacity: 0.7;
+    color: #666666;
     text-decoration: none;
 }
 
@@ -147,6 +147,10 @@ div#gameLog {
     color: black;
 }
 
+.bldTopContainer > a.activeTab {
+    color: #444444;
+}
+
 .resourceRow {
     white-space: nowrap;
 }
diff --git a/res/i18n/en.json b/res/i18n/en.json
index 830f5b91d1..46a4be4c8b 100644
--- a/res/i18n/en.json
+++ b/res/i18n/en.json
@@ -140,6 +140,7 @@
     "buildings.broadcasttower.desc": "Generates culture and happiness. More effective with high energy production.",
     "buildings.calciner.label": "Calciner",
     "buildings.calciner.desc": "A highly effective source of metal. Consumes 1.5 minerals and 0.02 oil per tick. Produces iron and a small amount of titanium",
+    "buildings.calciner.desc.automation": "Automation converts {0}% of iron output into steel.",
     "buildings.chapel.label": "Chapel",
     "buildings.chapel.desc": "Produces a bit of culture and faith per tick. May be improved with religious upgrades",
     "buildings.chronosphere.label": "Chronosphere",
@@ -148,6 +149,7 @@
     "buildings.dataCenter.desc": "Increases total effect of compendia on your max science",
     "buildings.factory.label": "Factory",
     "buildings.factory.desc": "Improves craft effectiveness",
+    "buildings.factory.desc.automation": "Automation cleans pollution from the air.",
     "buildings.field.label": "Catnip Field",
     "buildings.field.desc": "Plant some catnip to grow in the village. Fields have +50% production in Spring and -75% production in Winter",
     "buildings.field.flavor": "'Nip as far as the eye can see.",
@@ -187,6 +189,7 @@
     "buildings.observatory.flavor": "Yearning to one day catch the red light fairy",
     "buildings.oilWell.label": "Oil Well",
     "buildings.oilWell.desc": "Produces a bit of oil, +1500 to maximum oil limit",
+    "buildings.oilWell.desc.automation": "Automation consumes energy for more oil production.",
     "buildings.oilWell.flavor": "Rise early, work hard, strike oil.",
     "buildings.pasture.label": "Pasture",
     "buildings.pasture.desc": "Provides an alternative source of food, which reduces catnip consumption.",
@@ -196,6 +199,7 @@
     "buildings.quarry.flavor": "It's full of mice! Wait, wrong 'quarry'",
     "buildings.reactor.label": "Reactor",
     "buildings.reactor.desc": "Provides a 5% boost to production while active. Requires uranium to operate.",
+    "buildings.reactor.desc.automation": "Automation consumes thorium to produce more energy.",
     "buildings.reactor.flavor": "Glowing mice are much easier to catch!",
     "buildings.refineCatnip.label": "Refine catnip",
     "buildings.refineCatnip.desc": "Refine catnip into catnip wood",
@@ -204,8 +208,12 @@
     "buildings.smelter.flavor": "Watch your whiskers!",
     "buildings.solarfarm.label": "Solar Farm",
     "buildings.solarfarm.desc": "Provides an additional source of energy depending on the seasons.",
+    "buildings.spaceport.label": "Spaceport",
+    "buildings.spaceport.desc": "Increases the storage capacity of buildings in space. Does not affect science or antimatter.",
+    "buildings.spaceport.flavor": "I want the fancy yarn imported from Yarn.",
     "buildings.steamworks.label": "Steamworks",
     "buildings.steamworks.desc": "When active, significantly reduces your coal production. Does nothing useful by default, but can do a lot of cool stuff once upgraded.",
+    "buildings.steamworks.desc.automation": "Automation crafts some materials if they're at the limit.",
     "buildings.steamworks.flavor": "I just nap here and it looks like I'm working",
     "buildings.brewery.label": "Brewery",
     "buildings.brewery.desc": "Brew catnip into a spicy drink. Boosts festival effects.",
@@ -275,6 +283,10 @@
     "calendar.year.full": "Year {0} - {1}, day {2}",
     "calendar.year.tooltip": "Year:",
 
+    "challendge.effects.show.label": "Show Challenge effects",
+    "challendge.effects.toggle.desc": "Toggle the summary of all the effects of your Challenges.",
+    "challendge.effects.hide.label": "Hide Challenge effects",
+    "challendge.effects.panel.label": "Effects of {0} Challenge",
     "challendge.panel.label": "Challenges",
     "challendge.pending": "Pending",
     "challendge.reclaimReserves.label": "Reclaim reserves",
@@ -352,6 +364,7 @@
     "effectsMgr.statics.boostFromLeader.title": "Boost From Leader",
     "effectsMgr.statics.breweryConsumptionRatio.title": "Brewery consumption ratio",
     "effectsMgr.statics.broadcastTowerRatio.title": "Broadcast Tower bonus",
+    "effectsMgr.statics.bskSattelitePenalty.title": "Satellite base penalty",
     "effectsMgr.statics.cadBlueprintCraftRatio.title": "Blueprint craft bonus",
     "effectsMgr.statics.calcinerRatio.title": "Calciner bonus",
     "effectsMgr.statics.calcinerSteelCraftRatio.title": "Steel Plants's Calciner bonus",
@@ -374,6 +387,7 @@
     "effectsMgr.statics.crackerRatio.title": "Cracker bonus",
     "effectsMgr.statics.craftRatio.title": "Craft bonus",
     "effectsMgr.statics.cryochamberSupport.title": "Cryochamber support",
+    "effectsMgr.statics.cryostationStorageBonus.title": "Cryostation capacity bonus",
     "effectsMgr.statics.cryostation-coalMax.title": "Cryostation - Max Coal",
     "effectsMgr.statics.cryostation-ironMax.title": "Cryostation - Max Iron",
     "effectsMgr.statics.cryostation-mineralsMax.title": "Cryostation - Max Minerals",
@@ -454,6 +468,7 @@
     "effectsMgr.statics.manuscriptCost.title": "Manuscript {0} cost",
     "effectsMgr.statics.maxKittens.title": "Kittens",
     "effectsMgr.statics.maxKittensRatio.title": "Max kittens ratio",
+    "effectsMgr.statics.moonBaseStorageBonus.title": "Moon Base capacity bonus",
     "effectsMgr.statics.moonOutpost-unobtainiumPerTickSpace.title": "Lunar Outpost - Unobtainium conversion",
     "effectsMgr.statics.mysticismBonus.title" : "Mysticism Bonus",
     "effectsMgr.statics.necrocornPerDay.pact.title": "Necrocorn consumption",
@@ -472,6 +487,7 @@
     "effectsMgr.statics.pactGlobalResourceRatio.title": "Storage per pyramid",
     "effectsMgr.statics.pollutionRatio.title": "Pollution production",
     "effectsMgr.statics.policyFakeBought.title": "1.25 policy cost multiplier",
+    "effectsMgr.statics.planetCrackerStorageBonus.title": "Planet Cracker capacity bonus",
     "effectsMgr.statics.planetCracker-uraniumPerTickSpace.title": "Planet Cracker - Uranium conversion",
     "effectsMgr.statics.priceRatio.title": "Building's prices",
     "effectsMgr.statics.prodTransferBonus.title": "Transferred cath production bonus",
@@ -1179,8 +1195,8 @@
     "science.acoustics.label": "Acoustics",
     "science.acoustics.desc": "Acoustics is the study of sound. Though not obviously useful, in a long run it may benefit civilizations thriving for cultural and religious development.",
     "science.acoustics.effectDesc": "Unlocks Chapels",
-    "science.advExogeology.label": "Advanced Exogeology",
-    "science.advExogeology.desc": "Advanced Exogeology studies new methods of unobtainium processing",
+    "science.advExogeology.label": "Exometallurgy",
+    "science.advExogeology.desc": "Exometallurgy studies new methods of unobtainium processing",
     "science.advExogeology.effectDesc": "Unlocks Eludium and Eludium upgrades",
     "science.agriculture.label": "Agriculture",
     "science.agriculture.desc": "The basis of all civilised life, Agriculture allows the working of land for food. Agriculture can significantly improve your food production.",
@@ -1476,6 +1492,7 @@
     "space.yarnMission.desc": "Yarn is a class M planet with high moderate climate, seas and oxygen atmosphere.",
 
     "stats.buildings": "Buildings Constructed",
+    "stats.challenges.total": "Challenges Completed",
     "stats.clicks.total": "Total Clicks",
     "stats.crafts.current": "Crafting Times",
     "stats.crafts.total": "Crafting Times",
@@ -1491,6 +1508,7 @@
     "stats.time.current": "Time Played",
     "stats.trades.current": "Trades Completed",
     "stats.trades.total": "Trades Completed",
+    "stats.transcendenceTier": "Transcendence Tier",
     "stats.unicorns": "Unicorns Sacrificed",
     "stats.years.total": "Total Years Played",
 
@@ -1512,6 +1530,7 @@
     "time.AccelerateTimeBtn.tooltip.accelerated": "Accelerated time flow",
     "time.cfu.blastFurnace.label": "Chrono Furnace",
     "time.cfu.blastFurnace.desc": "Operates on chronoheat. Increases the maximum heat limit by 100.",
+    "time.cfu.blastFurnace.desc2": "Automation skips one year into the future for each 100% of fuel consumed.",
     "time.cfu.ressourceRetrieval.label": "Resource Retrieval",
     "time.cfu.ressourceRetrieval.desc": "Retrieve part of your yearly resources when you burn TC",
     "time.cfu.temporalAccelerator.label": "Temporal Accelerator",
@@ -1521,6 +1540,7 @@
     "time.cfu.temporalBattery.desc": "Improves your flux energy capacity by 25%",
     "time.cfu.temporalPress.label": "Temporal Press",
     "time.cfu.temporalPress.desc": "Allows for fine tuning of shattering",
+    "time.cfu.temporalPress.desc.automation": "Automation tweaks the custom shatter amount.",
     "time.cfu.temporalImpedance.label": "Time Impedance",
     "time.cfu.temporalImpedance.desc": "Delay effect of Dark Future temporal penalty by 1000 years.",
     "time.cfu.timeBoiler.label": "Time Boiler",
@@ -1615,6 +1635,7 @@
     "trade.correct.bcoin": "There was a huge crypto market correction",
     "trade.embassy.label":"Embassy",
     "trade.embassy.desc": "Improve your diplomatic relationships by establishing an embassy",
+    "trade.embassy.chance": "Chance to get resources",
     "trade.embassy.pinned": "Pinned",
     "trade.embassy.unpinned": "Unpinned",
 
diff --git a/test/challenges.test.js b/test/challenges.test.js
new file mode 100644
index 0000000000..12cb5b7804
--- /dev/null
+++ b/test/challenges.test.js
@@ -0,0 +1,572 @@
+/* global 
+
+    test,
+    expect,
+    game,
+    LCstorage
+*/
+
+
+beforeEach(() => {
+    global.gamePage = global.game = new com.nuclearunicorn.game.ui.GamePage();
+    global.newrelic = {
+        addPageAction: jest.fn(),
+        addRelease: jest.fn(),
+        setCustomAttribute: jest.fn(),
+        setErrorHandler: jest.fn()
+    }
+
+    //TODO: use special UI system specifically for unit tests
+    game.setUI(new classes.ui.UISystem("gameContainerId"));
+
+    //TODO: this seems to be mandatory to set up some internal props like build.meta.val/on and stuff
+    //We need to make it a part of our default initialization
+    game.resetState();
+});
+
+afterEach(() => {
+    jest.clearAllMocks();
+});
+
+
+//--------------------------------
+//       Winter Challenge
+//--------------------------------
+test("Winter Challenge--Effects should have correct values", () => {
+    //TODO: implement tests to make sure the cold chance works correctly.  I wasn't sure how to write a test for it given that it's non-deterministic.
+    var winterChallenge = game.challenges.getChallenge("winterIsComing");
+    winterChallenge.researched = false;
+    winterChallenge.on = 0;
+    winterChallenge.active = false;
+    var solarFarm = game.bld.get("pasture").stages[1];
+    game.calendar.season = 0; //We will conduct this entire test in spring (which transforms into Winter I during the Winter Challenge)
+    //Helper function:
+    var catnipModifier = function() { return game.calendar.getWeatherMod(game.resPool.get("catnip")); }
+    
+    game.calculateAllEffects();
+    //With 0 Winter Challenges attempted/completed, Solar Farms should produce 2/2.666667/2/1.5 energy.
+    expect(solarFarm.calculateEnergyProduction(game, 0 /*Spring*/)).toBe(2);
+    expect(solarFarm.calculateEnergyProduction(game, 1 /*Summer*/)).toBeCloseTo(2.666667);
+    expect(solarFarm.calculateEnergyProduction(game, 2 /*Autumn*/)).toBe(2);
+    expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter*/)).toBeCloseTo(1.5);
+
+    //Catnip production in spring should be +50% by default, ±15% for weather.
+    game.calendar.weather = "cold";
+    expect(catnipModifier()).toBeCloseTo(1.35);
+    game.calendar.weather = "warm";
+    expect(catnipModifier()).toBeCloseTo(1.65);
+    game.calendar.weather = null; //Normal weather
+    expect(catnipModifier()).toBeCloseTo(1.5);
+
+    //Activate the first Winter Challenge -> endless winter
+    winterChallenge.active = true;
+    game.calculateAllEffects();
+    expect(solarFarm.calculateEnergyProduction(game, 0 /*Winter I*/)).toBeCloseTo(1.5);
+    expect(solarFarm.calculateEnergyProduction(game, 1 /*Winter II*/)).toBeCloseTo(1.5);
+    expect(solarFarm.calculateEnergyProduction(game, 2 /*Winter III*/)).toBeCloseTo(1.5);
+    expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter IV*/)).toBeCloseTo(1.5);
+
+    //Catnip production in Winter I should be -75% by default, ±15% for weather.
+    game.calendar.weather = "cold";
+    expect(catnipModifier()).toBeCloseTo(0.1);
+    game.calendar.weather = "warm";
+    expect(catnipModifier()).toBeCloseTo(0.4);
+    game.calendar.weather = null; //Normal weather
+    expect(catnipModifier()).toBeCloseTo(0.25);
+
+    //Complete the first Winter Challenge -> 5% more energy in summer
+    winterChallenge.researched = true;
+    winterChallenge.on = 1;
+    winterChallenge.active = false;
+    game.calculateAllEffects();
+    expect(solarFarm.calculateEnergyProduction(game, 0 /*Spring*/)).toBe(2);
+    expect(solarFarm.calculateEnergyProduction(game, 1 /*Summer*/)).toBeCloseTo(1.05 * 2.666667);
+    expect(solarFarm.calculateEnergyProduction(game, 2 /*Autumn*/)).toBe(2);
+    expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter*/)).toBeCloseTo(1.5);
+
+    //With 1 Winter Challenge completion, catnip is boosted by 5%
+    game.calendar.weather = "cold";
+    expect(catnipModifier()).toBeCloseTo(1.05 * 1.35);
+    game.calendar.weather = "warm";
+    expect(catnipModifier()).toBeCloseTo(1.05 * 1.65);
+    game.calendar.weather = null; //Normal weather
+    expect(catnipModifier()).toBeCloseTo(1.05 * 1.5);
+
+    winterChallenge.on = 5; //5 completions -> 25% more energy in summer
+    game.calculateAllEffects();
+    expect(solarFarm.calculateEnergyProduction(game, 0 /*Spring*/)).toBe(2);
+    expect(solarFarm.calculateEnergyProduction(game, 1 /*Summer*/)).toBeCloseTo(1.25 * 2.666667);
+    expect(solarFarm.calculateEnergyProduction(game, 2 /*Autumn*/)).toBe(2);
+    expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter*/)).toBeCloseTo(1.5);
+
+    //With 5 completions we can expect a 25% bonus.
+    game.calendar.weather = "cold";
+    expect(catnipModifier()).toBeCloseTo(1.25 * 1.35);
+    game.calendar.weather = "warm";
+    expect(catnipModifier()).toBeCloseTo(1.25 * 1.65);
+    game.calendar.weather = null; //Normal weather
+    expect(catnipModifier()).toBeCloseTo(1.25 * 1.5);
+
+    winterChallenge.active = true;
+    game.calculateAllEffects();
+    expect(solarFarm.calculateEnergyProduction(game, 0 /*Winter I*/)).toBeCloseTo(1.5); //Cold harshness affects catnip, not solar power
+    expect(solarFarm.calculateEnergyProduction(game, 1 /*Winter II*/)).toBeCloseTo(1.5);
+    expect(solarFarm.calculateEnergyProduction(game, 2 /*Winter III*/)).toBeCloseTo(1.5);
+    expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter IV*/)).toBeCloseTo(1.5);
+    
+    //We can expect cold weather to be 10% harsher
+    game.calendar.weather = "cold";
+    expect(catnipModifier()).toBeCloseTo(0.9 * 0.1);
+    game.calendar.weather = "warm";
+    expect(catnipModifier()).toBeCloseTo(0.4);
+    game.calendar.weather = null; //Normal weather
+    expect(catnipModifier()).toBeCloseTo(0.25);
+
+    winterChallenge.on = 37; //We should not yet be into LDR for cold harshness
+    game.calculateAllEffects();
+    game.calendar.weather = "cold";
+    expect(catnipModifier()).toBeCloseTo(0.26 * 0.1); //-74%
+    game.calendar.weather = "warm";
+    expect(catnipModifier()).toBeCloseTo(0.4);
+    game.calendar.weather = null; //Normal weather
+    expect(catnipModifier()).toBeCloseTo(0.25);
+
+    winterChallenge.on = 38; //That puts us into LDR for cold harshness.
+    game.calculateAllEffects();
+    game.calendar.weather = "cold";
+    expect(catnipModifier()).toBeCloseTo((1 - game.getLimitedDR(0.76,1)) * 0.1);
+    game.calendar.weather = "warm";
+    expect(catnipModifier()).toBeCloseTo(0.4);
+    game.calendar.weather = null; //Normal weather
+    expect(catnipModifier()).toBeCloseTo(0.25);
+
+    //With 30 Winter completions we are back out of LDR for cold harshness.
+    winterChallenge.on = 30;
+    game.calculateAllEffects();
+    game.calendar.weather = "cold";
+    expect(catnipModifier()).toBeCloseTo(0.4 * 0.1); //-60%
+    game.calendar.weather = "warm";
+    expect(catnipModifier()).toBeCloseTo(0.4);
+    game.calendar.weather = null; //Normal weather
+    expect(catnipModifier()).toBeCloseTo(0.25);
+
+    winterChallenge.active = false;
+    game.calculateAllEffects();
+    //30 completions -> 150% more energy in summer
+    //We should be 1 completion away from entering LDR
+    expect(solarFarm.calculateEnergyProduction(game, 0 /*Spring*/)).toBe(2);
+    expect(solarFarm.calculateEnergyProduction(game, 1 /*Summer*/)).toBeCloseTo(2.5 * 2.666667);
+    expect(solarFarm.calculateEnergyProduction(game, 2 /*Autumn*/)).toBe(2);
+    expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter*/)).toBeCloseTo(1.5);
+    game.calendar.weather = "cold";
+    expect(catnipModifier()).toBeCloseTo(2.5 * 1.35); //Also 150% more catnip in spring
+    game.calendar.weather = "warm";
+    expect(catnipModifier()).toBeCloseTo(2.5 * 1.65);
+    game.calendar.weather = null; //Normal weather
+    expect(catnipModifier()).toBeCloseTo(2.5 * 1.5);
+
+    winterChallenge.on = 31; //31 completions -> more than 150% more energy, but less than 155%
+    game.calculateAllEffects();
+    //We should be just entering LDR territory now
+    var theBonus = 1 + game.getLimitedDR(1.55,2);
+    expect(solarFarm.calculateEnergyProduction(game, 0 /*Spring*/)).toBe(2);
+    expect(solarFarm.calculateEnergyProduction(game, 1 /*Summer*/)).toBeCloseTo(theBonus * 2.666667);
+    expect(solarFarm.calculateEnergyProduction(game, 2 /*Autumn*/)).toBe(2);
+    expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter*/)).toBeCloseTo(1.5);
+    game.calendar.weather = "cold";
+    expect(catnipModifier()).toBeCloseTo(theBonus * 1.35);
+    game.calendar.weather = "warm";
+    expect(catnipModifier()).toBeCloseTo(theBonus * 1.65);
+    game.calendar.weather = null; //Normal weather
+    expect(catnipModifier()).toBeCloseTo(theBonus * 1.5);
+
+    winterChallenge.on = 100;
+    game.calculateAllEffects();
+    //Well into LDR territory
+    theBonus = 1 + game.getLimitedDR(5,2);
+    expect(solarFarm.calculateEnergyProduction(game, 0 /*Spring*/)).toBe(2);
+    expect(solarFarm.calculateEnergyProduction(game, 1 /*Summer*/)).toBeCloseTo((1 + game.getLimitedDR(5,2)) * 2.666667);
+    expect(solarFarm.calculateEnergyProduction(game, 2 /*Autumn*/)).toBe(2);
+    expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter*/)).toBeCloseTo(1.5);
+    game.calendar.weather = "cold";
+    expect(catnipModifier()).toBeCloseTo(theBonus * 1.35);
+    game.calendar.weather = "warm";
+    expect(catnipModifier()).toBeCloseTo(theBonus * 1.65);
+    game.calendar.weather = null; //Normal weather
+    expect(catnipModifier()).toBeCloseTo(theBonus * 1.5);
+});
+
+//--------------------------------
+//       Anarchy Challenge
+//--------------------------------
+test("Anarchy Challenge--Effects should have correct values", () => {
+    //Let's add 300 kittens for testing purposes:
+    //300 is a lot but we need the precision for some LDR checks.
+    for (var i = 0; i < 300; i++){
+        game.village.sim.addKitten();
+    }
+    expect(game.village.getKittens()).toBe(300);
+
+    var anarchyChallenge = game.challenges.getChallenge("anarchy");
+    anarchyChallenge.researched = false;
+    anarchyChallenge.on = 0;
+    anarchyChallenge.active = false;
+    game.calculateAllEffects();
+
+    var masterSkill = function() { return game.village.getValueModifierPerSkill(9001); };
+
+    //0 Anarchy Challenges attempted, 0 completed should leave 300 kittens available for work:
+    //Master skill effect should be unchanged:
+    expect(game.village.getFreeKittens()).toBe(300);
+    expect(masterSkill()).toBeCloseTo(0.1875);
+
+    //Start the first Anarchy Challenge:
+    anarchyChallenge.active = true;
+    game.calculateAllEffects();
+    //Half of all kittens should be lazy:
+    expect(game.village.getFreeKittens()).toBe(150);
+    expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
+
+    //With 1 Anarchy Challenges completed, 5% more kittens should be lazy:
+    anarchyChallenge.researched = true;
+    anarchyChallenge.on = 1;
+    game.calculateAllEffects();
+    expect(game.village.getFreeKittens()).toBe(135);
+    expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
+
+    anarchyChallenge.on = 2; //2 completions
+    game.calculateAllEffects();
+    expect(game.village.getFreeKittens()).toBe(120);
+    expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
+
+    anarchyChallenge.on = 3; //3 completions
+    game.calculateAllEffects();
+    expect(game.village.getFreeKittens()).toBe(105);
+    expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
+
+    anarchyChallenge.on = 4; //4 completions
+    game.calculateAllEffects();
+    //We should be getting to the very beginning of LDR
+    expect(game.village.getFreeKittens()).toBe(Math.round(90.625)); //i.e. 91 kittens
+    expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
+
+    anarchyChallenge.on = 5; //5 completions
+    game.calculateAllEffects();
+    //LDR is active
+    expect(game.village.getFreeKittens()).toBe(Math.round(84.375)); //i.e. 84 kittens
+    expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
+
+    anarchyChallenge.on = 40; //40 completions
+    game.calculateAllEffects();
+    expect(game.village.getFreeKittens()).toBe(Math.round(75.625)); //i.e. 76 kittens
+    expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
+
+    //With Anarchy Challenge inactive, no kittens should be lazy:
+    anarchyChallenge.active = false;
+    game.calculateAllEffects();
+    expect(game.village.getFreeKittens()).toBe(300);
+    //Now test the Master skill effect at 40 completions:
+    expect(masterSkill()).toBeCloseTo(0.1875 * (1 + game.getLimitedDR(8,4)));
+
+    anarchyChallenge.on = 20; //20 completions
+    game.calculateAllEffects();
+    expect(masterSkill()).toBeCloseTo(0.1875 * (1 + game.getLimitedDR(4,4)));
+
+    anarchyChallenge.on = 15; //15 completions
+    game.calculateAllEffects();
+    //We're outisde of LDR now:
+    expect(masterSkill()).toBeCloseTo(0.1875 * 4);
+
+    anarchyChallenge.on = 10; //10 completions
+    game.calculateAllEffects();
+    expect(masterSkill()).toBeCloseTo(0.1875 * 3);
+
+    anarchyChallenge.on = 1; //1 completion
+    game.calculateAllEffects();
+    expect(masterSkill()).toBeCloseTo(0.1875 * 1.2);
+});
+
+//--------------------------------
+//       Energy Challenge
+//--------------------------------
+test("Energy Challenge--Effects should have correct values", () => {
+    var energyChallenge = game.challenges.getChallenge("energy");
+    energyChallenge.researched = false;
+    energyChallenge.active = false;
+    energyChallenge.on = 0;
+    game.calculateAllEffects();
+
+    //With 0 Energy Challenges completed & the Challenge inactive, there should be no effect:
+    expect(game.resPool.getEnergyConsumptionRatio()).toBe(1);
+
+    energyChallenge.active = true;
+    game.calculateAllEffects();
+    //With Energy Challenge active, but 0 completions, energy consumption should be doubled:
+    expect(game.resPool.getEnergyConsumptionRatio()).toBe(2);
+
+    game.challenges.researchChallenge("energy");
+    game.calculateAllEffects();
+    //Energy Challenge should be inactive, researched, & have 1 completion for a 0.98 energy consumption value:
+    expect(energyChallenge.researched).toBe(true);
+    expect(energyChallenge.active).toBe(false);
+    expect(energyChallenge.on).toBe(1);
+    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(0.98);
+
+    energyChallenge.active = true;
+    energyChallenge.on = 1;
+    game.calculateAllEffects();
+    //With Energy Challenge active, but 1 completion, energy consumption increase should be 10%, then consumption is doubled.
+    expect(game.challenges.getChallenge("energy")).toBe(energyChallenge);
+    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(1.1 * 2);
+
+    game.challenges.researchChallenge("energy");
+    game.calculateAllEffects();
+    //Energy Challenge should be inactive, researched, & have 2 completions for a 0.96 energy consumption value:
+    expect(energyChallenge.researched).toBe(true);
+    expect(energyChallenge.active).toBe(false);
+    expect(energyChallenge.on).toBe(2);
+    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(0.96);
+
+    energyChallenge.active = true;
+    energyChallenge.on = 100;
+    game.calculateAllEffects();
+    //With Energy Challenge active, but 100 completions, energy consumption increase should be 10%*100 = 1000% = ×11
+    expect(game.challenges.getChallenge("energy")).toBe(energyChallenge);
+    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(11 * 2);
+
+    energyChallenge.active = false;
+    energyChallenge.on = 10;
+    game.calculateAllEffects();
+    //With Energy Challenge inactive & 10 completions at 2% reduction per level we should have -20% consumption:
+    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(0.8);
+
+    energyChallenge.on = 37;
+    game.calculateAllEffects();
+    //With 37 completions at 2% reduction per level we should have -74% consumption; LDR hasn't kicked in yet:
+    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(0.26);
+
+    energyChallenge.on = 38;
+    game.calculateAllEffects();
+    //With 38 completions at 2% reduction per level we should have -76% consumption; beginnings of LDR:
+    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(1 + game.getLimitedDR(-0.76,1));
+
+    energyChallenge.on = 100;
+    game.calculateAllEffects();
+    //With 100 completions at 2% reduction per level we should be well into LDR:
+    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(1 + game.getLimitedDR(-2,1));
+
+    energyChallenge.on = 10000;
+    game.calculateAllEffects();
+    //With 10k completions at 2% reduction per level we should be well into LDR:
+    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(1 + game.getLimitedDR(-200,1));
+});
+
+//--------------------------------
+//       Atheism Challenge
+//--------------------------------
+test("Atheism Challenge--Solar Revolution limit should have correct value", () => {
+    var solarRevolutionUpgrade = game.religion.getRU("solarRevolution"); //We need to enable SR to calculate its bonus.
+    solarRevolutionUpgrade.on = 1;
+    solarRevolutionUpgrade.val = 1;
+    var blackObelisk = game.religion.getTU("blackObelisk"); //Get rid of all Black Obelisks for the purposes of this test.
+    blackObelisk.on = 0;
+    blackObelisk.val = 0;
+    //game.religion.faith is the amount of Worship you have; set it to a really big number so it's very close to the limits.
+    game.religion.faith = Math.pow(10,50);
+    game.religion.transcendenceTier = 15;
+    var atheismChallenge = game.challenges.getChallenge("atheism");
+    atheismChallenge.on = 0;
+    atheismChallenge.researched = false;
+    atheismChallenge.active = false;
+    game.calculateAllEffects();
+
+    //Utility function to make life easier:
+    var getSR = function() {return game.religion.getSolarRevolutionRatio();};
+
+    //Test that with 0 Atheism completions the SR limit is at 1000%.
+    expect(getSR()).toBeCloseTo(10);
+
+    //Test that with 1 Atheism completion the SR limit is boosted by 100% per TT, then multiplicatively by 10%.
+    atheismChallenge.on = 1;
+    atheismChallenge.researched = true;
+    game.calculateAllEffects();
+    expect(getSR()).toBeCloseTo(25 * 1.1);
+
+    //Test that with 2 Atheism completions the SR limit is boosted by 100% per TT, then multiplicatively by 20%.
+    atheismChallenge.on = 2;
+    game.calculateAllEffects();
+    expect(getSR()).toBeCloseTo(25 * 1.2);
+
+    //Test that with 15 Atheism completions the SR limit is boosted by 100% per TT, then multiplicatively by 150%.
+    atheismChallenge.on = 15;
+    game.calculateAllEffects();
+    expect(getSR()).toBeCloseTo(25 * 2.5);
+
+    //Test that it really is 100% per TT.
+    game.religion.transcendenceTier = 3;
+    game.calculateAllEffects();
+    expect(getSR()).toBeCloseTo(13 * 2.5);
+
+    //Test that with 30 Atheism completions the SR limit is boosted by 100% per TT, then multiplicatively by 300%.
+    atheismChallenge.on = 30;
+    game.calculateAllEffects();
+    expect(getSR()).toBeCloseTo(13 * 4);
+
+    //Test that with 31 Atheism completions we start dipping into LDR.
+    atheismChallenge.on = 31;
+    game.calculateAllEffects();
+    expect(getSR()).toBeCloseTo(13 * (1 + game.getLimitedDR(3.1,4)));
+
+    //Test that with 70 Atheism completions we really are into LDR.
+    atheismChallenge.on = 70;
+    game.calculateAllEffects();
+    expect(getSR()).toBeCloseTo(13 * (1 + game.getLimitedDR(7,4)));
+
+    //Test that with infinite Atheism completions we reach the LDR cap.
+    atheismChallenge.on = Infinity;
+    game.calculateAllEffects();
+    expect(getSR()).toBeCloseTo(13 * 5);
+});
+
+//--------------------------------
+//       Black Sky Challenge
+//--------------------------------
+test("Black Sky Challenge--Corruption bonus should have correct value", () => {
+    var CORRUPTION_FROM_1_MARKER = 0.000001; //Copied directly from religion.js
+    var markers = game.religion.getZU("marker"); //The religion building that is affected by BSK corruption bonus
+    markers.val = 1;
+    markers.on = 1;
+    var bskChallenge = game.challenges.getChallenge("blackSky");
+    bskChallenge.on = 0;
+    bskChallenge.researhed = false;
+    bskChallenge.active = false;
+    game.calculateAllEffects();
+
+    //With 0 BSK attempts & completions, markers' effective value should be 1, & corruption ratio should be unchanged:
+    expect(markers.effects["corruptionRatio"]).toBe(CORRUPTION_FROM_1_MARKER);
+    expect(markers.getEffectiveValue(game)).toBe(1);
+
+    //Try with 1 BSK completion:
+    bskChallenge.on = 1;
+    bskChallenge.researched = true;
+    game.calculateAllEffects();
+    //Numbers should be boosted by 10%:
+    expect(markers.effects["corruptionRatio"]).toBeCloseTo(1.1 * CORRUPTION_FROM_1_MARKER);
+    expect(markers.getEffectiveValue(game)).toBe(1.1);
+
+    //5 BSK completions:
+    bskChallenge.on = 5;
+    game.calculateAllEffects();
+    //Expect a 50% bonus:
+    expect(markers.effects["corruptionRatio"]).toBeCloseTo(1.5 * CORRUPTION_FROM_1_MARKER);
+    expect(markers.getEffectiveValue(game)).toBe(1.5);
+
+    //Try BSK active with 5 previous completions:
+    bskChallenge.active = true;
+    game.calculateAllEffects();
+    //Bonus should be disabled while Challenge is active:
+    expect(markers.effects["corruptionRatio"]).toBe(CORRUPTION_FROM_1_MARKER);
+    expect(markers.getEffectiveValue(game)).toBe(1);
+
+    //15 BSK completions, Challenge completed:
+    bskChallenge.on = 15;
+    bskChallenge.active = false;
+    game.calculateAllEffects();
+    //Expect a 150% bonus because we aren't into LDR yet:
+    expect(markers.effects["corruptionRatio"]).toBeCloseTo(2.5 * CORRUPTION_FROM_1_MARKER);
+    expect(markers.getEffectiveValue(game)).toBe(2.5);
+
+    //16 BSK completions:
+    bskChallenge.on = 16;
+    game.calculateAllEffects();
+    //Beginnings of LDR:
+    expect(markers.effects["corruptionRatio"]).toBeCloseTo((1 + game.getLimitedDR(1.6,2)) * CORRUPTION_FROM_1_MARKER);
+    expect(markers.getEffectiveValue(game)).toBe(1 + game.getLimitedDR(1.6,2));
+
+    //99 BSK completions:
+    bskChallenge.on = 99;
+    game.calculateAllEffects();
+    //Well into LDR:
+    expect(markers.effects["corruptionRatio"]).toBeCloseTo((1 + game.getLimitedDR(9.9,2)) * CORRUPTION_FROM_1_MARKER);
+    expect(markers.getEffectiveValue(game)).toBe(1 + game.getLimitedDR(9.9,2));
+
+    //Infinitely many BSK completions:
+    bskChallenge.on = Infinity;
+    game.calculateAllEffects();
+    //Completely to the end of LDR:
+    expect(markers.effects["corruptionRatio"]).toBeCloseTo(3 * CORRUPTION_FROM_1_MARKER);
+    expect(markers.getEffectiveValue(game)).toBe(3);
+});
+
+//--------------------------------
+//       Pacifism Challenge
+//--------------------------------
+test("Pacifism Challenge--Weapon upgrades should have correct values", () => {
+    var pacifismChallenge = game.challenges.getChallenge("pacifism");
+    var weaponUpgrades = [game.workshop.get("compositeBow"), game.workshop.get("crossbow"), game.workshop.get("railgun")];
+    pacifismChallenge.on = 500;
+    pacifismChallenge.researched = true;
+    pacifismChallenge.active = false;
+    game.calculateAllEffects();
+
+    //With Pacifism inactive, the number of completions shouldn't matter for weapon upgrades:
+    expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBe(0.5);
+    expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBe(0.25);
+    expect(weaponUpgrades[2].effects["manpowerJobRatio"]).toBe(0.25);
+
+    pacifismChallenge.on = 2;
+    game.calculateAllEffects();
+    //Test that the number of completions actually doesn't matter by checking with a different number of completions:
+    expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBe(0.5);
+    expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBe(0.25);
+    expect(weaponUpgrades[2].effects["manpowerJobRatio"]).toBe(0.25);
+
+    //What's more interesting is when Pacifism is active.  How about the first time it's attempted?
+    pacifismChallenge.on = 0;
+    pacifismChallenge.researched = false;
+    pacifismChallenge.active = true;
+    game.calculateAllEffects();
+    //We expect numbers to be unchanged:
+    expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBe(0.5);
+    expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBe(0.25);
+    expect(weaponUpgrades[2].effects["manpowerJobRatio"]).toBe(0.25);
+
+    //How about the 2nd Pacifism run?
+    pacifismChallenge.on = 1;
+    pacifismChallenge.researched = true;
+    game.calculateAllEffects();
+    //Weapon efficency should be diminished by 10%:
+    expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBeCloseTo(0.9 * 0.5); //Use toBeCloseTo because we might have floating-point rounding errorrs
+    expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBeCloseTo(0.9 * 0.25);
+    expect(weaponUpgrades[2].effects["manpowerJobRatio"]).toBeCloseTo(0.9 * 0.25);
+
+    //7th Pacifism run:
+    pacifismChallenge.on = 7;
+    game.calculateAllEffects();
+    //Weapon efficency should be diminished by 70%:
+    expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBeCloseTo(0.3 * 0.5);
+    expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBeCloseTo(0.3 * 0.25);
+    expect(weaponUpgrades[2].effects["manpowerJobRatio"]).toBeCloseTo(0.3 * 0.25);
+
+    //10th Pacifism run:
+    pacifismChallenge.on = 10;
+    game.calculateAllEffects();
+    //No LDR on the effect "weaponEfficency" (yes, it's misspelled) so we're at -100%:
+    expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBe(0);
+    expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBe(0);
+    expect(weaponUpgrades[2].effects["manpowerJobRatio"]).toBe(0);
+
+    pacifismChallenge.on = 11;
+    game.calculateAllEffects();
+    //But it doesn't go below 0:
+    expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBe(0);
+    expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBe(0);
+    expect(weaponUpgrades[2].effects["manpowerJobRatio"]).toBe(0);
+    
+    pacifismChallenge.on = 134769; //If you can correctly guess what this number is a reference to, I'll be impressed.
+    game.calculateAllEffects();
+    //Still, effect shouldn't dip below 0:
+    expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBe(0);
+    expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBe(0);
+    expect(weaponUpgrades[2].effects["manpowerJobRatio"]).toBe(0);
+});
\ No newline at end of file
diff --git a/test/game.test.js b/test/game.test.js
index d6afb12b67..834a9b05e6 100644
--- a/test/game.test.js
+++ b/test/game.test.js
@@ -53,6 +53,15 @@ const _build = (id, val) => {
     controller.build(model, val);
 };
 
+const _get = (id) => {
+    let controller = new classes.ui.btn.StagingBldBtnController(game);
+    let model = controller.fetchModel({
+        key: id,
+        building: id
+    });
+    return model;
+}
+
 //----------------------------------
 //  Basic building and unlocks
 //  Effects and metadata processing
@@ -290,548 +299,6 @@ test("Test NR calls", () => {
 
 });
 
-//--------------------------------
-//       Winter Challenge
-//--------------------------------
-test("Winter Challenge--Effects should have correct values", () => {
-    //TODO: implement tests to make sure the cold chance works correctly.  I wasn't sure how to write a test for it given that it's non-deterministic.
-    var winterChallenge = game.challenges.getChallenge("winterIsComing");
-    winterChallenge.researched = false;
-    winterChallenge.on = 0;
-    winterChallenge.active = false;
-    var solarFarm = game.bld.get("pasture").stages[1];
-    game.calendar.season = 0; //We will conduct this entire test in spring (which transforms into Winter I during the Winter Challenge)
-    //Helper function:
-    var catnipModifier = function() { return game.calendar.getWeatherMod(game.resPool.get("catnip")); }
-    
-    game.calculateAllEffects();
-    //With 0 Winter Challenges attempted/completed, Solar Farms should produce 2/2.666667/2/1.5 energy.
-    expect(solarFarm.calculateEnergyProduction(game, 0 /*Spring*/)).toBe(2);
-    expect(solarFarm.calculateEnergyProduction(game, 1 /*Summer*/)).toBeCloseTo(2.666667);
-    expect(solarFarm.calculateEnergyProduction(game, 2 /*Autumn*/)).toBe(2);
-    expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter*/)).toBeCloseTo(1.5);
-
-    //Catnip production in spring should be +50% by default, ±15% for weather.
-    game.calendar.weather = "cold";
-    expect(catnipModifier()).toBeCloseTo(1.35);
-    game.calendar.weather = "warm";
-    expect(catnipModifier()).toBeCloseTo(1.65);
-    game.calendar.weather = null; //Normal weather
-    expect(catnipModifier()).toBeCloseTo(1.5);
-
-    //Activate the first Winter Challenge -> endless winter
-    winterChallenge.active = true;
-    game.calculateAllEffects();
-    expect(solarFarm.calculateEnergyProduction(game, 0 /*Winter I*/)).toBeCloseTo(1.5);
-    expect(solarFarm.calculateEnergyProduction(game, 1 /*Winter II*/)).toBeCloseTo(1.5);
-    expect(solarFarm.calculateEnergyProduction(game, 2 /*Winter III*/)).toBeCloseTo(1.5);
-    expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter IV*/)).toBeCloseTo(1.5);
-
-    //Catnip production in Winter I should be -75% by default, ±15% for weather.
-    game.calendar.weather = "cold";
-    expect(catnipModifier()).toBeCloseTo(0.1);
-    game.calendar.weather = "warm";
-    expect(catnipModifier()).toBeCloseTo(0.4);
-    game.calendar.weather = null; //Normal weather
-    expect(catnipModifier()).toBeCloseTo(0.25);
-
-    //Complete the first Winter Challenge -> 5% more energy in summer
-    winterChallenge.researched = true;
-    winterChallenge.on = 1;
-    winterChallenge.active = false;
-    game.calculateAllEffects();
-    expect(solarFarm.calculateEnergyProduction(game, 0 /*Spring*/)).toBe(2);
-    expect(solarFarm.calculateEnergyProduction(game, 1 /*Summer*/)).toBeCloseTo(1.05 * 2.666667);
-    expect(solarFarm.calculateEnergyProduction(game, 2 /*Autumn*/)).toBe(2);
-    expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter*/)).toBeCloseTo(1.5);
-
-    //With 1 Winter Challenge completion, catnip is boosted by 5%
-    game.calendar.weather = "cold";
-    expect(catnipModifier()).toBeCloseTo(1.05 * 1.35);
-    game.calendar.weather = "warm";
-    expect(catnipModifier()).toBeCloseTo(1.05 * 1.65);
-    game.calendar.weather = null; //Normal weather
-    expect(catnipModifier()).toBeCloseTo(1.05 * 1.5);
-
-    winterChallenge.on = 5; //5 completions -> 25% more energy in summer
-    game.calculateAllEffects();
-    expect(solarFarm.calculateEnergyProduction(game, 0 /*Spring*/)).toBe(2);
-    expect(solarFarm.calculateEnergyProduction(game, 1 /*Summer*/)).toBeCloseTo(1.25 * 2.666667);
-    expect(solarFarm.calculateEnergyProduction(game, 2 /*Autumn*/)).toBe(2);
-    expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter*/)).toBeCloseTo(1.5);
-
-    //With 5 completions we can expect a 25% bonus.
-    game.calendar.weather = "cold";
-    expect(catnipModifier()).toBeCloseTo(1.25 * 1.35);
-    game.calendar.weather = "warm";
-    expect(catnipModifier()).toBeCloseTo(1.25 * 1.65);
-    game.calendar.weather = null; //Normal weather
-    expect(catnipModifier()).toBeCloseTo(1.25 * 1.5);
-
-    winterChallenge.active = true;
-    game.calculateAllEffects();
-    expect(solarFarm.calculateEnergyProduction(game, 0 /*Winter I*/)).toBeCloseTo(1.5); //Cold harshness affects catnip, not solar power
-    expect(solarFarm.calculateEnergyProduction(game, 1 /*Winter II*/)).toBeCloseTo(1.5);
-    expect(solarFarm.calculateEnergyProduction(game, 2 /*Winter III*/)).toBeCloseTo(1.5);
-    expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter IV*/)).toBeCloseTo(1.5);
-    
-    //We can expect cold weather to be 10% harsher
-    game.calendar.weather = "cold";
-    expect(catnipModifier()).toBeCloseTo(0.9 * 0.1);
-    game.calendar.weather = "warm";
-    expect(catnipModifier()).toBeCloseTo(0.4);
-    game.calendar.weather = null; //Normal weather
-    expect(catnipModifier()).toBeCloseTo(0.25);
-
-    winterChallenge.on = 37; //We should not yet be into LDR for cold harshness
-    game.calculateAllEffects();
-    game.calendar.weather = "cold";
-    expect(catnipModifier()).toBeCloseTo(0.26 * 0.1); //-74%
-    game.calendar.weather = "warm";
-    expect(catnipModifier()).toBeCloseTo(0.4);
-    game.calendar.weather = null; //Normal weather
-    expect(catnipModifier()).toBeCloseTo(0.25);
-
-    winterChallenge.on = 38; //That puts us into LDR for cold harshness.
-    game.calculateAllEffects();
-    game.calendar.weather = "cold";
-    expect(catnipModifier()).toBeCloseTo((1 - game.getLimitedDR(0.76,1)) * 0.1);
-    game.calendar.weather = "warm";
-    expect(catnipModifier()).toBeCloseTo(0.4);
-    game.calendar.weather = null; //Normal weather
-    expect(catnipModifier()).toBeCloseTo(0.25);
-
-    //With 30 Winter completions we are back out of LDR for cold harshness.
-    winterChallenge.on = 30;
-    game.calculateAllEffects();
-    game.calendar.weather = "cold";
-    expect(catnipModifier()).toBeCloseTo(0.4 * 0.1); //-60%
-    game.calendar.weather = "warm";
-    expect(catnipModifier()).toBeCloseTo(0.4);
-    game.calendar.weather = null; //Normal weather
-    expect(catnipModifier()).toBeCloseTo(0.25);
-
-    winterChallenge.active = false;
-    game.calculateAllEffects();
-    //30 completions -> 150% more energy in summer
-    //We should be 1 completion away from entering LDR
-    expect(solarFarm.calculateEnergyProduction(game, 0 /*Spring*/)).toBe(2);
-    expect(solarFarm.calculateEnergyProduction(game, 1 /*Summer*/)).toBeCloseTo(2.5 * 2.666667);
-    expect(solarFarm.calculateEnergyProduction(game, 2 /*Autumn*/)).toBe(2);
-    expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter*/)).toBeCloseTo(1.5);
-    game.calendar.weather = "cold";
-    expect(catnipModifier()).toBeCloseTo(2.5 * 1.35); //Also 150% more catnip in spring
-    game.calendar.weather = "warm";
-    expect(catnipModifier()).toBeCloseTo(2.5 * 1.65);
-    game.calendar.weather = null; //Normal weather
-    expect(catnipModifier()).toBeCloseTo(2.5 * 1.5);
-
-    winterChallenge.on = 31; //31 completions -> more than 150% more energy, but less than 155%
-    game.calculateAllEffects();
-    //We should be just entering LDR territory now
-    var theBonus = 1 + game.getLimitedDR(1.55,2);
-    expect(solarFarm.calculateEnergyProduction(game, 0 /*Spring*/)).toBe(2);
-    expect(solarFarm.calculateEnergyProduction(game, 1 /*Summer*/)).toBeCloseTo(theBonus * 2.666667);
-    expect(solarFarm.calculateEnergyProduction(game, 2 /*Autumn*/)).toBe(2);
-    expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter*/)).toBeCloseTo(1.5);
-    game.calendar.weather = "cold";
-    expect(catnipModifier()).toBeCloseTo(theBonus * 1.35);
-    game.calendar.weather = "warm";
-    expect(catnipModifier()).toBeCloseTo(theBonus * 1.65);
-    game.calendar.weather = null; //Normal weather
-    expect(catnipModifier()).toBeCloseTo(theBonus * 1.5);
-
-    winterChallenge.on = 100;
-    game.calculateAllEffects();
-    //Well into LDR territory
-    theBonus = 1 + game.getLimitedDR(5,2);
-    expect(solarFarm.calculateEnergyProduction(game, 0 /*Spring*/)).toBe(2);
-    expect(solarFarm.calculateEnergyProduction(game, 1 /*Summer*/)).toBeCloseTo((1 + game.getLimitedDR(5,2)) * 2.666667);
-    expect(solarFarm.calculateEnergyProduction(game, 2 /*Autumn*/)).toBe(2);
-    expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter*/)).toBeCloseTo(1.5);
-    game.calendar.weather = "cold";
-    expect(catnipModifier()).toBeCloseTo(theBonus * 1.35);
-    game.calendar.weather = "warm";
-    expect(catnipModifier()).toBeCloseTo(theBonus * 1.65);
-    game.calendar.weather = null; //Normal weather
-    expect(catnipModifier()).toBeCloseTo(theBonus * 1.5);
-});
-
-//--------------------------------
-//       Anarchy Challenge
-//--------------------------------
-test("Anarchy Challenge--Effects should have correct values", () => {
-    //Let's add 300 kittens for testing purposes:
-    //300 is a lot but we need the precision for some LDR checks.
-    for (var i = 0; i < 300; i++){
-        game.village.sim.addKitten();
-    }
-    expect(game.village.getKittens()).toBe(300);
-
-    var anarchyChallenge = game.challenges.getChallenge("anarchy");
-    anarchyChallenge.researched = false;
-    anarchyChallenge.on = 0;
-    anarchyChallenge.active = false;
-    game.calculateAllEffects();
-
-    var masterSkill = function() { return game.village.getValueModifierPerSkill(9001); };
-
-    //0 Anarchy Challenges attempted, 0 completed should leave 300 kittens available for work:
-    //Master skill effect should be unchanged:
-    expect(game.village.getFreeKittens()).toBe(300);
-    expect(masterSkill()).toBeCloseTo(0.1875);
-
-    //Start the first Anarchy Challenge:
-    anarchyChallenge.active = true;
-    game.calculateAllEffects();
-    //Half of all kittens should be lazy:
-    expect(game.village.getFreeKittens()).toBe(150);
-    expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
-
-    //With 1 Anarchy Challenges completed, 5% more kittens should be lazy:
-    anarchyChallenge.researched = true;
-    anarchyChallenge.on = 1;
-    game.calculateAllEffects();
-    expect(game.village.getFreeKittens()).toBe(135);
-    expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
-
-    anarchyChallenge.on = 2; //2 completions
-    game.calculateAllEffects();
-    expect(game.village.getFreeKittens()).toBe(120);
-    expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
-
-    anarchyChallenge.on = 3; //3 completions
-    game.calculateAllEffects();
-    expect(game.village.getFreeKittens()).toBe(105);
-    expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
-
-    anarchyChallenge.on = 4; //4 completions
-    game.calculateAllEffects();
-    //We should be getting to the very beginning of LDR
-    expect(game.village.getFreeKittens()).toBe(Math.round(90.625)); //i.e. 91 kittens
-    expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
-
-    anarchyChallenge.on = 5; //5 completions
-    game.calculateAllEffects();
-    //LDR is active
-    expect(game.village.getFreeKittens()).toBe(Math.round(84.375)); //i.e. 84 kittens
-    expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
-
-    anarchyChallenge.on = 40; //40 completions
-    game.calculateAllEffects();
-    expect(game.village.getFreeKittens()).toBe(Math.round(75.625)); //i.e. 76 kittens
-    expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
-
-    //With Anarchy Challenge inactive, no kittens should be lazy:
-    anarchyChallenge.active = false;
-    game.calculateAllEffects();
-    expect(game.village.getFreeKittens()).toBe(300);
-    //Now test the Master skill effect at 40 completions:
-    expect(masterSkill()).toBeCloseTo(0.1875 * (1 + game.getLimitedDR(8,4)));
-
-    anarchyChallenge.on = 20; //20 completions
-    game.calculateAllEffects();
-    expect(masterSkill()).toBeCloseTo(0.1875 * (1 + game.getLimitedDR(4,4)));
-
-    anarchyChallenge.on = 15; //15 completions
-    game.calculateAllEffects();
-    //We're outisde of LDR now:
-    expect(masterSkill()).toBeCloseTo(0.1875 * 4);
-
-    anarchyChallenge.on = 10; //10 completions
-    game.calculateAllEffects();
-    expect(masterSkill()).toBeCloseTo(0.1875 * 3);
-
-    anarchyChallenge.on = 1; //1 completion
-    game.calculateAllEffects();
-    expect(masterSkill()).toBeCloseTo(0.1875 * 1.2);
-});
-
-//--------------------------------
-//       Energy Challenge
-//--------------------------------
-test("Energy Challenge--Effects should have correct values", () => {
-    var energyChallenge = game.challenges.getChallenge("energy");
-    energyChallenge.researched = false;
-    energyChallenge.active = false;
-    energyChallenge.on = 0;
-    game.calculateAllEffects();
-
-    //With 0 Energy Challenges completed & the Challenge inactive, there should be no effect:
-    expect(game.resPool.getEnergyConsumptionRatio()).toBe(1);
-
-    energyChallenge.active = true;
-    game.calculateAllEffects();
-    //With Energy Challenge active, but 0 completions, energy consumption should be doubled:
-    expect(game.resPool.getEnergyConsumptionRatio()).toBe(2);
-
-    game.challenges.researchChallenge("energy");
-    game.calculateAllEffects();
-    //Energy Challenge should be inactive, researched, & have 1 completion for a 0.98 energy consumption value:
-    expect(energyChallenge.researched).toBe(true);
-    expect(energyChallenge.active).toBe(false);
-    expect(energyChallenge.on).toBe(1);
-    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(0.98);
-
-    energyChallenge.active = true;
-    energyChallenge.on = 1;
-    game.calculateAllEffects();
-    //With Energy Challenge active, but 1 completion, energy consumption increase should be 10%, then consumption is doubled.
-    expect(game.challenges.getChallenge("energy")).toBe(energyChallenge);
-    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(1.1 * 2);
-
-    game.challenges.researchChallenge("energy");
-    game.calculateAllEffects();
-    //Energy Challenge should be inactive, researched, & have 2 completions for a 0.96 energy consumption value:
-    expect(energyChallenge.researched).toBe(true);
-    expect(energyChallenge.active).toBe(false);
-    expect(energyChallenge.on).toBe(2);
-    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(0.96);
-
-    energyChallenge.active = true;
-    energyChallenge.on = 100;
-    game.calculateAllEffects();
-    //With Energy Challenge active, but 100 completions, energy consumption increase should be 10%*100 = 1000% = ×11
-    expect(game.challenges.getChallenge("energy")).toBe(energyChallenge);
-    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(11 * 2);
-
-    energyChallenge.active = false;
-    energyChallenge.on = 10;
-    game.calculateAllEffects();
-    //With Energy Challenge inactive & 10 completions at 2% reduction per level we should have -20% consumption:
-    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(0.8);
-
-    energyChallenge.on = 37;
-    game.calculateAllEffects();
-    //With 37 completions at 2% reduction per level we should have -74% consumption; LDR hasn't kicked in yet:
-    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(0.26);
-
-    energyChallenge.on = 38;
-    game.calculateAllEffects();
-    //With 38 completions at 2% reduction per level we should have -76% consumption; beginnings of LDR:
-    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(1 + game.getLimitedDR(-0.76,1));
-
-    energyChallenge.on = 100;
-    game.calculateAllEffects();
-    //With 100 completions at 2% reduction per level we should be well into LDR:
-    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(1 + game.getLimitedDR(-2,1));
-
-    energyChallenge.on = 10000;
-    game.calculateAllEffects();
-    //With 10k completions at 2% reduction per level we should be well into LDR:
-    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(1 + game.getLimitedDR(-200,1));
-});
-
-//--------------------------------
-//       Atheism Challenge
-//--------------------------------
-test("Atheism Challenge--Solar Revolution limit should have correct value", () => {
-    var solarRevolutionUpgrade = game.religion.getRU("solarRevolution"); //We need to enable SR to calculate its bonus.
-    solarRevolutionUpgrade.on = 1;
-    solarRevolutionUpgrade.val = 1;
-    var blackObelisk = game.religion.getTU("blackObelisk"); //Get rid of all Black Obelisks for the purposes of this test.
-    blackObelisk.on = 0;
-    blackObelisk.val = 0;
-    //game.religion.faith is the amount of Worship you have; set it to a really big number so it's very close to the limits.
-    game.religion.faith = Math.pow(10,50);
-    game.religion.transcendenceTier = 15;
-    var atheismChallenge = game.challenges.getChallenge("atheism");
-    atheismChallenge.on = 0;
-    atheismChallenge.researched = false;
-    atheismChallenge.active = false;
-    game.calculateAllEffects();
-
-    //Utility function to make life easier:
-    var getSR = function() {return game.religion.getSolarRevolutionRatio();};
-
-    //Test that with 0 Atheism completions the SR limit is at 1000%.
-    expect(getSR()).toBeCloseTo(10);
-
-    //Test that with 1 Atheism completion the SR limit is boosted by 100% per TT, then multiplicatively by 10%.
-    atheismChallenge.on = 1;
-    atheismChallenge.researched = true;
-    game.calculateAllEffects();
-    expect(getSR()).toBeCloseTo(25 * 1.1);
-
-    //Test that with 2 Atheism completions the SR limit is boosted by 100% per TT, then multiplicatively by 20%.
-    atheismChallenge.on = 2;
-    game.calculateAllEffects();
-    expect(getSR()).toBeCloseTo(25 * 1.2);
-
-    //Test that with 15 Atheism completions the SR limit is boosted by 100% per TT, then multiplicatively by 150%.
-    atheismChallenge.on = 15;
-    game.calculateAllEffects();
-    expect(getSR()).toBeCloseTo(25 * 2.5);
-
-    //Test that it really is 100% per TT.
-    game.religion.transcendenceTier = 3;
-    game.calculateAllEffects();
-    expect(getSR()).toBeCloseTo(13 * 2.5);
-
-    //Test that with 30 Atheism completions the SR limit is boosted by 100% per TT, then multiplicatively by 300%.
-    atheismChallenge.on = 30;
-    game.calculateAllEffects();
-    expect(getSR()).toBeCloseTo(13 * 4);
-
-    //Test that with 31 Atheism completions we start dipping into LDR.
-    atheismChallenge.on = 31;
-    game.calculateAllEffects();
-    expect(getSR()).toBeCloseTo(13 * (1 + game.getLimitedDR(3.1,4)));
-
-    //Test that with 70 Atheism completions we really are into LDR.
-    atheismChallenge.on = 70;
-    game.calculateAllEffects();
-    expect(getSR()).toBeCloseTo(13 * (1 + game.getLimitedDR(7,4)));
-
-    //Test that with infinite Atheism completions we reach the LDR cap.
-    atheismChallenge.on = Infinity;
-    game.calculateAllEffects();
-    expect(getSR()).toBeCloseTo(13 * 5);
-});
-
-//--------------------------------
-//       Black Sky Challenge
-//--------------------------------
-test("Black Sky Challenge--Corruption bonus should have correct value", () => {
-    var CORRUPTION_FROM_1_MARKER = 0.000001; //Copied directly from religion.js
-    var markers = game.religion.getZU("marker"); //The religion building that is affected by BSK corruption bonus
-    markers.val = 1;
-    markers.on = 1;
-    var bskChallenge = game.challenges.getChallenge("blackSky");
-    bskChallenge.on = 0;
-    bskChallenge.researhed = false;
-    bskChallenge.active = false;
-    game.calculateAllEffects();
-
-    //With 0 BSK attempts & completions, markers' effective value should be 1, & corruption ratio should be unchanged:
-    expect(markers.effects["corruptionRatio"]).toBe(CORRUPTION_FROM_1_MARKER);
-    expect(markers.getEffectiveValue(game)).toBe(1);
-
-    //Try with 1 BSK completion:
-    bskChallenge.on = 1;
-    bskChallenge.researched = true;
-    game.calculateAllEffects();
-    //Numbers should be boosted by 10%:
-    expect(markers.effects["corruptionRatio"]).toBeCloseTo(1.1 * CORRUPTION_FROM_1_MARKER);
-    expect(markers.getEffectiveValue(game)).toBe(1.1);
-
-    //5 BSK completions:
-    bskChallenge.on = 5;
-    game.calculateAllEffects();
-    //Expect a 50% bonus:
-    expect(markers.effects["corruptionRatio"]).toBeCloseTo(1.5 * CORRUPTION_FROM_1_MARKER);
-    expect(markers.getEffectiveValue(game)).toBe(1.5);
-
-    //Try BSK active with 5 previous completions:
-    bskChallenge.active = true;
-    game.calculateAllEffects();
-    //Bonus should be disabled while Challenge is active:
-    expect(markers.effects["corruptionRatio"]).toBe(CORRUPTION_FROM_1_MARKER);
-    expect(markers.getEffectiveValue(game)).toBe(1);
-
-    //15 BSK completions, Challenge completed:
-    bskChallenge.on = 15;
-    bskChallenge.active = false;
-    game.calculateAllEffects();
-    //Expect a 150% bonus because we aren't into LDR yet:
-    expect(markers.effects["corruptionRatio"]).toBeCloseTo(2.5 * CORRUPTION_FROM_1_MARKER);
-    expect(markers.getEffectiveValue(game)).toBe(2.5);
-
-    //16 BSK completions:
-    bskChallenge.on = 16;
-    game.calculateAllEffects();
-    //Beginnings of LDR:
-    expect(markers.effects["corruptionRatio"]).toBeCloseTo((1 + game.getLimitedDR(1.6,2)) * CORRUPTION_FROM_1_MARKER);
-    expect(markers.getEffectiveValue(game)).toBe(1 + game.getLimitedDR(1.6,2));
-
-    //99 BSK completions:
-    bskChallenge.on = 99;
-    game.calculateAllEffects();
-    //Well into LDR:
-    expect(markers.effects["corruptionRatio"]).toBeCloseTo((1 + game.getLimitedDR(9.9,2)) * CORRUPTION_FROM_1_MARKER);
-    expect(markers.getEffectiveValue(game)).toBe(1 + game.getLimitedDR(9.9,2));
-
-    //Infinitely many BSK completions:
-    bskChallenge.on = Infinity;
-    game.calculateAllEffects();
-    //Completely to the end of LDR:
-    expect(markers.effects["corruptionRatio"]).toBeCloseTo(3 * CORRUPTION_FROM_1_MARKER);
-    expect(markers.getEffectiveValue(game)).toBe(3);
-});
-
-//--------------------------------
-//       Pacifism Challenge
-//--------------------------------
-test("Pacifism Challenge--Weapon upgrades should have correct values", () => {
-    var pacifismChallenge = game.challenges.getChallenge("pacifism");
-    var weaponUpgrades = [game.workshop.get("compositeBow"), game.workshop.get("crossbow"), game.workshop.get("railgun")];
-    pacifismChallenge.on = 500;
-    pacifismChallenge.researched = true;
-    pacifismChallenge.active = false;
-    game.calculateAllEffects();
-
-    //With Pacifism inactive, the number of completions shouldn't matter for weapon upgrades:
-    expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBe(0.5);
-    expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBe(0.25);
-    expect(weaponUpgrades[2].effects["manpowerJobRatio"]).toBe(0.25);
-
-    pacifismChallenge.on = 2;
-    game.calculateAllEffects();
-    //Test that the number of completions actually doesn't matter by checking with a different number of completions:
-    expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBe(0.5);
-    expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBe(0.25);
-    expect(weaponUpgrades[2].effects["manpowerJobRatio"]).toBe(0.25);
-
-    //What's more interesting is when Pacifism is active.  How about the first time it's attempted?
-    pacifismChallenge.on = 0;
-    pacifismChallenge.researched = false;
-    pacifismChallenge.active = true;
-    game.calculateAllEffects();
-    //We expect numbers to be unchanged:
-    expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBe(0.5);
-    expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBe(0.25);
-    expect(weaponUpgrades[2].effects["manpowerJobRatio"]).toBe(0.25);
-
-    //How about the 2nd Pacifism run?
-    pacifismChallenge.on = 1;
-    pacifismChallenge.researched = true;
-    game.calculateAllEffects();
-    //Weapon efficency should be diminished by 10%:
-    expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBeCloseTo(0.9 * 0.5); //Use toBeCloseTo because we might have floating-point rounding errorrs
-    expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBeCloseTo(0.9 * 0.25);
-    expect(weaponUpgrades[2].effects["manpowerJobRatio"]).toBeCloseTo(0.9 * 0.25);
-
-    //7th Pacifism run:
-    pacifismChallenge.on = 7;
-    game.calculateAllEffects();
-    //Weapon efficency should be diminished by 70%:
-    expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBeCloseTo(0.3 * 0.5);
-    expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBeCloseTo(0.3 * 0.25);
-    expect(weaponUpgrades[2].effects["manpowerJobRatio"]).toBeCloseTo(0.3 * 0.25);
-
-    //10th Pacifism run:
-    pacifismChallenge.on = 10;
-    game.calculateAllEffects();
-    //No LDR on the effect "weaponEfficency" (yes, it's misspelled) so we're at -100%:
-    expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBe(0);
-    expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBe(0);
-    expect(weaponUpgrades[2].effects["manpowerJobRatio"]).toBe(0);
-
-    pacifismChallenge.on = 11;
-    game.calculateAllEffects();
-    //But it doesn't go below 0:
-    expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBe(0);
-    expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBe(0);
-    expect(weaponUpgrades[2].effects["manpowerJobRatio"]).toBe(0);
-    
-    pacifismChallenge.on = 134769; //If you can correctly guess what this number is a reference to, I'll be impressed.
-    game.calculateAllEffects();
-    //Still, effect shouldn't dip below 0:
-    expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBe(0);
-    expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBe(0);
-    expect(weaponUpgrades[2].effects["manpowerJobRatio"]).toBe(0);
-});
-
 //--------------------------------
 //      Map test
 //--------------------------------
@@ -950,4 +417,34 @@ test("Queue should correctly add and remove items", () => {
 
     //console.error(queue.queueItems);
     expect(queue.queueItems[1].value).toBe(11);
+});
+
+//--------------------------------
+//      Spaceport test
+//--------------------------------
+
+test("Spaceports should be unlocked correctly and have a custom price logic applied", () => {
+    game.science.get("advExogeology").researched = true;
+    game.update();
+
+
+    let controller = new classes.ui.btn.StagingBldBtnController(game);
+    let model = controller.fetchModel({
+        key: "warehouse",
+        building: "warehouse"
+    });
+    controller.deltagrade(model, 1);
+    expect(game.bld.get("warehouse").stage).toBe(1);
+    expect(_get("warehouse").prices.find(price => price.name == "starchart").val).toBe(100000);
+
+
+    //do not check prices
+    game.devMode = true;
+    _build("warehouse",10);
+    expect(game.bld.get("warehouse").val).toBe(10);
+
+    game.update();
+    expect(Math.round(_get("warehouse").prices.find(price => price.name == "titanium").val)).toBe(40456);
+    //starchart price should skyroket due to the custom price ratio
+    expect(Math.round(_get("warehouse").prices.find(price => price.name == "starchart").val)).toBe(8134223);
 });
\ No newline at end of file
diff --git a/test/setup.js b/test/setup.js
index 851657ae53..044d5db2dd 100644
--- a/test/setup.js
+++ b/test/setup.js
@@ -102,7 +102,6 @@ try {
     require("../js/math");
     require("../game");
     require("../js/jsx/left.jsx");
-    require("../js/jsx/map.jsx");
     require("../js/ui");
     require("../js/toolbar");
 
diff --git a/tools/update-lang.sh b/tools/update-lang.sh
new file mode 100755
index 0000000000..9f0be4df4a
--- /dev/null
+++ b/tools/update-lang.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+git switch dev/beta
+git pull
+git merge --squash -s ort -Xtheirs origin/translation/l10n 
\ No newline at end of file

From 64b17403e4a9604f7fa4a451b3a62ef99f04f42b Mon Sep 17 00:00:00 2001
From: bloodrizer <cheshire.panther@gmail.com>
Date: Sat, 28 Oct 2023 17:33:16 -0700
Subject: [PATCH 36/63] Squashed commit of the following:

commit 9536e0a1fea528d5a3333894b11214659b1b5b12
Author: bloodrizer <cheshire.panther@gmail.com>
Date:   Sat Oct 28 17:16:45 2023 -0700

    Squashed commit of the following:

    commit 094e8c54c608a0367719b5e81c7247433cc7776b
    Author: bloodrizer <cheshire.panther@gmail.com>
    Date:   Sat Oct 28 17:14:03 2023 -0700

        Squashed commit of the following:

        commit 4d460e498deec577d1d564cc2f5cffe6a3b86dd0
        Author: plcp <matthieu@daumas.me>
        Date:   Sun Oct 29 00:03:13 2023 +0000

            Merged in bsk/emptySky (pull request #1229)

            Sattelite penalty under repeated BSK

            * Sattelite penalty under repeated BSK

            Approved-by: Brent Call

        commit c9f660133bbd8bb08758ba73f8e6b9476fcf78fe
        Author: Pedro Zunino <pedrozunino7@gmail.com>
        Date:   Sat Oct 28 18:46:46 2023 +0000

            Merged in feat/move-queue-items (pull request #1236)

            feat: rearrange queue items

            * feat: rearrange queue items

        commit 2caf901235a4f28bf3901101c521a39ceab6ec6d
        Author: Ziggurat <ziggurat0001@protonmail.com>
        Date:   Sat Oct 28 10:04:51 2023 +0000

            Merged in dev/beta (pull request #1240)

            Dev/beta (master -> beta)

            * small siphoning ui fixes, siphoning description change and adding totalPerDayDelta for alicorns

            * get rid of debug things

            * improve description

            * Merged in master (pull request #1225)

            Siphoning and pacts ui improvements
            * fix siphoning not using necrocornsNaiveFastForward
            fix bug where corruption is multiplied by days and divided by ticks per day for comparison of necrocorn per day values in necrocornFastForward

            * Merged in master (pull request #1234)

            Redshift pacts logic bugfixes

            * fix siphoning not using necrocornsNaiveFastForward
            fix bug where corruption is multiplied by days and divided by ticks per day for comparison of necrocorn per day values in necrocornFastForward
            * Merged in Ziggurat/set-queue_redshift-flag-to-true-on-main-1698452752943 (pull request #1237)

            set QUEUE_REDSHIFT flag to true on main
            * Merged bloodrizer/kitten-game:master into AZiggurat/kitten-game-ziggurats-fork:master
            * Merged bloodrizer/kitten-game:dev/beta into AZiggurat/kitten-game-ziggurats-fork:dev/beta
            * Merge branch 'master' into dev/beta

            # Conflicts:
            #	game.js

        commit 1a1a9054c1a373d3eab2c0d7856b66d990d44295
        Author: Ziggurat <ziggurat0001@protonmail.com>
        Date:   Sat Oct 28 00:46:45 2023 +0000

            Merged in dev/beta (pull request #1238)

            master -> Dev/beta

            * small siphoning ui fixes, siphoning description change and adding totalPerDayDelta for alicorns

            * improve description

            * Merged in master (pull request #1225)

            Siphoning and pacts ui improvements
            * fix siphoning not using necrocornsNaiveFastForward
            fix bug where corruption is multiplied by days and divided by ticks per day for comparison of necrocorn per day values in necrocornFastForward

            * Merged in master (pull request #1234)

            Redshift pacts logic bugfixes

            * fix siphoning not using necrocornsNaiveFastForward
            fix bug where corruption is multiplied by days and divided by ticks per day for comparison of necrocorn per day values in necrocornFastForward
            * Merged in Ziggurat/set-queue_redshift-flag-to-true-on-main-1698452752943 (pull request #1237)

            set QUEUE_REDSHIFT flag to true on main
            * Merged bloodrizer/kitten-game:master into AZiggurat/kitten-game-ziggurats-fork:master
            * Merged bloodrizer/kitten-game:dev/beta into AZiggurat/kitten-game-ziggurats-fork:dev/beta
            * Merge branch 'master' into dev/beta

            # Conflicts:
            #	game.js

        commit 07ab27a6e58a20a389a073e5f95fe2335b539871
        Author: Brent Call <tnerbcall@gmail.com>
        Date:   Sat Oct 21 20:13:34 2023 +0000

            Merged in spaceportBalancing (pull request #1233)

            Increased Spaceport effect, decreased power consumption

            * Increased Spaceport effect, decreased power consumption

            Approved-by: Arima B.

        commit 8c99d1b10e2228207d4017b052ddee37077b72ed
        Author: Alma Buru <cheshire.panther@gmail.com>
        Date:   Wed Oct 11 03:08:56 2023 -0700

            reducing spaceport effect even further

        commit a41fc2500e41183fdb4c5a9624dfa8e69dfd0360
        Author: Alma Buru <cheshire.panther@gmail.com>
        Date:   Wed Oct 11 02:46:01 2023 -0700

            fix unit test

        commit 9c40005a6f81b8af13f5480a99af75af605255e0
        Author: Alma Buru <cheshire.panther@gmail.com>
        Date:   Wed Oct 11 02:35:44 2023 -0700

            tweaking spaceport scaling

        commit cb8156a0126a9ae5adb692a658d6e5d163633e0a
        Merge: 46ed3942 bdf6ab52
        Author: Brent Call <tnerbcall@gmail.com>
        Date:   Wed Oct 4 02:14:00 2023 +0000

            Merged in automationDescriptions (pull request #1231)

            Automation Descriptions

            Approved-by: Arima B.

        commit bdf6ab52d612f796d2529db8b6af8c6a0886b598
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Oct 2 13:31:01 2023 -0400

            Tooltip updates always fetch latest description

        commit d246716b28297a217c5324ea523392ab4edf0f60
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Oct 2 13:22:45 2023 -0400

            Fix errors when unresearching certain upgrades

        commit 3f29afc62bbcf96c17a3b1e75fb0a5577e72e861
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Oct 2 13:06:38 2023 -0400

            Don't show "automation disabled" message if it's not unlocked yet

        commit 22b1618c57c6ca889b9a438f5839c50e298c074e
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Oct 2 12:59:04 2023 -0400

            Add automation description to Steamworks

        commit 691277fe8b27bb6df1cef3f5ca4780fe3f177e48
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Oct 2 12:46:06 2023 -0400

            Add automation description to Chrono Furnace

        commit df6ac97a669e75544efbc411be128d0ec3807b38
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Oct 2 12:40:52 2023 -0400

            Add automation description to Temporal Press

        commit 3161c2c48e3eba62b7a7ad33a4f6a79698fb6b50
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Oct 2 12:32:17 2023 -0400

            Add automation description to Reactors

        commit ff3f80e07e8afb8324da7e52419bfb437690ddf6
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Oct 2 12:20:16 2023 -0400

            Add automation description to Factory

        commit 71657641995551ac532b6f6aae87f776cb22fe41
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Oct 2 12:08:13 2023 -0400

            Add automation description for calciner

        commit efb1bcf6fe9c9e661d6fc49eea719ceae0b9ffab
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Oct 2 11:50:37 2023 -0400

            Minor tweak to line break on Temporal Accelerator

        commit 0150a8caad78d8192201e47651077c5293693efd
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Oct 2 11:43:37 2023 -0400

            Add automation description to Oil Well

        commit 46ed3942033e1bb2065d181dd003e46063f1f464
        Author: Arima B <cheshire.panther@gmail.com>
        Date:   Wed Sep 27 09:11:50 2023 +0000

            Merged in chore/tabindex (pull request #1230)

            Support tabindex and keyboard navigation for buttons

            * basic tabIndex support

            * fix gear icon toggle + some css tweaks

            * fix tab toggling gear icon

            * toggle option for collapsible groups

        commit 852a6a626bcacad560c835aeba28ccbcd1759adc
        Merge: 49d31e39 6eb2428e
        Author: Brent Call <tnerbcall@gmail.com>
        Date:   Mon Sep 4 18:25:09 2023 +0000

            Merged in deltagradeFix (pull request #1228)

            Tweaks to Spaceport Cherrypick

        commit 6eb2428effac0a59c7ec96889cb5575243f0a8c8
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Sep 4 11:38:18 2023 -0400

            Ugly hack for spaceport dependency ordering

        commit 6e6eabb0e5165710237639472cf9ae6aafc92b03
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Sep 4 11:31:22 2023 -0400

            Update test to check for proper price

        commit b8e60ef2b45901d889bb64eb7d7b8603f968476f
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Sep 4 11:30:17 2023 -0400

            Update test to check for proper price

        commit 987634028bb00e67c158474164e4766125c1e2f1
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Sep 4 11:27:06 2023 -0400

            Add back in the part where spaceports affect space storage

        commit 76eb52805bfa1d72ed299c89ae7a64a4544f0b79
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Sep 4 11:16:13 2023 -0400

            Tweak descriptions a bit

        commit bf61dc80d3aba6613eb689dc49328a9a44bbd842
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Sep 4 11:09:53 2023 -0400

            Fix that Warehouse effects didn't work

        commit 3897c8d8779d5dcf0172e51ac350d15158ea6980
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Sep 4 11:08:42 2023 -0400

            Fix prices of Spaceport building

        commit 57ef510d36a9a0d99fd8c8032dc9df4f7b3b6420
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Sep 4 11:04:38 2023 -0400

            Fix that deltagrading would fail if noConfirm was false

        commit 49d31e39145843d657c3ea0379931d88da53da4c
        Author: Arima B <cheshire.panther@gmail.com>
        Date:   Mon Sep 4 02:53:27 2023 +0000

            Merged in feature/spaceport-cherrypick (pull request #1227)

            Spaceport cherrypick

            * mobile feature flags

            * remove map.jsx from the code

            * cherry pick of the spaceport PR

            * version bump

        commit 3283ad9eec3273bbf8c327505b2cea9b45f8f8b2
        Merge: e7111a90 f4966d45
        Author: Ziggurat <ziggurat0001@protonmail.com>
        Date:   Tue Jul 25 17:07:20 2023 +0000

            Merged in master (pull request #1221)

            small ui fix [beta]

        commit e7111a90d51e2fcc63a4382be1cb77bd063adfd9
        Merge: 219a328f 12fb103c
        Author: Ziggurat <ziggurat0001@protonmail.com>
        Date:   Sat Jul 22 11:19:44 2023 +0000

            Merged in dev/beta (pull request #1218)

            Dev/beta

        commit 12fb103c6ad6437e7b6735a579acc4df3e8489e3
        Merge: 3d8d1f9c 9d1dbcd1
        Author: AZiggurat <ziggurat0001@protonmail.com>
        Date:   Sat Jul 22 14:16:09 2023 +0300

            Merge branch 'master' into dev/beta

            # Conflicts:
            #	core.js

        commit 3d8d1f9cfcca2958eef40f86f9901d19bf54e6d2
        Merge: 4b24da0f 219a328f
        Author: Ziggurat <ziggurat0001@protonmail.com>
        Date:   Sat Jul 22 11:11:59 2023 +0000

            Merged bloodrizer/kitten-game:dev/beta into AZiggurat/kitten-game-ziggurats-fork:dev/beta

        commit 219a328ff0aa456b8f51e9ae13cb8c9fea3e4961
        Author: Brent Call <tnerbcall@gmail.com>
        Date:   Fri Jul 21 08:53:06 2023 +0000

            Merged in upgradingSellAll (pull request #1217)

            Upgrading Auto-Sell All + Merge master into dev/beta

            * When unassigning engineers, prioritize engineers doing nothing

            * Merged in engineerQoL (pull request #1213)

            Engineer QoL Improvement
            * Hide aspects of the policy UI panel that aren't relevant in the moment

            * Merged in hidePoliciesWhenEmpty (pull request #1214)
            * Quick-crafting links use correct recipe prices as modified by upgrades

            * Merged in craftLinkFix (pull request #1215)
            * Sell all of a building when upgrading or downgrading it

            * Merge branch 'master' of https://bitbucket.org/bloodrizer/kitten-game into upgradingSellAll

            * Add ability to undo sell buildings

            * Add ability to undo upgrades/downgrades

            Approved-by: Arima B.

        commit 4b24da0ffb2f3fe514db8818caedb966b0b79ccd
        Merge: b30e920c d4902ef9
        Author: Ziggurat <ziggurat0001@protonmail.com>
        Date:   Fri Jun 30 17:39:06 2023 +0000

            Merged bloodrizer/kitten-game:dev/beta into AZiggurat/kitten-game-ziggurats-fork:dev/beta

        commit d4902ef9a9d72e13d816d5a64d89f59919131cb2
        Merge: 06aa91b4 32a4795a
        Author: Ziggurat <ziggurat0001@protonmail.com>
        Date:   Fri Jun 30 17:38:26 2023 +0000

            Merged in master (pull request #1204)

            change alicorn siphoning ui [beta]

        commit b30e920c7e40b6b894e73b87d0af86f7d235ca96
        Merge: e30fc2b8 06aa91b4
        Author: Ziggurat <ziggurat0001@protonmail.com>
        Date:   Wed Jun 28 14:06:14 2023 +0000

            Merged bloodrizer/kitten-game:dev/beta into AZiggurat/kitten-game-ziggurats-fork:dev/beta

        commit 06aa91b4f4608b1e55d3f441eb1193850abc1449
        Merge: 740e431e fde579c3
        Author: Ziggurat <ziggurat0001@protonmail.com>
        Date:   Wed Jun 28 14:01:38 2023 +0000

            Merged in master (pull request #1201)

            make HG bonus affect mausoleum karma per millenium beta

        commit 740e431e25953f2fedc77239eb21c2c65571afdd
        Merge: ed0d5bb9 15620989
        Author: Brent Call <tnerbcall@gmail.com>
        Date:   Sun Jun 25 00:27:10 2023 +0000

            Merged in kittenLazinessTweak (pull request #1195)

            Tweak Kitten Laziness Calculation

        commit ed0d5bb9f695008773a03020328c4bc357666521
        Merge: f4002ba8 4da3f45a
        Author: bloodrizer <cheshire.panther@gmail.com>
        Date:   Fri Jun 16 19:08:07 2023 -0700

            Merge branch 'master' into dev/beta

        commit e30fc2b86bfb47fa156de2b5ae0960fe7b0d9999
        Merge: 95f70803 47a7ffda
        Author: Ziggurat <ziggurat0001@protonmail.com>
        Date:   Sat Jun 10 17:14:43 2023 +0000

            Merged in master (pull request #67)

            fix ui bug that subtracts the siphoned corruption necrocorn consumption twice

        commit 95f708039f1e5a928ed861011004bca0745f8cd4
        Merge: 887e1eed f4002ba8
        Author: Ziggurat <ziggurat0001@protonmail.com>
        Date:   Sat Jun 10 17:13:02 2023 +0000

            Merged bloodrizer/kitten-game:dev/beta into AZiggurat/kitten-game-ziggurats-fork:dev/beta

        commit f4002ba86a71056270fe97b39adb886d83eea802
        Merge: ad29f9f3 78e67a94
        Author: bloodrizer <cheshire.panther@gmail.com>
        Date:   Mon Jun 5 21:34:17 2023 -0700

            Merge branch 'master' into dev/beta

        commit ad29f9f30c3f57a87d5a456842e9b724b95b830d
        Merge: a2bb16f5 890f85db
        Author: Brent Call <tnerbcall@gmail.com>
        Date:   Tue Jun 6 04:32:55 2023 +0000

            Merged in newStats (pull request #1196)

            Add 2 New Stats to Stats Page

            Approved-by: Arima B.

        commit 890f85db8783f41291e83d6354b25892c0c2339f
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Fri Jun 2 23:42:57 2023 -0400

            Added new statistics for Transcendence Tier & Challenges completed

        commit 156209894c1220b70cccdbe18f9392641c30f8da
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon May 22 21:41:37 2023 -0400

            Tweak internal calculation & display values of kitten laziness

        commit a2bb16f54311e0c4c7a899d1ceebb12db5112f82
        Merge: ee3bf3bf 6b8ba525
        Author: Brent Call <tnerbcall@gmail.com>
        Date:   Tue May 23 00:53:11 2023 +0000

            Merged in removeDuplicateTests (pull request #1194)

            Remove duplicated unit tests

        commit 6b8ba525f2d02a1e1fb8101e030ded396e755fa6
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon May 22 20:20:32 2023 -0400

            Remove duplicated tests from game.test.js

        commit 262abe6fc2cd5b6a2c6fbc208f73105a39c47ed0
        Merge: 133f4ac3 ee3bf3bf
        Author: Brent Call <tnerbcall@gmail.com>
        Date:   Tue May 23 00:01:01 2023 +0000

            Merged bloodrizer/kitten-game:dev/beta into brent-s-personal-workspace/kitten-game:dev/beta

        commit ee3bf3bf56dc0259290976411b3a1b260c3b27a2
        Merge: fe4c3c53 65d9eb01
        Author: Brent Call <tnerbcall@gmail.com>
        Date:   Thu May 18 03:07:51 2023 +0000

            Merged in ironWillActive (pull request #1192)

            Show when Iron Will is active

        commit 65d9eb018100ea149258fce19cf49b5ce1bd0b6b
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Wed May 17 21:44:51 2023 -0400

            Show when IW mode is active

        commit 133f4ac3537d0f7b66bbbe8d726ef29e61e4aa09
        Merge: 42a0c0d0 fe4c3c53
        Author: Brent Call <tnerbcall@gmail.com>
        Date:   Thu May 18 01:37:55 2023 +0000

            Merged bloodrizer/kitten-game:dev/beta into brent-s-personal-workspace/kitten-game:dev/beta

        commit fe4c3c53e68ee078bdc6447a68814537d2387d1c
        Merge: 1b8f7e9d 95f80ea2
        Author: Brent Call <tnerbcall@gmail.com>
        Date:   Sat May 6 00:08:14 2023 +0000

            Merged in embassyTooltip (pull request #1191)

            Embassy Tooltip Shows Resource Chances

        commit 95f80ea2bd628f66b07adfa0933ea032f555a0cd
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Fri May 5 13:14:59 2023 -0400

            Added unlock requirement: do 50 trades to see resource chances

        commit 801f419d8c01ac5d5012db21747adc97dc6038e0
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon May 1 10:26:51 2023 -0400

            Increase spice amount from trading when the chance is over 100%

        commit a5bd344578153b61f6df4f74400b236c1b47236c
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon May 1 09:53:18 2023 -0400

            Fix display to 1 decimal place of precision

        commit e5cc510813969aabf499c3a97035f5d79fb8ab3b
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon May 1 06:38:28 2023 -0400

            Display chance to get resources in embassy tooltips

        commit 1b8f7e9dde0a0b8b7a72fe19edc413170838aa62
        Author: bloodrizer <cheshire.panther@gmail.com>
        Date:   Wed Apr 26 20:03:47 2023 -0700

            restoring broken es and fr merges

        commit efa66fada8c837e72c3b1f0de542dde582ad33db
        Author: bloodrizer <cheshire.panther@gmail.com>
        Date:   Wed Apr 26 19:19:00 2023 -0700

            splitting tests for better readability

        commit 11372fcd9f5fd673dcdf0a90d8666ccc60ace474
        Author: bloodrizer <cheshire.panther@gmail.com>
        Date:   Wed Apr 26 18:42:12 2023 -0700

            i18n upmerge

        commit 96e20e6492943654263bcac8e6f3b304e2b85218
        Author: Brent Call <tnerbcall@gmail.com>
        Date:   Thu Apr 27 01:15:14 2023 +0000

            Merged in challengeTests (pull request #1184)

            ChallengeTests

            * Add test for Energy Challenge

            * Add tests for Pacifism & Atheism

            * Add test for Black Sky Challenge

            * Add tests for Anarchy Challenge

            * Better test descriptions

            * Add tests for Winter Challenge

            * Merge branch 'master' of https://bitbucket.org/bloodrizer/kitten-game into challengeTests

            Fix merge conflicts in test.js

            Approved-by: Arima B.

        commit 6852b8f7ce1de142ad58e43d3b7507ceded67379
        Merge: 270234ee f70962df
        Author: Brent Call <tnerbcall@gmail.com>
        Date:   Thu Apr 27 02:04:12 2023 +0000

            Merged in listChallengeReward_v2 (pull request #1185)

            List Challenge Rewards

        commit 270234ee2ace1f07a0337b437d066266383fda62
        Author: bloodrizer <cheshire.panther@gmail.com>
        Date:   Wed Apr 26 18:58:36 2023 -0700

            i18n merge

        commit f70962dfe9e50545bcd080ecb71eef0c7c753a16
        Merge: 13d2bedf a840f2aa
        Author: Brent Call <tnerbcall@gmail.com>
        Date:   Wed Apr 26 22:51:12 2023 +0000

            Merged bloodrizer/kitten-game:dev/beta into brent-s-personal-workspace/kitten-game:listChallengeReward_v2

        commit 13d2bedf1b1bc7eab1bc2ccce92e05c69ecb280a
        Merge: 2831e18a 5eade419
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Wed Apr 26 17:55:39 2023 -0400

            Merge branch 'master' into listChallengeReward_v2

        commit a840f2aad50f87d7a71fe185f257efa8a256584f
        Author: bloodrizer <cheshire.panther@gmail.com>
        Date:   Tue Apr 25 22:27:33 2023 -0700

            lang merge script

        commit 2831e18a96534495c3e071e93a4070458b878d8e
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Apr 24 23:13:39 2023 -0400

            Tweak noStack behavior to require 1 completion

        commit de10e4857f5b56fabf19daec83c902350284a4b7
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Apr 24 22:40:07 2023 -0400

            Implement stackOptions for Challenges.

        commit 1e972a290714afa859c028a2a227a4923c460db7
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Apr 24 21:18:49 2023 -0400

            Add more comments to the code.

        commit 611b0d82e0923a1510f320ba5428cb0946fdf0b3
        Merge: dc436898 39b92c39
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Mon Apr 24 21:09:53 2023 -0400

            Merge branch 'master' into wip/listChallengeReward

        commit dc436898911dce6462a65b745006e0b7402fa6be
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Thu Apr 20 20:02:01 2023 -0400

            Update list elements exactly as needed & no more.

        commit b8485e437adc66019f92fc67b043387839fd5918
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Thu Apr 20 19:20:20 2023 -0400

            Fix visual bug if a Challenge is already completed but not unlocked yet.

        commit 1db56899d039eca1b156bc7c0aa3566969a0340a
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Thu Apr 20 19:12:42 2023 -0400

            Fix more merge errors

        commit ed533dd95c8513c4de663ca6fa8e32e659dbf56d
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Thu Apr 20 19:09:54 2023 -0400

            Fix merge error

        commit 9cff0dc3cc7ce450b9e76bc3aa84d2fc23ce5fcf
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Thu Apr 20 19:02:12 2023 -0400

            Hide button to toggle Challenge effects unless relevant

        commit 612606e10ac7f4dc949eb660f03e4421d3ba8ef8
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Thu Apr 20 18:24:45 2023 -0400

            Use a button to toggle visibility of effects summary

        commit 42352c9eae5ba512cb7924bc67e5f7047d3ca25e
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Thu Apr 20 17:49:11 2023 -0400

            Require game.detailedChallengeInfo

        commit 7b5908aec7f8fdbdb702fff6e4d87d94c10c6f52
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Thu Apr 20 17:37:22 2023 -0400

            Format the display effects properly

        commit faa7ce4dff821311bd48758aecb4651b1e82a7a5
        Merge: 976d24b0 1e77a9bb
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Thu Apr 20 17:25:14 2023 -0400

            Merge branch 'effectDisplayRework' into wip/listChallengeReward

            Merged effectDisplayRework into wip/listChallengeReward

        commit 976d24b0a19039f38341371ae28180268152556b
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Thu Apr 20 15:32:24 2023 -0400

            Display the list of Challenge effects at the *bottom* of Challenge UI

        commit 2287e4176d3124148e2832550b7255387609b32d
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Wed Apr 19 17:58:56 2023 -0400

            Hide Challenge effects list if list is empty.

        commit 82f472e50998687216b479fb47fd3f3636941126
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Wed Apr 19 17:47:21 2023 -0400

            Update effects list whenever it changes.

        commit 816a828107043d7580bc6b6081ee6daa9d0e2ee6
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Wed Apr 19 17:38:08 2023 -0400

            Hide a Challenge effects list if that Challenge isn't unlocked yet.

        commit bf208db2c26267b49fbb88591e44c8c23ca3b29c
        Author: Brent-Call <tnerbcall@comcast.net>
        Date:   Wed Apr 19 15:56:04 2023 -0400

            Create one challenge effects panel per challenge

    commit 88fa5baeceb91fe992173efb95e445fd0e59a091
    Author: Ziggurat <ziggurat0001@protonmail.com>
    Date:   Sat Oct 28 00:30:32 2023 +0000

        Merged in Ziggurat/set-queue_redshift-flag-to-true-on-main-1698452752943 (pull request #1237)

        set QUEUE_REDSHIFT flag to true on main

    commit 41a0487ab6a8fbc9c3bc5d82a883fb06cb434267
    Author: Ziggurat <ziggurat0001@protonmail.com>
    Date:   Wed Oct 25 15:15:22 2023 +0000

        Merged in master (pull request #1234)

        Redshift pacts logic bugfixes

        * fix siphoning not using necrocornsNaiveFastForward
        fix bug where corruption is multiplied by days and divided by ticks per day for comparison of necrocorn per day values in necrocornFastForward

    commit a1bcdca231afc334b2d54d620a32ea2f2e4980e6
    Merge: f4966d45 72ba8653
    Author: Ziggurat <ziggurat0001@protonmail.com>
    Date:   Sat Sep 16 23:02:25 2023 +0000

        Merged in master (pull request #1225)

        Siphoning and pacts ui improvements

    commit 72ba86539518761019137e824157bec3930f76b6
    Author: AZiggurat <ziggurat0001@protonmail.com>
    Date:   Fri Aug 25 15:51:00 2023 +0300

        improve description

    commit 33f10f47625aaf3a8a65a6e7211e6645184059e8
    Author: AZiggurat <ziggurat0001@protonmail.com>
    Date:   Thu Aug 24 19:20:46 2023 +0300

        get rid of debug things

    commit 7f200815d40dc992e91a3a3edefbe8fe65e3f241
    Author: AZiggurat <ziggurat0001@protonmail.com>
    Date:   Thu Aug 24 19:16:49 2023 +0300

        small siphoning ui fixes, siphoning description change and adding totalPerDayDelta for alicorns

    commit f4966d45aaf54305ca9556edf3cd302cf09de347
    Merge: fac988a6 dc820da3
    Author: Ziggurat <ziggurat0001@protonmail.com>
    Date:   Tue Jul 25 17:05:02 2023 +0000

        Merged in master (pull request #1220)

        small ui fix

    commit dc820da305cf7198e56ae844f5a0574e5a3d6e69
    Author: AZiggurat <ziggurat0001@protonmail.com>
    Date:   Tue Jul 25 20:03:39 2023 +0300

        apply i18n line for the

    commit 9d1dbcd1eaf0be3ee629105914553e7042002cf3
    Merge: bf0ecf1d fac988a6
    Author: Ziggurat <ziggurat0001@protonmail.com>
    Date:   Sat Jul 22 11:11:44 2023 +0000

        Merged bloodrizer/kitten-game:master into AZiggurat/kitten-game-ziggurats-fork:master

    commit fac988a664c374c7cee12c14637439c13cc61e7d
    Merge: 7ab7a24d 1c098e8d
    Author: Ziggurat <ziggurat0001@protonmail.com>
    Date:   Sat Jul 22 11:09:33 2023 +0000

        Merged in 1000Years_buff (pull request #1216)

        1000Years buff

    commit 1c098e8d7c474b4ab7ba89f4ca815d83d6c3a531
    Author: Ziggurat <ziggurat0001@protonmail.com>
    Date:   Fri Jul 21 15:41:15 2023 +0000

        fixed Temporal Press price ratio comment

    commit 162879fb12d80fdbb2a4061455ef3dde94413ed3
    Author: Ziggurat <ziggurat0001@protonmail.com>
    Date:   Fri Jul 21 15:38:05 2023 +0000

        raise the 1000years efficiency buff

    commit d3315144d68198923dd4057638ef7b36b6a75ab4
    Author: AZiggurat <ziggurat0001@protonmail.com>
    Date:   Tue Jul 18 21:51:11 2023 +0300

        fix missing semicolon

    commit 61f9097a482fda2264cc76269c9fede95cd72024
    Author: AZiggurat <ziggurat0001@protonmail.com>
    Date:   Tue Jul 18 21:45:15 2023 +0300

        furnace automation uses temporal press when test_shatter is 1.

    commit 980bf32b22e831b088318ba66a6c1abfc0d2165b
    Author: AZiggurat <ziggurat0001@protonmail.com>
    Date:   Tue Jul 18 21:35:49 2023 +0300

        fix difference

    commit 9d3beb5780d2cfc2741f20ca0a0b89e31fa97765
    Author: AZiggurat <ziggurat0001@protonmail.com>
    Date:   Tue Jul 18 21:34:52 2023 +0300

        delete useless code

    commit ef4de0aad7631eb77a1e934a6d3bdc5bd02d1927
    Author: AZiggurat <ziggurat0001@protonmail.com>
    Date:   Tue Jul 18 21:30:36 2023 +0300

        buff 1000Years and fix some typos

    commit 7ab7a24d64dffcbdcc13caee15f4f097b64cbb40
    Merge: 97ca0b73 7d808c51
    Author: Brent Call <tnerbcall@gmail.com>
    Date:   Thu Jul 13 01:42:16 2023 +0000

        Merged in craftLinkFix (pull request #1215)

    commit 7d808c51323e3b11a3bcd24236186247e4ad4348
    Author: Brent-Call <tnerbcall@comcast.net>
    Date:   Wed Jul 12 21:38:21 2023 -0400

        Quick-crafting links use correct recipe prices as modified by upgrades

    commit 97ca0b73790572aa886c92d2c6d2ba8806aac877
    Merge: de93d52a e77a31f4
    Author: Brent Call <tnerbcall@gmail.com>
    Date:   Thu Jul 13 01:03:29 2023 +0000

        Merged in hidePoliciesWhenEmpty (pull request #1214)

    commit e77a31f40c8121cdad7ae8b98235de974d56ba07
    Author: Brent-Call <tnerbcall@comcast.net>
    Date:   Wed Jul 12 20:23:28 2023 -0400

        Hide aspects of the policy UI panel that aren't relevant in the moment

    commit de93d52a975002071fff985251c2f136c1b71bfb
    Merge: f0b23ebb 1dd79c15
    Author: Brent Call <tnerbcall@gmail.com>
    Date:   Fri Jul 7 14:06:19 2023 +0000

        Merged in engineerQoL (pull request #1213)

        Engineer QoL Improvement

    commit 1dd79c15beb99295489f4d5ecf70bda2eb9269ea
    Author: Brent-Call <tnerbcall@comcast.net>
    Date:   Fri Jul 7 10:00:52 2023 -0400

        When unassigning engineers, prioritize engineers doing nothing

    commit f0b23ebb10271ca2f515a1afffd0ee9140bcbe69
    Merge: efc3cdc0 d10b5fe0
    Author: Brent Call <tnerbcall@gmail.com>
    Date:   Wed Jul 5 01:57:57 2023 +0000

        Merged in master (pull request #1211)

        Fix game-breaking TypeError

    commit d10b5fe0d204edd29df1127b02fff897a0f49189
    Author: Brent-Call <tnerbcall@comcast.net>
    Date:   Tue Jul 4 21:55:39 2023 -0400

        Fix game-breaking TypeError

    commit efc3cdc05e078e5b58c0a321d7a0bd095e1b004f
    Merge: 2e3cfa81 cb46672e
    Author: Brent Call <tnerbcall@gmail.com>
    Date:   Tue Jul 4 19:15:37 2023 +0000

        Merged in sellOrderOfTheSunFix (pull request #1210)

        Fix Behavior of "Sell All," Attempt Number Two

    commit cb46672e03b310ff9582f4e59f4a23bc9e94ab31
    Merge: 01ba78c8 2e3cfa81
    Author: Brent-Call <tnerbcall@comcast.net>
    Date:   Tue Jul 4 15:12:33 2023 -0400

        Merge branch 'master' of https://bitbucket.org/bloodrizer/kitten-game into sellOrderOfTheSunFix

        Fix merge conflicts

    commit 01ba78c86e02b4b8259bea5e84a1a9487afa4989
    Author: Brent-Call <tnerbcall@comcast.net>
    Date:   Tue Jul 4 15:02:46 2023 -0400

        Change sell logic so that hasSellLink can be customized without affecting existing undo logic

    commit 2e3cfa819cb35f26edb3bbdb76555f78ac05d004
    Merge: 6159e42c 3e4318cb
    Author: Brent Call <tnerbcall@gmail.com>
    Date:   Tue Jul 4 17:36:35 2023 +0000

        Merged in revert-sell-fix (pull request #1209)

        Revert "Fix Behavior of "Sell All" on Order of the Sun Upgrades (pull request #1208)"

    commit 3e4318cbe5fcc44d7af140dc8264d1aeea31a53f
    Author: Brent Call <tnerbcall@gmail.com>
    Date:   Tue Jul 4 17:35:45 2023 +0000

        Revert "Fix Behavior of "Sell All" on Order of the Sun Upgrades (pull request #1208)"

    commit 6159e42c36e5e2f0b6b43d9825fd0b5c994066c6
    Merge: 17366ad0 7e68c253
    Author: Brent Call <tnerbcall@gmail.com>
    Date:   Tue Jul 4 17:27:58 2023 +0000

        Merged in sellOrderOfTheSunFix (pull request #1208)

        Fix Behavior of "Sell All" on Order of the Sun Upgrades

    commit 7e68c253601412e127dd388b66d5a7b17019eeb5
    Author: Brent-Call <tnerbcall@comcast.net>
    Date:   Tue Jul 4 13:20:36 2023 -0400

        Correct the behavior for selling religion buildings

    commit 17366ad03fff48aba1eff2c2789c1997dd03e02a
    Merge: 32a4795a 367628ed
    Author: Brent Call <tnerbcall@gmail.com>
    Date:   Tue Jul 4 17:16:17 2023 +0000

        Merged in spaceMissionTweak (pull request #1207)

    commit 367628edba98c8db6fe916ac0e961cf6bbfe8c77
    Author: Brent-Call <tnerbcall@comcast.net>
    Date:   Tue Jul 4 13:03:58 2023 -0400

        Disable space missions that are currently in progress

    commit 32a4795a71b76466bbe92d71a4276df3fb3acba3
    Merge: fde579c3 bf0ecf1d
    Author: Ziggurat <ziggurat0001@protonmail.com>
    Date:   Fri Jun 30 17:38:01 2023 +0000

        Merged in master (pull request #1203)

        change alicorn siphoning ui

    commit bf0ecf1d5e5d6402d821c52144034458d02b0603
    Merge: 0be5b63d 696eb995
    Author: AZiggurat <ziggurat0001@protonmail.com>
    Date:   Fri Jun 30 20:35:32 2023 +0300

        Merge branch 'master' of https://bitbucket.org/AZiggurat/kitten-game-ziggurats-fork

    commit 0be5b63d0607a8efc2993119783d94a1d2517a2e
    Author: AZiggurat <ziggurat0001@protonmail.com>
    Date:   Fri Jun 30 20:35:22 2023 +0300

        change alicorn siphoning ui

    commit 696eb995439d37482e99988fefc3ddcdbc2417f3
    Merge: 47a7ffda fde579c3
    Author: Ziggurat <ziggurat0001@protonmail.com>
    Date:   Wed Jun 28 14:05:46 2023 +0000

        Merged bloodrizer/kitten-game:master into AZiggurat/kitten-game-ziggurats-fork:master

    commit fde579c3ba4b25b26dca3525b6de5827901cb6ec
    Merge: 4da3f45a 182be766
    Author: Ziggurat <ziggurat0001@protonmail.com>
    Date:   Wed Jun 28 14:01:15 2023 +0000

        Merged in Ziggurat/religionjs-edited-online-with-bitbucket-1687960728393 (pull request #1200)

        make HG bonus affect mausoleum karma per millenium

    commit 182be766dd939ce840bd50ebca8aa4af735d3441
    Author: Ziggurat <ziggurat0001@protonmail.com>
    Date:   Wed Jun 28 13:59:34 2023 +0000

        make HG bonus affect mausoleum karma per millenium

    commit 4da3f45a2e83b141db35e52642b0e5cbe14a299f
    Author: bloodrizer <cheshire.panther@gmail.com>
    Date:   Fri Jun 16 19:03:56 2023 -0700

        updating forum link

    commit 396d173cce91b0f06b42a58ef258cbb125245bc2
    Merge: 78e67a94 47a7ffda
    Author: Ziggurat <ziggurat0001@protonmail.com>
    Date:   Sat Jun 10 17:15:39 2023 +0000

        Merged in master (pull request #1198)

        small pact ui bugfix

    commit 47a7ffdaf624c894376627c8522efdcc5c3437e0
    Merge: 92cacab0 78e67a94
    Author: Ziggurat <ziggurat0001@protonmail.com>
    Date:   Sat Jun 10 17:12:08 2023 +0000

        Merged bloodrizer/kitten-game:master into AZiggurat/kitten-game-ziggurats-fork:master

    commit 92cacab0d3ca06c945289a61d1ecd6a00063d99b
    Author: AZiggurat <ziggurat0001@protonmail.com>
    Date:   Sat Jun 10 20:01:23 2023 +0300

        fix ui bug that subtracts the siphoned corruption necrocorn consumption twice

    commit 78e67a948adbf07be7a440c6fc44cff948de29f0
    Merge: fdceb7fc fef5400a
    Author: Brent Call <tnerbcall@gmail.com>
    Date:   Tue Jun 6 04:33:10 2023 +0000

        Merged in cycleBugfix2 (pull request #1197)

        CycleBugfix2

    commit fef5400a88070d1241c90b10f03129b318848824
    Author: Brent-Call <tnerbcall@comcast.net>
    Date:   Sat Jun 3 07:15:30 2023 -0400

        Apply cycle effects immediately when building a space building

    commit 20f56de76b3a7a2b751c443b238a02aac45ce004
    Author: Brent-Call <tnerbcall@comcast.net>
    Date:   Sat Jun 3 07:48:17 2023 -0400

        Fix Hydroponics not calculating its next effect value correctly during a cycle which modifies that value

    commit fdceb7fc89cedaee05402fe7f08417559bc38098
    Merge: 69cb7f21 f52802e7
    Author: Brent Call <tnerbcall@gmail.com>
    Date:   Sat May 6 00:03:36 2023 +0000

        Merged in master (pull request #1190)

        Winter Challenge description tweak.

    commit f52802e77b701c3f5cc42cdcc6f4793b8b022883
    Merge: 35886aec 69cb7f21
    Author: Brent Call <tnerbcall@gmail.com>
    Date:   Mon May 1 09:01:52 2023 +0000

        Merged bloodrizer/kitten-game:master into brent-s-personal-workspace/kitten-game:master

    commit 35886aec111d479e780189aa67617e60ba5a8c9d
    Author: Brent-Call <tnerbcall@comcast.net>
    Date:   Mon May 1 04:59:45 2023 -0400

        Fix Winter Challenge description to match its effect.

    commit 69cb7f21741c2b6b1a2019bb76cee8faf71f2dfe
    Merge: c8e3d9db b17922c3
    Author: Brent Call <tnerbcall@gmail.com>
    Date:   Mon May 1 06:17:35 2023 +0000

        Merged in academyTweak (pull request #1188)

        Remove skills from academy tooltip during Anarchy

    commit c8e3d9db3a179e925267efa6021e0d71bb9a5769
    Merge: 2c271070 34d1c29f
    Author: Brent Call <tnerbcall@gmail.com>
    Date:   Mon May 1 06:16:24 2023 +0000

        Merged in leviTweaks (pull request #1189)

        Tweaks to Leviathans Energy UI

    commit 34d1c29f2dbbfefdce79df52e55b5a588508be99
    Author: Brent-Call <tnerbcall@comcast.net>
    Date:   Thu Apr 27 16:28:45 2023 -0400

        Explain what "Feed elders" button does

    commit b17922c36de89422d9196e8954337e023bfad230
    Merge: 931e002c 2c271070
    Author: Brent Call <tnerbcall@gmail.com>
    Date:   Thu Apr 27 19:10:17 2023 +0000

        Merged bloodrizer/kitten-game:master into brent-s-personal-workspace/kitten-game:academyTweak

    commit 931e002cfdab29263b8c00e9699860a56e201a37
    Author: Brent-Call <tnerbcall@comcast.net>
    Date:   Thu Apr 27 15:01:23 2023 -0400

        Academies don't provide skills during Anarchy Challenge

    commit 2c2710701ff7cc37e9d81b332573e64118657ce5
    Author: bloodrizer <cheshire.panther@gmail.com>
    Date:   Wed Apr 26 20:03:47 2023 -0700

        restoring broken es and fr merges

commit fc68d3b68f503be367f42a611b3e9ef5d770c25a
Author: bloodrizer <cheshire.panther@gmail.com>
Date:   Wed Apr 26 19:58:48 2023 -0700

    overwriting the mess we ended up with with es and fr locales. Some locales are lost during the latest sync but this should be straightforward to restore using the revision history

commit 45d272b11223373b1542d14d2c09e5621b96af05
Merge: 587d414f fbfcd41c
Author: Arima B <cheshire.panther@gmail.com>
Date:   Thu Apr 27 02:32:59 2023 +0000

    Merged master into translation/l10n

commit 587d414f4b12c8ab8587f9a7385a098bfc55c361
Merge: 4cbc1230 c6efda0c
Author: bloodrizer <cheshire.panther@gmail.com>
Date:   Wed Apr 26 19:31:01 2023 -0700

    Merge branch 'l10n_translation/l10n' into translation/l10n

commit 4cbc12304a858b8666d3076387083ed2a8cd84fb
Author: Arima B <cheshire.panther@gmail.com>
Date:   Thu Apr 27 01:55:48 2023 +0000

    Merged in l10n_translation/l10n (pull request #1186)

    New Crowdin updates

    * New translations en.json (Spanish)
    * New translations en.json (Spanish, Latin America)

commit c6efda0c4b928f4d21a2378463e62e939f50e580
Author: Arima B <cheshire.panther@gmail.com>
Date:   Thu Apr 27 01:51:59 2023 +0000

    New translations en.json (Spanish, Latin America)

commit 4db801cf6f99a01a15b6b3135f24ad61d3012662
Author: Arima B <cheshire.panther@gmail.com>
Date:   Thu Apr 27 01:51:34 2023 +0000

    New translations en.json (Spanish)

commit a1c8ff967586bea50bc8814d350760e62c3ce45c
Merge: 36a6628b 7024c300
Author: Arima B <cheshire.panther@gmail.com>
Date:   Thu Apr 27 01:17:02 2023 +0000

    Merged in l10n_translation/l10n (pull request #1183)

    New Crowdin updates

commit 7024c3003044f9fae5e6d22a25a1f41efafb99e6
Merge: 6277c173 36a6628b
Author: Arima B <cheshire.panther@gmail.com>
Date:   Thu Apr 27 01:16:41 2023 +0000

    Merged translation/l10n into l10n_translation/l10n

commit 6277c17399a747c2d9f81803fb38d51eb368d7a3
Author: Arima B <cheshire.panther@gmail.com>
Date:   Wed Apr 26 23:50:36 2023 +0000

    New translations en.json (Spanish, Latin America)

commit 8d51b9ccc2c17cdcffdb5d7817ac0f0a748efce9
Author: Arima B <cheshire.panther@gmail.com>
Date:   Wed Apr 26 22:34:43 2023 +0000

    New translations en.json (Spanish, Latin America)

commit 36bd8b51affe242febfd442ba41daa13ab28c2c5
Author: Arima B <cheshire.panther@gmail.com>
Date:   Wed Apr 26 21:34:44 2023 +0000

    New translations en.json (Spanish, Latin America)

commit 0261ccefb84c1cf3fd3e018ed6d612f3830656df
Author: Arima B <cheshire.panther@gmail.com>
Date:   Wed Apr 26 20:23:07 2023 +0000

    New translations en.json (Spanish, Latin America)

commit 8d1e5369e6d7a0c8a43100d457f294d78db610ba
Author: Arima B <cheshire.panther@gmail.com>
Date:   Wed Apr 26 20:23:03 2023 +0000

    New translations en.json (Polish)

commit a8867651ff9201eb1b8aa0588e18b318b3ca7c12
Author: Arima B <cheshire.panther@gmail.com>
Date:   Wed Apr 26 20:22:54 2023 +0000

    New translations en.json (French)

commit 54f2f28bfec252c075e9d73c820150076d6a9de8
Author: Arima B <cheshire.panther@gmail.com>
Date:   Wed Apr 26 19:21:59 2023 +0000

    New translations en.json (French)

commit b671e15bf890f91bcb12381588e7658ae88690f2
Author: Arima B <cheshire.panther@gmail.com>
Date:   Wed Apr 26 17:36:17 2023 +0000

    New translations en.json (Japanese)

commit 4f6d4db683ae6d0cd48a49df86cf8504b00d1f48
Author: Arima B <cheshire.panther@gmail.com>
Date:   Wed Apr 26 14:07:50 2023 +0000

    New translations en.json (French)

commit c2df01b2bf85affbc0a6d0069edef66a78b20d8d
Author: Arima B <cheshire.panther@gmail.com>
Date:   Wed Apr 26 07:04:19 2023 +0000

    New translations en.json (Polish)

commit 2e98169f08a27dfac3e318289090898eb6033ec7
Author: Arima B <cheshire.panther@gmail.com>
Date:   Wed Apr 26 05:26:24 2023 +0000

    New translations en.json (Polish)

commit 36a6628b0339bfe9a2222d971f53997ca5ad0d42
Merge: 210367af 3362e3d2
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:40:54 2023 +0000

    Merged in l10n_translation/l10n (pull request #1182)

    New Crowdin updates

commit 3362e3d2576f1205e38dc02e8fe950d9f9a65fbc
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:38:10 2023 +0000

    New translations en.json (Karakalpak)

commit 2e4592cb363e1594b33af8b6c23410eed7197b76
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:38:06 2023 +0000

    New translations en.json (Toki Pona)

commit 98576776c029cc149954727a3342768c1145e057
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:38:02 2023 +0000

    New translations en.json (Czech - KG)

commit d54118116a8df12694a1f906f8465a70d298dd3c
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:37:58 2023 +0000

    New translations en.json (Chinese Traditional - KG)

commit fc3624918873c5ffa7b0d1e38a10923c4555d63c
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:37:53 2023 +0000

    New translations en.json (Portuguese - KG)

commit 2dd761d4a3675c8fbb0999b90f611ee51a2f33ec
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:37:49 2023 +0000

    New translations en.json (Chinese)

commit 90bd31c20d8118bee20acaa00c79e27bb6757554
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:37:45 2023 +0000

    New translations en.json (Spanish, Latin America)

commit 03b29f33c522ca63e674a6589762c2d45599bbc8
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:37:41 2023 +0000

    New translations en.json (Esperanto)

commit f81627d1b14079ba33b938eb71ad2670d63192c1
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:37:37 2023 +0000

    New translations en.json (Ukrainian)

commit 2a4ca9a630f82e12af9b8c263d0dad9d54a56b59
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:37:34 2023 +0000

    New translations en.json (Turkish)

commit 50ebdccc71f8f8b5aa0674060d115ff9124aaa2a
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:37:30 2023 +0000

    New translations en.json (Swedish)

commit 9d909ef9418474a5ebb1f8bf3412191fd6d9932b
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:37:26 2023 +0000

    New translations en.json (Russian)

commit 8d23d0138e62b87389a71afe0a94f978132e35b8
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:37:22 2023 +0000

    New translations en.json (Polish)

commit b24ca21457bfb391e988487217176cff2a2552ba
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:37:18 2023 +0000

    New translations en.json (Norwegian)

commit 9e2ba6f13b9203a3323367384d890c9f3581b802
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:37:14 2023 +0000

    New translations en.json (Dutch)

commit b04124349fc23b4e728aa81b594e9fe21846e3e2
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:37:10 2023 +0000

    New translations en.json (Korean)

commit 4210d7a39549aa82cde46e8233e71398c1d99a90
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:37:07 2023 +0000

    New translations en.json (Japanese)

commit 435907a72489c53b931b949a4eb7f6b0cf2d1ef9
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:37:03 2023 +0000

    New translations en.json (Italian)

commit 8c177b6d9d3b2e5a4b3f74a0b8612df1fcf61076
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:36:59 2023 +0000

    New translations en.json (Hebrew)

commit efab62b2e683c60e428a032935d854fce17a68e0
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:36:55 2023 +0000

    New translations en.json (Greek)

commit 3b9815f698a221b92421a8eca81b7dcab4fd68fd
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:36:51 2023 +0000

    New translations en.json (German)

commit e62bb91e3b0a970f3ba1b597fd1f6b9a11f34dd5
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:36:47 2023 +0000

    New translations en.json (Belarusian)

commit 91f4a6a036dbc7ee8ffa28582b38bab7becaff7c
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:36:41 2023 +0000

    New translations en.json (French)

commit cb3ad0acf7ba921ffd5ad86f9a75d7106812f3bf
Author: Arima B <cheshire.panther@gmail.com>
Date:   Tue Apr 25 23:36:38 2023 +0000

    New translations en.json (Romanian)
---
 res/i18n/crowdin/be.json  |  28 +------
 res/i18n/crowdin/br.json  |  28 +------
 res/i18n/crowdin/cz.json  |  17 +---
 res/i18n/crowdin/de.json  |  28 +------
 res/i18n/crowdin/el.json  |  14 +---
 res/i18n/crowdin/eo.json  |   5 --
 res/i18n/crowdin/es.json  | 158 +++++++++++++++++++-------------------
 res/i18n/crowdin/he.json  |  12 +--
 res/i18n/crowdin/it.json  |  19 +----
 res/i18n/crowdin/ja.json  |  28 +------
 res/i18n/crowdin/ko.json  |  28 +------
 res/i18n/crowdin/nl.json  |  16 +---
 res/i18n/crowdin/no.json  |   2 -
 res/i18n/crowdin/pl.json  |  28 +------
 res/i18n/crowdin/ro.json  |   1 -
 res/i18n/crowdin/ru.json  |  28 +------
 res/i18n/crowdin/tr.json  |  10 +--
 res/i18n/crowdin/uk.json  |   1 -
 res/i18n/crowdin/zh.json  |  28 +------
 res/i18n/crowdin/zht.json |  24 +-----
 20 files changed, 133 insertions(+), 370 deletions(-)

diff --git a/res/i18n/crowdin/be.json b/res/i18n/crowdin/be.json
index 085d71dd49..a35bb1502f 100644
--- a/res/i18n/crowdin/be.json
+++ b/res/i18n/crowdin/be.json
@@ -209,7 +209,6 @@
     "buildings.workshop.desc": "Забяспечвае шырокі выбар мадэрнізацый. Паляпшае эфектыўнасць стварэння на 6%",
     "buildings.workshop.flavor": "Бясплатныя цацкі для рабочых",
     "buildings.zebraForge.label": "Кузня Зебр",
-    "buildings.zebraForge.desc": "Адкрывае стварэнне крывавых камянёў і т-міфрылу",
     "buildings.zebraOutpost.label": "Застава Зебр",
     "buildings.zebraOutpost.desc": "Забяспечвае базу для паляўнічых экспедыцый. Кожны ўзровень абнаўлення павышае эфектыўнасць экспедыцыі на 5%",
     "buildings.zebraWorkshop.label": "Майстэрня Зебр",
@@ -258,6 +257,8 @@
     "calendar.year.tooltip": "Год:",
     "challendge.panel.label": "Выклікі",
     "challendge.pending": "Чакае",
+    "challendge.reclaimReserves.label": "Адваяваць рэсурсы",
+    "challendge.reclaimReserves.desc": "Вярніце рэсурсы з-за грані светаў",
     "challendge.applyPending.label": "Прымяніць чаканыя змены ({0})",
     "challendge.applyPending.desc": "Неадкладна ўключыць выклікі/ўмовы, пазначаныя як чакаючыя",
     "challendge.1000Years.label": "1000 гадоў",
@@ -279,12 +280,9 @@
     "challendge.ironWill.label": "Жалезная Воля",
     "challendge.ironWill.desc": "Жалезная воля - гэта трохі схаваны выклік, і вам не трэба націскаць тут, каб уключыць яго: скіньце гульню і гуляйце без кацянят.",
     "challendge.ironWill.effect.desc": "Нічога",
-    "challendge.reclaimReserves.label": "Адваяваць рэсурсы",
-    "challendge.reclaimReserves.desc": "Вярніце рэсурсы з-за грані светаў",
     "challendge.winterIsComing.label": "Зіма прыйшла",
     "challendge.winterIsComing.desc": "Перазапусціце гульню толькі з зімовымі сезонамі. (Каціная мята не выйграе ад бонуса вытворчасці парагона)<br><br>Мэта: дабрацца да Геліяса",
     "challendge.winterIsComing.effect.desc": "Цёплы сезон больш верагодны, а халодны - менш.",
-    "challendge.btn.chronosphere.desc": " Вы не атрымаеце бонус скіду ад хранасфер.",
     "challendge.btn.chronosphere.with.ironWill.desc": " Вы не атрымаеце бонус скіду ад хранасфер.<br>УВАГА: бонус скіду ад хранасфер аўтаматычна адключае ЖВ.",
     "challendge.btn.confirmation.title": "Пацвярджэнне выкліку",
     "challendge.btn.confirmation.msg": "Вы ўпэўнены, што хочаце пачаць гэты выклiк, перазагрузіўшы гульню?",
@@ -367,8 +365,8 @@
     "effectsMgr.statics.factoryCostReduction.title": "Зніжэнне кошту фабрыкi",
     "effectsMgr.statics.factoryRefineRatio.title": "Бонус завадской дапрацоўкі",
     "effectsMgr.statics.faithRatioReligion.title": "Бонус веры",
-    "effectsMgr.statics.festivalRatio.title": "Фестывальныя эфекты",
     "effectsMgr.statics.festivalArrivalRatio.title": "Тэмп росту фестывалю",
+    "effectsMgr.statics.festivalRatio.title": "Фестывальныя эфекты",
     "effectsMgr.statics.gflopsConsumption.title": "Пераўтварэнне GFlops",
     "effectsMgr.statics.globalRelationsBonus.title": "Бонус за адносіны",
     "effectsMgr.statics.globalResourceRatio.title": "Максiмальны бонус рэсурсаў",
@@ -398,7 +396,6 @@
     "effectsMgr.statics.logHouseCostReduction.title": "Зніжэнне кошту зруба",
     "effectsMgr.statics.lumberMillRatio.title": "Бонус Лесазаводу",
     "effectsMgr.statics.lunarOutpostRatio.title": "Бонус Месяцовай заставы",
-    "effectsMgr.statics.luxuryConsuptionReduction.title": "Скарачэнне спажывання раскошы",
     "effectsMgr.statics.luxuryHappinessBonus.title": "Раскошны бонус шчасця",
     "effectsMgr.statics.magnetoBoostRatio.title": "Магнітнае ўзмацненне",
     "effectsMgr.statics.magnetoRatio.title": "Вытворчы бонус",
@@ -475,9 +472,9 @@
     "effectsMgr.statics.terraformingMaxKittens.title": "Бонус кацянят з Тэрафарміруючай станцыi",
     "effectsMgr.statics.theocracyFaithProductionBonus.title": "Бонус вытворчасці веры",
     "effectsMgr.statics.timeImpedance.title": "Часовая адтэрміноўка штрафу",
+    "effectsMgr.statics.timeRatio.title": "Бонус, звязаны з часам",
     "effectsMgr.statics.tradeCatpowerDiscount.title": "Гандлёвая скідка кацiнай сілы",
     "effectsMgr.statics.tradeGoldDiscount.title": "Гандлёвая скідка на золата",
-    "effectsMgr.statics.timeRatio.title": "Бонус, звязаны з часам",
     "effectsMgr.statics.tradeRatio.title": "Каэфіцыент гандлю",
     "effectsMgr.statics.umbraBoostRatio.title": "Бонус Камбайну (Радыяцыя Хокінга)",
     "effectsMgr.statics.unhappinessRatio.title": "Зніжэнне няшчасця",
@@ -639,7 +636,6 @@
     "policy.liberalism.label": "Лібералізм",
     "policy.liberalism.desc": "Мірнае і адкрытае грамадства. Наладжвае лепшыя адносіны з усімі гандлёвымі партнёрамі і прымушае будынкі патрабаваць менш золата.",
     "policy.liberty.label": "Свабода",
-    "policy.liberty.desc": "Добра для вялікіх, экспансіўных грамадстваў. Удвая памяншае штрафы насельніцтва. Гэта паўплывае на тое, якія палітыкі будуць даступныя ў будучыні!",
     "policy.militarizeSpace.label": "Мілітарызаваць космас",
     "policy.militarizeSpace.desc": "Паспрабуй захапіць неба. Твае навуковыя спадарожнікі да абсерваторый на 10% больш магутныя.",
     "policy.monarchy.label": "Манархія",
@@ -653,7 +649,6 @@
     "policy.outerSpaceTreaty.label": "Дагавор па касмічнай прасторы",
     "policy.outerSpaceTreaty.desc": "Пагадзіся, што космас - гэта вобласць усіх рас Кацiнай планеты, паляпшаючы адносіны з усімі гандлёвымі партнёрамі.",
     "policy.radicalXenophobia.label": "Радыкальная ксенафобія",
-    "policy.radicalXenophobia.desc": "Адмоўся ад злых іншапланецян і злых робатаў. Святы Генацыд удвая больш эфектыўны.",
     "policy.rationality.label": "Рацыянальнасць",
     "policy.rationality.desc": "Прымі пункт гледжання, што свет можна фундаментальна зразумець. Атрымай невялікі бонус да навукі і вытворчасці жалеза, хоць пазней ты можаш здавацца дурным.",
     "policy.republic.label": "Рэспубліка",
@@ -663,7 +658,6 @@
     "policy.spaceBasedTerraforming.label": "Касмічнае тэрафармаванне",
     "policy.spaceBasedTerraforming.desc": "Размясці гіганцкія люстэркі ў небе, падвысіўшы паслядоўнасць сонечных ферм. Адкрывае касмічныя люстэркі.",
     "policy.stoicism.label": "Стаіцызм",
-    "policy.stoicism.desc": "Стоікі вучаць, што мы павінны цярпець цяжкасці без нараканняў. Удвая скараціць спажыванне раскошных рэсурсаў.",
     "policy.stripMining.label": "Палосная здабыча",
     "policy.stripMining.desc": "Зраўняй з зямлёй пагоркі, імкнучыся палепшыць здабычу карысных выкапняў.",
     "policy.sustainability.label": "Устойлівасць",
@@ -673,7 +667,6 @@
     "policy.theocracy.label": "Ордэн Зорак",
     "policy.theocracy.desc": "Твае касманаўты бачылі жудасныя рэчы ў далёкім небе. Няхай святары возьмуць на сябе кантроль, павялічваючы вытворчасць веры.",
     "policy.tradition.label": "Традыцыя",
-    "policy.tradition.desc": "Добра для невялікіх культурна-арыентаваных таварыстваў. Зніжае кошт рукапісаў і павялічвае іх эфект. Гэта паўплывае на тое, якія палітыкі будуць даступныя ў будучыні!",
     "policy.transkittenism.label": "Транскацянiзм",
     "policy.transkittenism.desc": "Адмоўся ад кацiнай сутнасці і злійцеся з ШІ. Ядра штучнага інтэлекту стануць удвая больш эфектыўнымі, і няма ніякіх недахопаў на ўзроўні штучнага інтэлекту.",
     "policy.zebraRelationsAppeasement.label": "Адносiны з зебрамi: замірэнне",
@@ -807,7 +800,6 @@
     "religion.sacrificeBtn.desc": "Вярніце аднарогаў у вымярэнне аднарога. Вы атрымаеце адну Слязу аднарога за кожны зікурат, які ў вас ёсць.",
     "religion.sacrificeBtn.sacrifice.msg": "{0} аднарогаў былі прынесены ў ахвяру. У вас {1} слёзы аднарога!",
     "religion.transcend.confirmation.title": "Перасягнуць мяжу вядомага свету? ",
-    "religion.transcend.confirmation.msg": "Ты ўпэўнены, што хочаш адкінуць частку свайго Багаяўлення?\n\nТы можаш дасягнуць асаблівых узроўняў трансцэндэнтнасці, ахвяруючы часткай свайго Багаяўлення.\n\nКожны ўзровень павысіць эфектыўнасць пераўтварэння культу (Захапіцца зоркамі).\n\nКожны ўзровень патрабуе прапарцыянальна большай колькасці ахвяраванняў.\n\nГэты бонус будзе складацца і пераносіцца праз скіды.\n\nКЛIК НА ГЭТУЮ КНОПКУ СЦЯРЭ ЧАСТКУ ТВАЙГО БАГАЯЎЛЕННЯ І ПАМЕНЬШЫЦЬ ЭФЕКТЫЎНАСЦЬ ЎСХВАЛЕННЯ.",
     "religion.transcend.msg.failure": "На крок бліжэй: {0}%",
     "religion.transcend.msg.success": "Вы перасягнулі межы тленнага. Узровень Т: {0}",
     "religion.transcendBtn.label": "Перасягнуць мяжу вядомага свету",
@@ -817,7 +809,6 @@
     "religion.tu.blackCore.flavor": "Пабудаваны з костак кацiных ахвяр.",
     "religion.tu.blackLibrary.label": "Чорная бібліятэка",
     "religion.tu.blackLibrary.desc": "Кожная чорная бібліятэка паляпшае маштабаванне Codex Leviathanianus на 2%. Гэта значэнне яшчэ больш паляпшаецца дзякуючы могілкам аднарогаў.",
-    "religion.tu.blackLibary.flavor": "Можа, тут спецыяльна цёмна настолькі, каб было немагчыма чытаць.",
     "religion.tu.blackNexus.label": "Чорны нексус",
     "religion.tu.blackNexus.desc": "Паляпшае хуткасць перапрацоўкі крышталяў часу ў рэліквіі.<br>Кожны Чорны нексус павялічыць тваю эфектыўнасць Рэліктавай ачысткi на колькасць Чорных пiрамiд.<br>Гэты эфект таксама павышае эфектыўнасць Рэліктавых станцый",
     "religion.tu.blackNexus.flavor": "Вока ў небе.",
@@ -834,7 +825,6 @@
     "religion.tu.darkNova.desc": "Паляпшае сусветную вытворчасць энергіі на 2%",
     "religion.tu.darkNova.flavor": "Зоркі памерлі. Як нашы надзеі і мары.",
     "religion.tu.holyGenocide.label": "Святы генацыд",
-    "religion.tu.holyGenocide.desc": "І сляза не ўпадзе",
     "religion.tu.holyGenocide.flavor": "Мы жывём на ціхім востраве няведання пасярод чорных мораў бясконцасці, і не было задумана, што мы павінны плыць далёка.",
     "religion.tu.singularity.label": "Гарызонт падзей",
     "religion.tu.singularity.desc": "Палепшыць глабальныя ліміты рэсурсаў на 10%",
@@ -987,12 +977,9 @@
     "resources.zebras.title": "зебры",
     "resources.sorrow.full": "Чорны вадкi смутак",
     "resources.sorrow.short": "ЧВС",
-    "gift.get": "XOXOXO! Старэйшыя табе даслалі вам падарункавую скрынку!",
-    "gift.repaire": "Старэйшыя багі адрамантавалі тваю падарункавую скрынку",
     "gift.resources": "Атрымана {0} {1}!",
     "gift.apocrypha": "Бонус Апокрыфы павялічыўся на {0}%!",
     "gift.transcendence": "Узровень Трансцэндэнтнасцi павялічаны на 4!",
-    "gift.metaphysics": "Разблакавана {0}!",
     "save.export.msg": "Экспарт захаваны!",
     "save.import.confirmation.msg": "Ты ўпэўнены? Гэта перазапіша твае захаванне!",
     "save.import.msg": "Імпарт захаваны!",
@@ -1325,7 +1312,6 @@
     "time.cfu.ressourceRetrieval.label": "Пошук рэсурсаў",
     "time.cfu.ressourceRetrieval.desc": "Атрымлівай частку сваіх гадавых рэсурсаў, спальваючы КЧ",
     "time.cfu.temporalAccelerator.label": "Часовы паскаральнік",
-    "time.cfu.temporalAccelerator.desc": "Паляпшае выпрацоўку энергіі патоку на 5%",
     "time.cfu.temporalBattery.label": "Часовая батарэя",
     "time.cfu.temporalBattery.desc": "Паляпшае тваю энергетычную ёмістасць патоку на 25%",
     "time.cfu.temporalImpedance.label": "Імпеданс часу",
@@ -1419,8 +1405,6 @@
     "trade.bcoin.crash": "Раздражняй Нябачную чорную руку",
     "trade.bcoin.crash.desc": "Утвары крах рынку блэккойнаў",
     "trade.correct.bcoin": "Адбылася велізарная карэкцыя крыптарынку",
-    "trade.embassy.open": "Адкрытая амбасада",
-    "trade.embassy": "Узровень амбасады ({0})",
     "trade.embassy.desc": "Палепшы свае дыпламатычныя адносіны, адкрыўшы амбасаду",
     "trade.embassy.pinned": "Прышпiленае",
     "trade.embassy.unpinned": "Адшпiленае",
@@ -1476,7 +1460,6 @@
     "ui.option.hide.bgimage": "Схаваць фонавы малюнак <i>(для каляровых схем, дзе гэта магчыма)</i>",
     "ui.option.tooltips.right": "Перамясціць падказкі ў правы слупок",
     "ui.option.more": "Больш..",
-    "ui.option.no.confirm": "Не пацвярджаць пры ачыстцы ўсіх заданняў, вывучэнні палітыкі або пры куплі або продажы ўсяго (пстрыкніце, утрымліваючы Shift)",
     "ui.option.iw.smelter": "У рэжыме Жалезнай Волi заводы адключаюцца пры 95% макс",
     "ui.option.disable.telemetry": "Адключыць гульнявую тэлеметрыю",
     "ui.option.enable.redshift": "Уключыць пазасеткавы прагрэс",
@@ -1521,7 +1504,6 @@
     "console.filter.ivoryMeteor": "Метэоры са слановай косці",
     "console.filter.unicornRift": "Разломы Аднарогаў",
     "console.filter.alicornRift": "Разломы Алiкорнаў",
-    "console.filter.tc": "Крышталi часу",
     "console.filter.faith": "Вера",
     "village.bonus.desc.chemist": "Бонус за хімічныя вырабы",
     "village.bonus.desc.engineer": "Бонус стварэння",
@@ -1758,7 +1740,6 @@
     "workshop.barges.label": "Баржы",
     "workshop.barges.desc": "Гавані захоўваюць больш вугалю",
     "workshop.biofuel.label": "Апрацоўка Біяпаліва",
-    "workshop.biofuel.desc": "Бiялабараторыя будзе ператвараць каціную мяту ў нафту",
     "workshop.bolas.label": "Болас",
     "workshop.bolas.desc": "Кідальная зброя з цяжкіх каменных гір. Твае паляўнічыя ўдвая больш эфектыўныя",
     "workshop.bolas.flavor": "Узброеная пража",
@@ -1990,7 +1971,6 @@
     "workshop.spaceEngineers.label": "Касмічныя інжынеры",
     "workshop.spaceEngineers.desc": "Паляпшае эфектыўнасць інжынера",
     "workshop.spaceManufacturing.label": "Касмічная вытворчасць",
-    "workshop.spaceManufacturing.desc": "Заводы прадастаўляюць бонусы да касмічных ліфтаў і арбітальных сістэм",
     "workshop.starlink.label": "Старлінк",
     "workshop.starlink.desc": "Кожны цэнтр апрацоўкі дадзеных дасць дадатковы 1% бонус Бiялабараторыi",
     "workshop.stasisChambers.label": "Стазісныя камеры",
diff --git a/res/i18n/crowdin/br.json b/res/i18n/crowdin/br.json
index ec6dd2beed..7530c01021 100644
--- a/res/i18n/crowdin/br.json
+++ b/res/i18n/crowdin/br.json
@@ -209,7 +209,6 @@
     "buildings.workshop.desc": "Permite desenvolver diversas melhorias. Aumenta a efetividade de fabricação em 6%.",
     "buildings.workshop.flavor": "Brinquedos de graça para trabalhadores",
     "buildings.zebraForge.label": "Forja das Zebras",
-    "buildings.zebraForge.desc": "Desbloqueia a fabricação de pedras de sangue e t-mitril",
     "buildings.zebraOutpost.label": "Entreposto de zebras",
     "buildings.zebraOutpost.desc": "Fornece uma base para as expedições de caça. Cada nível de melhoria melhora a eficácia da expedição em 5%",
     "buildings.zebraWorkshop.label": "Oficina de Zebras",
@@ -258,6 +257,8 @@
     "calendar.year.tooltip": "Ano:",
     "challendge.panel.label": "Desafios",
     "challendge.pending": "Pendente",
+    "challendge.reclaimReserves.label": "Recuperar reservas",
+    "challendge.reclaimReserves.desc": "Recuperar recursos do além",
     "challendge.applyPending.label": "Aplicar mudanças pendentes ({0})",
     "challendge.applyPending.desc": "Ativar Desafios/Condições marcadas como Pendentes imediatamente",
     "challendge.1000Years.label": "1000 anos",
@@ -279,12 +280,9 @@
     "challendge.ironWill.label": "Vontade de Ferro",
     "challendge.ironWill.desc": "Iron Will é um desafio escondido e você não precisa clicar aqui para habilitá-lo: recomece o jogo e jogue sem gatos.",
     "challendge.ironWill.effect.desc": "Nada",
-    "challendge.reclaimReserves.label": "Recuperar reservas",
-    "challendge.reclaimReserves.desc": "Recuperar recursos do além",
     "challendge.winterIsComing.label": "O inverno chegou",
     "challendge.winterIsComing.desc": "Recomeçar o jogo com a estação sempre sendo inverno.<br><br>Meta: Chegar a Helios.",
     "challendge.winterIsComing.effect.desc": "O clima é melhor no geral.",
-    "challendge.btn.chronosphere.desc": "Você não ganhará o bônus de recomeço das cronosferas",
     "challendge.btn.chronosphere.with.ironWill.desc": "Você não ganhará o bônus de recomeço das cronosferas.<br />ATENÇÃO: o bônus de cronosferas irá encerrar o modo Iron Will automaticamente.",
     "challendge.btn.confirmation.title": "Confirmação de Desafio",
     "challendge.btn.confirmation.msg": "Tem certeza que quer começar esse desafio recomeçando seu jogo?",
@@ -367,8 +365,8 @@
     "effectsMgr.statics.factoryCostReduction.title": "Redução de custo de fábrica",
     "effectsMgr.statics.factoryRefineRatio.title": "Bônus de refinamento da Fábrica",
     "effectsMgr.statics.faithRatioReligion.title": "Bônus de fé",
-    "effectsMgr.statics.festivalRatio.title": "Efeitos do Festival",
     "effectsMgr.statics.festivalArrivalRatio.title": "Taxa de crescimento do festival",
+    "effectsMgr.statics.festivalRatio.title": "Efeitos do Festival",
     "effectsMgr.statics.gflopsConsumption.title": "Consumo de GFlops",
     "effectsMgr.statics.globalRelationsBonus.title": "Bônus de relações",
     "effectsMgr.statics.globalResourceRatio.title": "Bônus de recursos máximo",
@@ -398,7 +396,6 @@
     "effectsMgr.statics.logHouseCostReduction.title": "Redução de custo de casa de madeira",
     "effectsMgr.statics.lumberMillRatio.title": "Bônus de Serraria",
     "effectsMgr.statics.lunarOutpostRatio.title": "Bônus de entreposto lunar",
-    "effectsMgr.statics.luxuryConsuptionReduction.title": "Redução de consumo de luxos",
     "effectsMgr.statics.luxuryHappinessBonus.title": "Bônus de felicidade por luxo",
     "effectsMgr.statics.magnetoBoostRatio.title": "Impulso magnético",
     "effectsMgr.statics.magnetoRatio.title": "Bônus de produção",
@@ -471,9 +468,9 @@
     "effectsMgr.statics.terraformingMaxKittens.title": "Bônus de gatinhos da Estação de Terraplenagem",
     "effectsMgr.statics.theocracyFaithProductionBonus.title": "Bônus de produção de fé",
     "effectsMgr.statics.timeImpedance.title": "Atraso da penalidade temporal",
+    "effectsMgr.statics.timeRatio.title": "Bônus de Fluxo Temporal",
     "effectsMgr.statics.tradeCatpowerDiscount.title": "Desconto de poder dos gatos para o comércio",
     "effectsMgr.statics.tradeGoldDiscount.title": "Desconto de ouro em trocas",
-    "effectsMgr.statics.timeRatio.title": "Bônus de Fluxo Temporal",
     "effectsMgr.statics.tradeRatio.title": "Proporção de Troca",
     "effectsMgr.statics.umbraBoostRatio.title": "Bônus de Colheitadeira HR",
     "effectsMgr.statics.unhappinessRatio.title": "Redução de infelicidade",
@@ -631,7 +628,6 @@
     "policy.liberalism.label": "Liberalismo",
     "policy.liberalism.desc": "Uma sociedade pacífica e aberta. Melhora as relações com todos os parceiros comerciais e faz com que os construções exijam menos ouro para serem erguidas.",
     "policy.liberty.label": "Liberdade",
-    "policy.liberty.desc": "Bom para sociedades grandes. Corta pela metade as penalidades de grandes populações. Isso afetará quais políticas estão disponíveis no futuro!",
     "policy.militarizeSpace.label": "Militarizar o espaço",
     "policy.militarizeSpace.desc": "Tentar tomar controle do céu. Seu bônus científico dos satélites para os observatórios ficará 10% mais forte.",
     "policy.monarchy.label": "Monarquia",
@@ -644,7 +640,6 @@
     "policy.outerSpaceTreaty.label": "Tratado do espaço externo",
     "policy.outerSpaceTreaty.desc": "Concorde que o espaço é do domínio de todas as raças do planeta, melhorando relações com todos os parceiros comerciais.",
     "policy.radicalXenophobia.label": "Xenofobia Radical",
-    "policy.radicalXenophobia.desc": "Rejeite os alienígenas do mal e os robôs do mal. Genocídio sagrado é duas vezes mais eficaz.",
     "policy.rationality.label": "Racionalidade",
     "policy.rationality.desc": "Aceitar a ideia de que o mundo pode ser fundamentalmente compreendido. Ganhe um pequeno bônus de ciência e produção de ferro, embora você possa parecer bobo mais tarde.",
     "policy.republic.label": "República",
@@ -654,7 +649,6 @@
     "policy.spaceBasedTerraforming.label": "Terraformação espacial",
     "policy.spaceBasedTerraforming.desc": "Coloque espelhos gigantes no céu, impulsionando a consistência de fazendas solares. Desbloqueia Espelhos Espaciais.",
     "policy.stoicism.label": "Estoicismo",
-    "policy.stoicism.desc": "A visão estoica ensina que deveríamos passar por dificuldades sem reclamar. Acaba cortando pela metade o consumo de recursos de luxo.",
     "policy.stripMining.label": "Minração a céu-aberto",
     "policy.stripMining.desc": "Destrua as colinas para melhorar sua produção mineral.",
     "policy.sustainability.label": "Sustentabilidade",
@@ -664,7 +658,6 @@
     "policy.theocracy.label": "Ordem das Estrelas",
     "policy.theocracy.desc": "Seus astronautas viram coisas horríveis nos céus distantes. Deixe os padres assumir o controle, aumentando a produção religiosa.",
     "policy.tradition.label": "Tradição",
-    "policy.tradition.desc": "Bom para as pequenas sociedades orientadas para a cultura. Reduz o preço do manuscrito e aumenta seu efeito. Isso afetará quais políticas estão disponíveis no futuro!",
     "policy.transkittenism.label": "Transfilhotismo",
     "policy.transkittenism.desc": "Desista de ser um gato e se junte com a IA. Núcleos de IA serão duas vezes mais potentes e não terá lado negativo para o nível de IA.",
     "policy.zebraRelationsAppeasement.label": "Relações com as zebras: Apaziguamento",
@@ -780,7 +773,6 @@
     "religion.sacrificeBtn.desc": "Devolve os unicórnios à Dimensão dos Unicórnios. Você recebe uma Lágrima de Unicórnio para cada Zigurate que tiver.",
     "religion.sacrificeBtn.sacrifice.msg": "{0} unicórnios foram sacrificados. Ganhou {1} lágrima(s)!",
     "religion.transcend.confirmation.title": "Transcender?",
-    "religion.transcend.confirmation.msg": "Tem certeza que quer descartar seu bônus de louvor?\n\nVocê pode alcançar um nível especial de transcendência ao sacrificar seu bônus se louvor.\n\nCada nível requer proporcionalmente mais bônus de fé para ser sacrificado.\n\nEste bônus se acumula e continua ativo entre recomeços.\n\nCLICAR NESTE BOTÃO APAGARÁ UMA PARTE DO BÔNUS DE FÉ EM LOUVOR.",
     "religion.transcend.msg.failure": "Chegando perto: {0}%",
     "religion.transcend.msg.success": "Você transcende os limites mortais. Nível-T: {0}",
     "religion.transcendBtn.label": "Transcender",
@@ -789,7 +781,6 @@
     "religion.tu.blackCore.desc": "Modifica e corrompe as leis da realidade num escala mínima.<br />Cada nível do Núcleo Negro aumenta o limite de BLS em 1%.",
     "religion.tu.blackCore.flavor": "Construído com os ossos de gatos sacrificados.",
     "religion.tu.blackLibrary.label": "Biblioteca Negra",
-    "religion.tu.blackLibary.flavor": "Parece que está escuro demais para ler de propósito.",
     "religion.tu.blackNexus.label": "Nexo Negro",
     "religion.tu.blackNexus.desc": "Aumenta o ritmo em que cristais do tempo se refinam em relíquias.<br />Cada Nexo Negro aumenta a eficiência de Refinamento de Relíquias para cada Pirâmide Negra.<br>Também melhora a eficiência das Estações de Relíquias",
     "religion.tu.blackNexus.flavor": "De olho no céu.",
@@ -803,7 +794,6 @@
     "religion.tu.darkNova.desc": "Aumenta a produção de energia global em 2%",
     "religion.tu.darkNova.flavor": "As estrelas estão mortas. Assim como nossos sonhos e esperanças.",
     "religion.tu.holyGenocide.label": "Santo Genocídio",
-    "religion.tu.holyGenocide.desc": "E a lágrima não cairá.",
     "religion.tu.holyGenocide.flavor": " Vivemos numa plácida ilha de ignorância em meio a negros mares de infinito, e não está escrito pela Providência que devemos viajar longe.",
     "religion.tu.singularity.label": "Horizonte de Evento",
     "religion.tu.singularity.desc": "Aumenta o limite de recursos globais em 10%",
@@ -950,11 +940,8 @@
     "resources.epiphany.title": "epifania",
     "resources.wrappingPaper.title": "papel de embrulho",
     "resources.zebras.title": "zebras",
-    "gift.get": "Beijos e abraços! Os Deuses anciões te mandaram um presente!",
-    "gift.repaire": "Os deuses anciões consertaram sua caixa de presente",
     "gift.resources": "Obteve {0} {1}!",
     "gift.transcendence": "Nível de Transcendência aumentou em 4!",
-    "gift.metaphysics": "Desbloqueado {0}!",
     "save.export.msg": "Exportação completa!",
     "save.import.confirmation.msg": "Tem certeza? Isso vai apagar seu jogo atual!",
     "save.import.msg": "Importação completa!",
@@ -1274,7 +1261,6 @@
     "time.cfu.ressourceRetrieval.label": "Recuperação de Recursos",
     "time.cfu.ressourceRetrieval.desc": "Recupera parte de seus recursos anuais quando queima Cristais de Tempo",
     "time.cfu.temporalAccelerator.label": "Acelerador Temporal",
-    "time.cfu.temporalAccelerator.desc": "Aumenta a geração de energia de fluxo em 5%",
     "time.cfu.temporalBattery.label": "Bateria Temporal",
     "time.cfu.temporalBattery.desc": "Aumenta sua capacidade de energia de fluxo em 25%",
     "time.cfu.temporalImpedance.label": "Impedância Temporal",
@@ -1354,8 +1340,6 @@
     "trade.bcoin.sell.msg": "Você ganhou {0} relíquias",
     "trade.bcoin.crash": "Encha o saco da mão negra invisível",
     "trade.bcoin.crash.desc": "Force que o mercado de moedas negras caia",
-    "trade.embassy.open": "Abrir Embaixada",
-    "trade.embassy": "Nível da embaixada ({0})",
     "trade.embassy.desc": "Melhore seus relacionamentos diplomáticos estabelecendo uma embaixada",
     "trade.embassy.pinned": "Fixado",
     "trade.embassy.unpinned": "Desafixado",
@@ -1399,7 +1383,6 @@
     "ui.option.hide.sell": "Esconder botões 'vender'",
     "ui.option.hide.bgimage": "Ocultar imagem de fundo <i>(para esquemas de cor quando aplicável)</i>",
     "ui.option.more": "Mais...",
-    "ui.option.no.confirm": "Não confirmar quando for tirar todos os trabalhos, quando pesquisar políticas ou quando for comprar ou vender tudo (Shift+clique)",
     "ui.option.iw.smelter": "Fornalhas desligam em 95% ferro máximo no modo Vontade de Ferro",
     "ui.option.disable.telemetry": "Desativar telemetria do jogo",
     "ui.option.enable.redshift": "Habilitar progressão offline",
@@ -1440,7 +1423,6 @@
     "console.filter.ivoryMeteor": "Meteoros de marfim",
     "console.filter.unicornRift": "Fendas de unicórnios",
     "console.filter.alicornRift": "Fendas de alicórnios",
-    "console.filter.tc": "Cristais Temporais",
     "console.filter.faith": "Fé",
     "village.bonus.desc.chemist": "Bônus de fabricação química",
     "village.bonus.desc.engineer": "Bônus de fabricação",
@@ -1627,7 +1609,6 @@
     "workshop.barges.label": "Barcas",
     "workshop.barges.desc": "Portos armazenam mais carvão",
     "workshop.biofuel.label": "Processamento de Biocombustível",
-    "workshop.biofuel.desc": "`Bio Laboratórios convertem erva de gato em óleo",
     "workshop.bolas.label": "Boleadeira",
     "workshop.bolas.desc": "Arma de atirar feita com pesos de pedra. Seus caçadores são duas vezes mais eficazes",
     "workshop.bolas.flavor": "Lã Armada",
@@ -1851,7 +1832,6 @@
     "workshop.spaceEngineers.label": "Engenheiros Espaciais",
     "workshop.spaceEngineers.desc": "Aumenta a eficiência dos engenheiros",
     "workshop.spaceManufacturing.label": "Produção Espacial",
-    "workshop.spaceManufacturing.desc": "Fábricas proporcionam um bônus aos Elevadores Espaciais e Matrizes Orbitais",
     "workshop.starlink.label": "Rede Estelar",
     "workshop.stasisChambers.label": "Câmaras de Estasis",
     "workshop.stasisChambers.desc": "Fendas de Energia são duas vezes mais eficientes",
diff --git a/res/i18n/crowdin/cz.json b/res/i18n/crowdin/cz.json
index b368b672fa..3cebb93ff7 100644
--- a/res/i18n/crowdin/cz.json
+++ b/res/i18n/crowdin/cz.json
@@ -209,7 +209,6 @@
     "buildings.workshop.desc": "Poskytuje mnoho vylepšení. Zvyšuje účinnost výroby o 6 %",
     "buildings.workshop.flavor": "Hračky pro dělníky",
     "buildings.zebraForge.label": "Zebří kovárna",
-    "buildings.zebraForge.desc": "Odemkne výrobu krvavých kamenů a t-mythrilu",
     "buildings.zebraOutpost.label": "Zebří základna",
     "buildings.zebraOutpost.desc": "Poskytuje základnu loveským výpravám. Každý další stupeň vylepšení zvýší efektivitu výprav o 5 %",
     "buildings.zebraWorkshop.label": "Zebří Dílna",
@@ -258,6 +257,8 @@
     "calendar.year.tooltip": "Rok:",
     "challendge.panel.label": "Výzvy",
     "challendge.pending": "Čekající",
+    "challendge.reclaimReserves.label": "Navrácení zásob",
+    "challendge.reclaimReserves.desc": "Navrácení zásob z dálav",
     "challendge.applyPending.label": "Použít čekající změny ({0})",
     "challendge.applyPending.desc": "Bezprostředně zapne výzvy/podmínky označené jako čekající",
     "challendge.1000Years.label": "1000 let",
@@ -279,12 +280,9 @@
     "challendge.ironWill.label": "Železná vůle",
     "challendge.ironWill.desc": "Železná vůle je trochu skrytá výzva, kterou nemusíš ani nijak aktivovat: restartuj hru a hraj bez koťat.",
     "challendge.ironWill.effect.desc": "Nic",
-    "challendge.reclaimReserves.label": "Navrácení zásob",
-    "challendge.reclaimReserves.desc": "Navrácení zásob z dálav",
     "challendge.winterIsComing.label": "Obrňte se - zima přišla",
     "challendge.winterIsComing.desc": "Restartuj hru jen se zimním obdobím. (Šanta nebude mít žádný bonus z paragonů)<br><br>Cíl: Dostaň se na Helios.",
     "challendge.winterIsComing.effect.desc": "Teplá fronta je častější a ta studená zase méně častější.",
-    "challendge.btn.chronosphere.desc": " Nezískáš bonus za restart z chronosfér.",
     "challendge.btn.chronosphere.with.ironWill.desc": " Nezískáš bonus za restart z chronosfér.<br/>POZOR: bonus za restart z chronosfér automaticky vypne železnou vůli.",
     "challendge.btn.confirmation.title": "Potvrzení výzvy",
     "challendge.btn.confirmation.msg": "Jseš si jistý/á, že chceš resetovat hru s touto výzvou?",
@@ -367,8 +365,8 @@
     "effectsMgr.statics.factoryCostReduction.title": "Snížení nákladů na továrnu",
     "effectsMgr.statics.factoryRefineRatio.title": "Bonus k továrnímu rafinování",
     "effectsMgr.statics.faithRatioReligion.title": "Bonus k víře",
-    "effectsMgr.statics.festivalRatio.title": "Účinky masopustu",
     "effectsMgr.statics.festivalArrivalRatio.title": "Míra růstu masopustu",
+    "effectsMgr.statics.festivalRatio.title": "Účinky masopustu",
     "effectsMgr.statics.gflopsConsumption.title": "Přeměna GFlopů",
     "effectsMgr.statics.globalRelationsBonus.title": "Bonus k vztahům",
     "effectsMgr.statics.globalResourceRatio.title": "Bonus k maximálnímu skladování surovin",
@@ -398,7 +396,6 @@
     "effectsMgr.statics.logHouseCostReduction.title": "Snížení nákladů na chatu",
     "effectsMgr.statics.lumberMillRatio.title": "Bonus k pilám",
     "effectsMgr.statics.lunarOutpostRatio.title": "Bonus k měsíčním základnám",
-    "effectsMgr.statics.luxuryConsuptionReduction.title": "Snižování spotřeby luxusních materiálů",
     "effectsMgr.statics.luxuryHappinessBonus.title": "Bonus za luxusní spokojenost",
     "effectsMgr.statics.magnetoBoostRatio.title": "Zesílení účinku Dynam",
     "effectsMgr.statics.magnetoRatio.title": "Bonus k výrobě",
@@ -588,7 +585,6 @@
     "policy.fascism.desc": "Libanonské! Postihy ke štěstí za nadpopulaci jsou zrušeny a chaty stojí polovinu nákladů.",
     "policy.isolationism.label": "Izolacionismus",
     "policy.knowledgeSharing.desc": "Vědci budou cestovat do cizích zemí, čímž mírně zvýší produkci vědy.",
-    "policy.liberty.desc": "Dobrý pro velké, rozpínavé společnosti. Penalizace za populaci je poloviční. Toto ovlivní zásady dostupné v budoucnu!",
     "policy.militarizeSpace.desc": "Zkus vládnout nebesům. Tvůj vědecký bonus satelitů observatořím bude o 10% silnější.",
     "policy.mysticism.desc": "Přijmi názor, že existují síly mimo chápání koťat. Získej malý bonus k produkci kultury a víry, ačkoli můžeš chvíli působit trochu pošetile.",
     "policy.necrocracy.desc": "Tvá společnost nabízí samu sebe starším, převezmou moc a přinesou temné časy, ale dostaneš produkční bonus ze ŽČT.",
@@ -596,7 +592,6 @@
     "policy.socialism.desc": "Nemá žádný účinek",
     "policy.spaceBasedTerraforming.desc": "Umístí obrovská zrcadla na nebe, zvýší konzistenci výkonu solárních farem. Odemkne vesmírná zrcadla.",
     "policy.theocracy.desc": "Vaši astronauti viděli příšerné věci na vzdálených oblohách. Nechte kněze převzít moc, zvyšujíce tak produkci víry.",
-    "policy.tradition.desc": "Dobrý pro malé společnosti orientované na kulturu. Snižuje cenu rukopisu a zvyšuje jeho účinek. Toto ovlivní, jaké zásady jsou v budoucnu k dispozici!",
     "prestige.panel.label": "Metafyzika",
     "prestige.adjustmentBureau.label": "Úřad úprav",
     "prestige.adjustmentBureau.desc": "Odemyká další herní výzvy.",
@@ -705,7 +700,6 @@
     "religion.sacrificeBtn.desc": "Vrať Jednorožce do Jednorožčí Dimenze. Dostaneš jednu jedinou slzu za každý Zikkurat, který máš.",
     "religion.sacrificeBtn.sacrifice.msg": "{0} jednorožců bylo obětováno. Dostal jsi {1} jednorožčích slz!",
     "religion.transcend.confirmation.title": "Transcendovat?",
-    "religion.transcend.confirmation.msg": "Opravdu chceš odstranit část zjevení?\n\nMůžeš dosáhnout speciálních úrovní transcendence tím, že obětuješ část tvého zjevení.\n\nKaždá úroveň zlepší účinnost převodu pobořnosti (Uctívat hvězdy).\n\nKaždá úroveň vyžaduje obětovat proporčně více zjevení.\n\nTento bonus se postupně sčítá a přetrvává mezi resety hry.\n\nKLIKNUTÍ NA TOTO TLAČÍTKO ODSTRANÍ ČÁST TVÉHO ZJEVENÍ A ÚČINNOST UCTÍVÁNÍ.",
     "religion.transcend.msg.failure": "O krok blíže: {0}%",
     "religion.transcend.msg.success": "Překonal jsi smrtelné limity. Úroveň Transcendence: {0}",
     "religion.transcendBtn.label": "Transcendovat",
@@ -727,7 +721,6 @@
     "religion.tu.darkNova.desc": "Zlepšuje glovální produkci energie o 2%",
     "religion.tu.darkNova.flavor": "Všechny hvězdy jsou mrtvé. Stejně jako naše naděje a sny.",
     "religion.tu.holyGenocide.label": "Svatá Genocida",
-    "religion.tu.holyGenocide.desc": "A slza neklesne",
     "religion.tu.holyGenocide.flavor": "Žijeme na poklidném ostrůvku nevědomosti uprostřed černých moří nekonečna a neočekává se, že se budeme vydávat daleko od břehů. (H.P.L.)",
     "religion.tu.singularity.label": "Horizont Události",
     "religion.tu.singularity.desc": "Zlepši globální limity skladování surovin o 10%",
@@ -1164,7 +1157,6 @@
     "time.cfu.ressourceRetrieval.label": "Zisk Zásob",
     "time.cfu.ressourceRetrieval.desc": "Získej zpět část tvých zásob když spaluješ ČK",
     "time.cfu.temporalAccelerator.label": "Časový Urychlovač",
-    "time.cfu.temporalAccelerator.desc": "Zlepšuje produkci Fluxové energie o 5%",
     "time.cfu.temporalBattery.label": "Časová Baterie",
     "time.cfu.temporalBattery.desc": "Zlepšuje tvoji kapacity Fluxové energie o 25%",
     "time.cfu.temporalImpedance.label": "Časová Impendance",
@@ -1283,7 +1275,6 @@
     "console.filter.ivoryMeteor": "Meteory slonoviny",
     "console.filter.unicornRift": "Jednorožčí trhliny",
     "console.filter.alicornRift": "Křídlorožčí trhliny",
-    "console.filter.tc": "Časové Krystaly",
     "village.bonus.desc.chemist": "Bonus na chemickou výrobu",
     "village.bonus.desc.engineer": "Výrobní bonus",
     "village.bonus.desc.manager": "Lovecký bonus",
@@ -1508,7 +1499,6 @@
     "workshop.barges.label": "Nákladní čluny",
     "workshop.barges.desc": "Přístavy budou skladovat více uhlí",
     "workshop.biofuel.label": "Zpracovávání Biopaliv",
-    "workshop.biofuel.desc": "Biolaboratoře budou zpracovávat šantu na ropu",
     "workshop.bolas.label": "Bola",
     "workshop.bolas.desc": "Házecí zbraň z těžkých kamenných vah. Tvoji lovci jsou dvakrát tak efektivní",
     "workshop.bolas.flavor": "Nazbrojená příze",
@@ -1740,7 +1730,6 @@
     "workshop.spaceEngineers.label": "Kosmičtí inženýři",
     "workshop.spaceEngineers.desc": "Zlepšuje výkonnost inženýrů",
     "workshop.spaceManufacturing.label": "Vesmírná výroba",
-    "workshop.spaceManufacturing.desc": "Továrny poskytují bonus vesmírným výtahům a orbitálním polím",
     "workshop.starlink.label": "Starlink",
     "workshop.starlink.desc": "Každé datové centrum poskytuje další 1% bonus k biolaboratořím",
     "workshop.stasisChambers.label": "Stázové komory",
diff --git a/res/i18n/crowdin/de.json b/res/i18n/crowdin/de.json
index 6740cabdca..dc4b1acad2 100644
--- a/res/i18n/crowdin/de.json
+++ b/res/i18n/crowdin/de.json
@@ -209,7 +209,6 @@
     "buildings.workshop.desc": "Bietet eine große Anzahl an Verbesserungen.<br>Jeder Ausbau verbessert die Effektivität der Herstellung um 6%.",
     "buildings.workshop.flavor": "Gratis-Spielzeuge für Arbeiter",
     "buildings.zebraForge.label": "Zebraschmiede",
-    "buildings.zebraForge.desc": "Schaltet die Herstellung von Blutsteinen und T-Mythril frei",
     "buildings.zebraOutpost.label": "Zebra-Außenposten",
     "buildings.zebraOutpost.desc": "Bietet einen Stützpunkt für Jagdexpeditionen. Jedes Upgrade verbessert die Effektivität der Expeditionen um 5%",
     "buildings.zebraWorkshop.label": "Zebra-Werkstatt",
@@ -258,6 +257,8 @@
     "calendar.year.tooltip": "Jahr:",
     "challendge.panel.label": "Herausforderungen",
     "challendge.pending": "Ausstehend",
+    "challendge.reclaimReserves.label": "Reserven zurückfordern",
+    "challendge.reclaimReserves.desc": "Ressourcen aus dem Jenseits zurückholen",
     "challendge.applyPending.label": "Ausstehende Änderungen anwenden ({0})",
     "challendge.applyPending.desc": "Als ausstehend markierte Herausforderungen/Bedingungen sofort einschalten",
     "challendge.1000Years.label": "1000 Jahre",
@@ -279,12 +280,9 @@
     "challendge.ironWill.label": "Eiserner Wille",
     "challendge.ironWill.desc": "Eiserner Wille ist eine versteckte Herausforderung. Du musst nicht hier klicken, um sie zu starten, du kannst auch neustarten und keine Häuser bauen.",
     "challendge.ironWill.effect.desc": "Nichts",
-    "challendge.reclaimReserves.label": "Reserven zurückfordern",
-    "challendge.reclaimReserves.desc": "Ressourcen aus dem Jenseits zurückholen",
     "challendge.winterIsComing.label": "Der Winter naht!",
     "challendge.winterIsComing.desc": "Starte das Spiel neu. Es gibt nur die Winterjahreszeit.<br><br>Ziel: Erreiche Helios.",
     "challendge.winterIsComing.effect.desc": "Das Wetter ist insgesamt besser.",
-    "challendge.btn.chronosphere.desc": "Du erhältst keinen Bonus nach Neustart durch Chronosphären.",
     "challendge.btn.chronosphere.with.ironWill.desc": "Du erhältst keinen Bonus nach Neustart durch Chronosphären.<br />Achtung: Der Bonus nach Neustart durch Chronosphären deaktivert automatisch den eisernen Willen.",
     "challendge.btn.confirmation.title": "Challenge-Bestätigung",
     "challendge.btn.confirmation.msg": "Bist du sicher, dass du diese Challenge starten möchtest, indem du das Spiel zurücksetzt?",
@@ -367,8 +365,8 @@
     "effectsMgr.statics.factoryCostReduction.title": "Reduzierung der Fabrikkosten",
     "effectsMgr.statics.factoryRefineRatio.title": "Factory-Raffinierungsbonus",
     "effectsMgr.statics.faithRatioReligion.title": "Glaubensbonus",
-    "effectsMgr.statics.festivalRatio.title": "Festivaleffekte",
     "effectsMgr.statics.festivalArrivalRatio.title": "Festival wachstums Rate",
+    "effectsMgr.statics.festivalRatio.title": "Festivaleffekte",
     "effectsMgr.statics.gflopsConsumption.title": "GFlops Konsum",
     "effectsMgr.statics.globalRelationsBonus.title": "Beziehungsbonus",
     "effectsMgr.statics.globalResourceRatio.title": "Max. Ressourcenbonus",
@@ -398,7 +396,6 @@
     "effectsMgr.statics.logHouseCostReduction.title": "Blockhaus Kosten Reduktion",
     "effectsMgr.statics.lumberMillRatio.title": "Sägewerkbonus",
     "effectsMgr.statics.lunarOutpostRatio.title": "Lunarer-Außenpostensbonus",
-    "effectsMgr.statics.luxuryConsuptionReduction.title": "Luxusgutkonsumreduktion",
     "effectsMgr.statics.luxuryHappinessBonus.title": "Luxus Glücklichkeitsbonus",
     "effectsMgr.statics.magnetoBoostRatio.title": "Magneto-Produktionsbonus",
     "effectsMgr.statics.magnetoRatio.title": "Magneto-Produktionsbonus",
@@ -475,9 +472,9 @@
     "effectsMgr.statics.terraformingMaxKittens.title": "Kätzchen-Bonus Terraforming-Station",
     "effectsMgr.statics.theocracyFaithProductionBonus.title": "Glaubensproduktionsbonus",
     "effectsMgr.statics.timeImpedance.title": "Zeitliche Strafverzögerung",
+    "effectsMgr.statics.timeRatio.title": "Zeitlicher-Flux-Bonus",
     "effectsMgr.statics.tradeCatpowerDiscount.title": "Katzenkraft-Handelsrabatt",
     "effectsMgr.statics.tradeGoldDiscount.title": "Gold-Handelsrabatt",
-    "effectsMgr.statics.timeRatio.title": "Zeitlicher-Flux-Bonus",
     "effectsMgr.statics.tradeRatio.title": "Handelsverhältnis",
     "effectsMgr.statics.umbraBoostRatio.title": "HR-Ernter Bonus",
     "effectsMgr.statics.unhappinessRatio.title": "Reduzierung Unzufriedenheit",
@@ -639,7 +636,6 @@
     "policy.liberalism.label": "Liberalismus",
     "policy.liberalism.desc": "Eine friedliche und offene Gesellschaft. Verbessert die Beziehungen zu allen Handelspartnern und benötigt weniger Gold für Bauwerke.",
     "policy.liberty.label": "Freiheit",
-    "policy.liberty.desc": "Gut für große und umfangreiche Gesellschaften. Halbiert die Strafen für Bevölkerung. Wirkt sich auf zukünftige Leitlinien aus!",
     "policy.militarizeSpace.label": "Weltraum militarisieren",
     "policy.militarizeSpace.desc": "Versuche, den Himmel zu erobern. Der Wissenschaftsbonus deiner Satelliten für Observatorien ist um 10% höher.",
     "policy.monarchy.label": "Monarchie",
@@ -653,7 +649,6 @@
     "policy.outerSpaceTreaty.label": "Weltraumabkommen",
     "policy.outerSpaceTreaty.desc": "Stimme zu, das der Weltraum die Domäne von allen Cath-Rassen ist; dadurch verbessert sich die Beziehungen zu allen Handels-Partnern.",
     "policy.radicalXenophobia.label": "Radikale Xenophobie",
-    "policy.radicalXenophobia.desc": "Weißt beide, böse Aliens und böse Roboter, zurück. Der Heilige Genozid ist doppelt so effektiv.",
     "policy.rationality.label": "Vernunft",
     "policy.rationality.desc": "Akzeptiere die Ansicht, dass die Welt grundsätzlich verstanden werden kann. Erhalte einen kleinen Bonus für Wissenschaft und Eisenerzeugung, obwohl du später vielleicht dumm aussiehst.",
     "policy.republic.label": "Republik",
@@ -663,7 +658,6 @@
     "policy.spaceBasedTerraforming.label": "Weltraumbasiertes Terraforming",
     "policy.spaceBasedTerraforming.desc": "Hänge riesige Spiegel in den Himmel, um die Leistungsstetigkeit der Solarparks zu erhöhen. Schaltet Weltraumspiegel frei.",
     "policy.stoicism.label": "Stoizismus",
-    "policy.stoicism.desc": "Die Stoiker lehrten, die Not zu ertragen, ohne zu klagen. Halbiert den Verbrauch von Luxusgütern.",
     "policy.stripMining.label": "Tagebau",
     "policy.stripMining.desc": "Hügel abtragen, um die Mineralienproduktion zu verbessern.",
     "policy.sustainability.label": "Nachhaltigkeit",
@@ -673,7 +667,6 @@
     "policy.theocracy.label": "Orden der Sterne",
     "policy.theocracy.desc": "Deine Astronauten haben schreckliche Dinge am fernen Himmel gesehen. Lass die Priester übernehmen. Erhöht die Glaubensproduktion.",
     "policy.tradition.label": "Tradition",
-    "policy.tradition.desc": "Gut für kleine, kulturorientierte Gesellschaften. Reduziert den Preis für Manuskripte und erhöht deren Wirkung. Das wird Auswirkungen haben, welche Richtlinien zukünftig verfügbar werden!",
     "policy.transkittenism.label": "Transkatzenismus",
     "policy.transkittenism.desc": "Gib das Kätzchensein auf und verbinde dich mit der KI. KI-Kerne werden doppelt so effektiv und es gibt keine Nachteile für das KI-Level.",
     "policy.zebraRelationsAppeasement.label": "Zebra-Beziehungen: Besänftigung",
@@ -807,7 +800,6 @@
     "religion.sacrificeBtn.desc": "Schicke die Einhörner in die Einhorn-Dimension zurück. Du erhältst für jedes Zikkurat das du besitzt eine Einhorn-Träne.",
     "religion.sacrificeBtn.sacrifice.msg": "{0} Einhörner wurden geopfert. Du erhältst {1} Einhorn-Tränen!",
     "religion.transcend.confirmation.title": "Transzendieren?",
-    "religion.transcend.confirmation.msg": "Bist du sicher, dass du einen Teil deiner Epiphanie ablegen willst?\n\nDu kannst spezielle Transzendenzstufen erreichen, indem du einen Teil deiner Epiphanie opferst.\n\nJede Stufe erhöht die Wirksamkeit der Anbetungsumwandlung (Anbetung der Sterne).\n\nFür jede Stufe muss proportional mehr Epiphanie geopfert werden.\n\nDieser Bonus ist stapelbar und wird durch Rücksetzungen übertragen.\n\nWENN DU AUF DIESE SCHALTFLÄCHE KLICKST, WIRD EIN TEIL DEINER EPIPHANIE UND DEINER ANBETUNGSEFFIZIENZ GELÖSCHT.",
     "religion.transcend.msg.failure": "Ein Schritt näher am Ziel: {0} ({1}%)",
     "religion.transcend.msg.success": "Du hast die Grenzen der Sterblichkeit überschritten. T-level: {0}",
     "religion.transcendBtn.label": "Transzendieren",
@@ -817,7 +809,6 @@
     "religion.tu.blackCore.flavor": "Gebaut aus den Knochen von geopferten Kätzchen.",
     "religion.tu.blackLibrary.label": "Schwarze Bibliothek",
     "religion.tu.blackLibrary.desc": "Jede Schwarze Bibliothek verbessert die Skalierung des Codex Leviathanianus um 2%. Dieser Wert wird durch Einhorn-Friedhöfe weiter verbessert.",
-    "religion.tu.blackLibary.flavor": "Vielleicht ist es absichtlich zu dunkel zum Lesen.",
     "religion.tu.blackNexus.label": "Schwarzer Nexus",
     "religion.tu.blackNexus.desc": "Improves the rate you refine time crystals into relics.<br />Every Black Nexus will increase your Relic Refine efficiency by the number of Black Pyramid.<br>This effect also boosts the effectiveness of Relic Stations",
     "religion.tu.blackNexus.flavor": "Auge im Himmel.",
@@ -834,7 +825,6 @@
     "religion.tu.darkNova.desc": "Verbessert globale Energieproduktion um 2%",
     "religion.tu.darkNova.flavor": "Die Sterne sind Tot. Genauso wie unsere Hoffnungen und Träume.",
     "religion.tu.holyGenocide.label": "Heiliger Genozid",
-    "religion.tu.holyGenocide.desc": "Und keine Träne wird niederfallen.",
     "religion.tu.holyGenocide.flavor": "Wir leben auf einer stillen Insel der Ignoranz in der mitte des schwarzen Sees der Unendlichkeit und es war nicht beabsichtigt dass wir weit reisen.",
     "religion.tu.singularity.label": "Ereignishorizont",
     "religion.tu.singularity.desc": "Erhöht globale Resourcenlimits um 10%",
@@ -987,12 +977,9 @@
     "resources.zebras.title": "Zebras",
     "resources.sorrow.full": "Schwarzer flüssiger Kummer",
     "resources.sorrow.short": "BLS",
-    "gift.get": "XOXOXO! Die Alten Götter haben dir ein Geschenk geschickt!",
-    "gift.repaire": "Die Alten Götter haben deine Geschenkbox repariert",
     "gift.resources": "{0} {1} erhalten!",
     "gift.apocrypha": "Apokryphen-Bonus um {0}% erhöht!",
     "gift.transcendence": "Transzendenzstufe um 4 erhöht!",
-    "gift.metaphysics": "{0} freigeschaltet!",
     "save.export.msg": "Speicherstand export erfolgreih!",
     "save.import.confirmation.msg": "Sicher? Dein Speicherstand wird überschrieben!",
     "save.import.msg": "Speicherstand import erfolgreich!",
@@ -1325,7 +1312,6 @@
     "time.cfu.ressourceRetrieval.label": "Ressourcen Rückgewinnung",
     "time.cfu.ressourceRetrieval.desc": "Bekomme einen Teil deiner jährlichen Ressourcenproduktion wenn du Zeitkristalle Zerschmetterst",
     "time.cfu.temporalAccelerator.label": "Zeitlicher Beschleuniger",
-    "time.cfu.temporalAccelerator.desc": "Verbessert Fluxgeneration um 5%",
     "time.cfu.temporalBattery.label": "Zeitliche Batterie",
     "time.cfu.temporalBattery.desc": "Erhöht deine Fluxkapazität um 25%",
     "time.cfu.temporalImpedance.label": "Zeit Impedanz",
@@ -1419,8 +1405,6 @@
     "trade.bcoin.crash": "Verärgere die unsichtbare Schwarze Hand",
     "trade.bcoin.crash.desc": "Blackcoin Marktabsturz erzwingen",
     "trade.correct.bcoin": "Es gab eine riesige Krypto-Marktkorrektur",
-    "trade.embassy.open": "Botschaft eröffnen",
-    "trade.embassy": "Botschaft Stufe ({0})",
     "trade.embassy.desc": "Verbessere deine diplomatischen Beziehungen mit dem Errichten einer Botschaft",
     "trade.embassy.pinned": "Angepinnt",
     "trade.embassy.unpinned": "Gelöst",
@@ -1476,7 +1460,6 @@
     "ui.option.hide.bgimage": "Hintergrundbild ausblenden <i>(für Farbschemas sofern zutreffend)</i>",
     "ui.option.tooltips.right": "Tooltips für die rechte Spalte verschieben",
     "ui.option.more": "Mehr...",
-    "ui.option.no.confirm": "Bestätigen Sie nicht, wenn Sie alle Jobs löschen, Richtlinien recherchieren oder alle kaufen oder verkaufen (Umschalt-Klick)",
     "ui.option.iw.smelter": "Schmelzhütten schalten sich bei 95% der maximalen Eisenkapazität im Modus „Eiserner Wille“ ab",
     "ui.option.disable.telemetry": "Spieltelemetrie deaktivieren",
     "ui.option.enable.redshift": "Offlinefortschritt aktivieren",
@@ -1521,7 +1504,6 @@
     "console.filter.ivoryMeteor": "Elfenbeinmeteore",
     "console.filter.unicornRift": "Einhorn Kluft",
     "console.filter.alicornRift": "Alicorn-Risse",
-    "console.filter.tc": "Zeitkristall",
     "console.filter.faith": "Glaube",
     "village.bonus.desc.chemist": "Bonus für chemische Herstellung",
     "village.bonus.desc.engineer": "Herstellungsbonus",
@@ -1758,7 +1740,6 @@
     "workshop.barges.label": "Lastkähne",
     "workshop.barges.desc": "Häfen lagern mehr Kohle",
     "workshop.biofuel.label": "Biofuel processing",
-    "workshop.biofuel.desc": "Biolabs will convert catnip into oil",
     "workshop.bolas.label": "Bolas",
     "workshop.bolas.desc": "Wurfwaffe aus schweren Steingewichten. Deine Jäger sind doppelt so effektiv",
     "workshop.bolas.flavor": "Waffengarn",
@@ -1990,7 +1971,6 @@
     "workshop.spaceEngineers.label": "Weltraumingenieure",
     "workshop.spaceEngineers.desc": "Verbessert Effektivität der Ingenieure",
     "workshop.spaceManufacturing.label": "Weltraumproduktion",
-    "workshop.spaceManufacturing.desc": "Fabriken bieten Weltraumaufzügen und Orbitalen Anordnungen eine Steigerung des Produktionsbonus",
     "workshop.starlink.label": "Starlink",
     "workshop.starlink.desc": "Jedes Datenzentrum gibt einen zusätzlichen 1% bonus für Bio-Labore",
     "workshop.stasisChambers.label": "Stasis-Kammer",
diff --git a/res/i18n/crowdin/el.json b/res/i18n/crowdin/el.json
index e1ae9ee86d..13c4feb33e 100644
--- a/res/i18n/crowdin/el.json
+++ b/res/i18n/crowdin/el.json
@@ -209,7 +209,6 @@
     "buildings.workshop.desc": "Παρέχει μια ποικιλία αναβαθμίσεων. Βελτιώνει την αποτελεσματικότητα των μαστορεμάτων 6%",
     "buildings.workshop.flavor": "Δωρεάν παιχνίδια για τους εργάτες",
     "buildings.zebraForge.label": "Σιδηρουργείο των Ζέβρων",
-    "buildings.zebraForge.desc": "Ξεκλειδώνει το μαστόρεμα για αιματόλιθους και τ-μίθριλ",
     "buildings.zebraOutpost.label": "Φυλάκιο Ζέβρων",
     "buildings.zebraOutpost.desc": "Παρέχει βάση για τις αποστολές κυνηγιού. Κάθε επίπεδο αναβάθμισης βελτιώνει την αποτελεσματικότητα αποστολής 5%",
     "buildings.zebraWorkshop.label": "Βιοτεχνία Ζέβρων",
@@ -258,6 +257,8 @@
     "calendar.year.tooltip": "Έτος:",
     "challendge.panel.label": "Προκλήσεις",
     "challendge.pending": "Εκκρεμεί",
+    "challendge.reclaimReserves.label": "Ανάκτηση αποθεμάτων",
+    "challendge.reclaimReserves.desc": "Ανάκτηση αποθεμάτων από το υπερπέραν",
     "challendge.applyPending.label": "Εφαρμογή Εκκρεμών Αλλαγών ({0})",
     "challendge.applyPending.desc": "Ενεργοποιήστε αμέσως τις Προκλήσεις/Συνθήκες που επισημάνθηκαν ως εκκρεμείς",
     "challendge.1000Years.label": "1000 έτη",
@@ -279,12 +280,9 @@
     "challendge.ironWill.label": "Σιδερένια Θέληση",
     "challendge.ironWill.desc": "Η Σιδερένια Θέληση είναι λίγο κρυμμένη πρόκληση. Δε χρειάζεται να κάνετε κλικ εδώ για να την ενεργοποιήσετε: επαναφέρετε το παιχνίδι και παίξτε χωρίς γατάκια.",
     "challendge.ironWill.effect.desc": "Τίποτα",
-    "challendge.reclaimReserves.label": "Ανάκτηση αποθεμάτων",
-    "challendge.reclaimReserves.desc": "Ανάκτηση αποθεμάτων από το υπερπέραν",
     "challendge.winterIsComing.label": "Ο χειμώνας ήρθε",
     "challendge.winterIsComing.desc": "Επανεκκινήστε το παιχνίδι μόνο με χειμερινές σεζόν. (Το γατόχορτο δεν επωφελείται από τους πόντους επαναφοράς)<br><br>Στόχος: Φτάστε στον Ήλιο.",
     "challendge.winterIsComing.effect.desc": "Οι ζεστές εποχές είναι πιθανότερες και οι ψυχρές λιγότερο πιθανές.",
-    "challendge.btn.chronosphere.desc": " Δε θα κερδίσετε μπόνους επαναφοράς από τις χρονόσφαιρες.",
     "challendge.btn.chronosphere.with.ironWill.desc": " Δε θα κερδίσετε μπόνους επαναφοράς από τις χρονόσφαιρες.<br>ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το μπόνους επαναφοράς από τις χρονόσφαιρες θα απενεργοποιήσει αυτόματα τη Σιδερένια Θέληση.",
     "challendge.btn.confirmation.title": "Επιβεβαίωση πρόκλησης",
     "challendge.btn.confirmation.msg": "Είστε βέβαιοι ότι θέλετε να ξεκινήσετε αυτήν την πρόκληση επαναφέροντας το παιχνίδι;",
@@ -364,8 +362,8 @@
     "effectsMgr.statics.factoryCostReduction.title": "Μείωση του κόστους του εργοστασίου",
     "effectsMgr.statics.factoryRefineRatio.title": "Μπόνους διύλισης εργοστασίου",
     "effectsMgr.statics.faithRatioReligion.title": "Μπόνους Πίστης",
-    "effectsMgr.statics.festivalRatio.title": "Επίδραση Φεστιβάλ",
     "effectsMgr.statics.festivalArrivalRatio.title": "Ρυθμός ανάπτυξης Φεστιβάλ",
+    "effectsMgr.statics.festivalRatio.title": "Επίδραση Φεστιβάλ",
     "effectsMgr.statics.globalResourceRatio.title": "Μέγιστο μπόνους πόρων",
     "effectsMgr.statics.goldMaxRatio.title": "Μέγιστο μπόνους χρυσού",
     "effectsMgr.statics.happiness.title": "Ευτυχία",
@@ -374,7 +372,6 @@
     "effectsMgr.statics.heatMax.title": "Μέγιστη θερμοκρασία",
     "effectsMgr.statics.heatMaxExpansion.title": "Μέγιστη επέκταση θερμότητας",
     "effectsMgr.statics.hrHarvester-energyProduction.title": "Συγκομιδή A.X. - Παραγωγή ενέργειας",
-    "effectsMgr.statics.luxuryConsuptionReduction.title": "Μείωση της κατανάλωσης σπάνιων πόρων",
     "effectsMgr.statics.luxuryHappinessBonus.title": "Μπόνους ευτυχίας από σπάνιους πόρους",
     "effectsMgr.statics.maxKittens.title": "Γατάκια",
     "effectsMgr.statics.moonOutpost-unobtainiumPerTickSpace.title": "Φυλάκιο Φεγγαριού - Μετατροπή Ανομπτένιουμ",
@@ -415,7 +412,6 @@
     "policy.openWoodlands.label": "Ανοιχτές Δασικές Εκτάσεις",
     "policy.openWoodlands.desc": "Επιτρέψτε κάποια ανάπτυξη των κοντινών εδαφών, αυξάνοντας την παραγωγή ξύλου και ορυκτών.",
     "policy.spaceBasedTerraforming.label": "Διαστημική εδαφομορφοποίηση",
-    "policy.stoicism.desc": "Οι στωικοί διδάσκουν ότι πρέπει να υποστούμε ταλαιπωρίες χωρίς παράπονα. -50% στην κατανάλωση σπάνιων πόρων.",
     "policy.stripMining.label": "Αποψίλωση",
     "policy.stripMining.desc": "Αποψιλώστε τα βουνά για να βελτιώσετε την παραγωγή ορυκτών.",
     "policy.sustainability.desc": "Ξεκινήστε να παίρνετε τις συμβουλές των περιβαλλοντολόγων, αφαιρώντας το πρόστιμο ευτυχίας από τη εξόρυξη/αποψίλωση, βελτιώνοντας το βιώσιμο μέλλον.",
@@ -513,7 +509,6 @@
     "space.terminusMission.desc": "Ο Τέρμινους είναι ένας γίγαντας πάγου στο άκρο του ηλιακού συστήματος Χίλιος.",
     "tab.name.workshop": "Βιοτεχνία",
     "time.cfu.blastFurnace.desc": "Λειτουργεί με χρονοθερμότητα. Αυξάνει το μέγιστο όριο θερμότητας κατά 100.",
-    "time.cfu.temporalAccelerator.desc": "Βελτιώνει τη ροή παραγωγής ενέργειας ροής 5%",
     "time.cfu.temporalBattery.desc": "Βελτιώνει την ικανότητα ροής ενέργειας 25%",
     "time.shatter.tc.desc": "Καταστρέψτε χρονοκρυστάλλους και απελευθερώστε την αποθηκευμένη ενέργεια χρόνου.<br> Θα μεταφερθείτε ένα χρόνο στο μέλλον. Η τιμή μπορεί να αυξηθεί με την πάροδο του χρόνου.",
     "time.tc.shatter": "Απελευθερώθηκε ενέργεια χρόνου, παραλείφθηκαν {0} χρόνια",
@@ -521,8 +516,6 @@
     "time.vsu.voidHoover.desc": "Αυξήστε το μέγιστο κενό που αποκτάται ανά ημέρα κατά τη διάρκεια του Χρονικού Παράδοξου",
     "time.vsu.voidRift.desc": "Αύξηση του μέγιστου αποθηκευτικού χώρου 2%",
     "trade.leviathans.energy": "Ενέργεια: ",
-    "trade.embassy.open": "Πρεσβεία χωρίς σύνορα",
-    "trade.embassy": "Επίπεδο πρεσβείας ({0})",
     "trade.embassy.desc": "Βελτιώστε τις διπλωματικές σας σχέσεις εγκαθιδρύοντας μία πρεσβεία",
     "trade.embassy.pinned": "Καρφιτσωμένο",
     "trade.embassy.unpinned": "Ξεκαρφιτσωμένο",
@@ -630,7 +623,6 @@
     "workshop.reactorVessel.desc": "Κάθε αντιδραστήρας βελτιώνει το δυναμικό του πλοίου 5%",
     "workshop.reinforcedBarns.desc": "80% περισσότερος αποθηκευτικός χώρος ξύλο και σίδερο",
     "workshop.relicStation.desc": "Προσθέστε στους Φάρους Διαστήματος ερευνητικούς σταθμούς Κειμηλίων. Κάθε Φάρος Διαστήματος παράγει 0,01 Κειμήλια την ημέρα",
-    "workshop.spaceManufacturing.desc": "Τα εργοστάσια παρέχουν μπόνους στα Ασανσέρ Διαστήματος και στις Τροχιακές Συστοιχίες",
     "workshop.steelAxe.desc": "Πολύ αιχμηρά και ανθεκτικά τσεκούρια. 50% αποτελεσματικότεροι Ξυλοκόποι",
     "workshop.stoneBarns.desc": "75% περισσότερος αποθηκευτικός χώρος για ξύλο και σίδερο",
     "workshop.thoriumReactors.label": "Αντιδραστήρες Θορίου",
diff --git a/res/i18n/crowdin/eo.json b/res/i18n/crowdin/eo.json
index ec42d3e448..1b94688d1a 100644
--- a/res/i18n/crowdin/eo.json
+++ b/res/i18n/crowdin/eo.json
@@ -274,7 +274,6 @@
     "policy.knowledgeSharing.desc": "Viaj sciencistoj vojaĝos fremdajn landojn, preskaŭe pliigos sciencan elproduktadon.",
     "policy.liberalism.label": "Liberalismo",
     "policy.liberty.label": "Libereco",
-    "policy.liberty.desc": "Bono por larĝaj disvastiĝaj socioj. Duonigos popolajn punojn. Tio afektos kiojn politikojn ebliĝantajn estonte!",
     "policy.militarizeSpace.label": "Militigi Kosmon",
     "policy.monarchy.label": "Monarĥio",
     "policy.openWoodlands.label": "Malfermaj Lignlandoj",
@@ -284,7 +283,6 @@
     "policy.stripMining.label": "Stria Minado",
     "policy.theocracy.label": "Ordo de la Steloj",
     "policy.tradition.label": "Tradicio",
-    "policy.tradition.desc": "Good for culture-oriented societies. Reduces manuscript price and increases their effect. This will affect what policies are available in the future!",
     "policy.transkittenism.label": "Transkatetismo",
     "prestige.panel.label": "Metafiziko",
     "prestige.ascoh.label": "SKDĈ",
@@ -362,7 +360,6 @@
     "resources.sorrow.full": "Nigra likva ploro",
     "resources.sorrow.short": "NLP",
     "gift.resources": "Atingis {0} {1}'(j)n!",
-    "gift.metaphysics": "Malŝlosita {0}!",
     "save.export.msg": "Konservo alŝutado sukcesa!",
     "save.import.confirmation.msg": "Ĉu vi certas? Tio ago skribos sur vian konservon!",
     "save.import.msg": "Konservo elŝutado sukcesa!",
@@ -422,7 +419,6 @@
     "tab.name.trade": "Tradi",
     "tab.name.workshop": "Designejo",
     "time.AccelerateTimeBtn.desc": "Akceli kaj malrapidigi tempon dum via volo (+50% pli rapido)",
-    "time.cfu.temporalAccelerator.desc": "Plibonigos tempaj efektivoj per 5%",
     "time.reset.title": "Rekomenciĝi",
     "time.reset.zebra": "Zebraj Ĉasistoj",
     "trade.attitude.friendly": "amikaj",
@@ -496,7 +492,6 @@
     "console.filter.trade": "Tradoj",
     "console.filter.meteor": "Falitsteloj",
     "console.filter.ivoryMeteor": "Eburaj Falitsteloj",
-    "console.filter.tc": "Tempaj Kristaloj",
     "village.bonus.desc.engineer": "Designada plibonigo",
     "village.bonus.desc.manager": "Ĉasa pliigo",
     "village.bonus.desc.merchant": "Tradada plibonigo",
diff --git a/res/i18n/crowdin/es.json b/res/i18n/crowdin/es.json
index 15d0d20dcc..53f348ce04 100644
--- a/res/i18n/crowdin/es.json
+++ b/res/i18n/crowdin/es.json
@@ -1,9 +1,9 @@
 {
-    "console.intro": "Eres un gatito en un bosque de hierba gatera.",
+    "console.intro": "Eres un gatito en un bosque de gavilán",
     "console.intro.zebra": "Eres una cebra en una sabana llena de minas de titanio.",
     "achievements.header": "Logros: {0} de {1}",
-    "achievements.msg.unlock": "Logro desbloqueado: ¡{0}!",
-    "achievements.msg.starUnlock": "Estrella de logro desbloqueada: ¡{0}!",
+    "achievements.msg.unlock": "Logro desbloqueado: {0}!",
+    "achievements.msg.starUnlock": "Estrella de logro desbloqueada: {0}!",
     "achievements.anachronox.title": "Anachronox",
     "achievements.anachronox.desc": "Por favor, pare",
     "achievements.atlasUnmeowed.title": "Atlas sin Miau",
@@ -16,7 +16,7 @@
     "achievements.heartOfDarkness.title": "Corazón de la oscuridad",
     "achievements.heartOfDarkness.desc": "Conviértete en el jefe de una tribu de Zebras. (¿Cómo es esto posible?)",
     "achievements.hundredYearsSolitude.title": "Cien años de soledad",
-    "achievements.hundredYearsSolitude.desc": "¿Cuán lejos es demasiado lejos?",
+    "achievements.hundredYearsSolitude.desc": "¿Qué tan lejos es demasiado lejos?",
     "achievements.ironWill.title": "Voluntad de hierro",
     "achievements.ironWill.desc": "Realmente te lo mereces",
     "achievements.jupiterAscending.title": "Júpiter ascendiendo",
@@ -34,9 +34,9 @@
     "achievements.shadowOfTheColossus.desc": "Construye un Ziggurat teniendo solo un gatito",
     "achievements.sinsOfEmpire.title": "Pecados de un Imperio Solar",
     "achievements.sinsOfEmpire.desc": "Espera, ¿en serio?",
-    "achievements.soilUptuned.title": "Campos roturados",
-    "achievements.soilUptuned.desc": "Ten 45 pasturas en modo Voluntad de hierro",
-    "achievements.spaceOddity.title": "Rareza espacial",
+    "achievements.soilUptuned.title": "Tierras vírgenes vueltas hacia arriba",
+    "achievements.soilUptuned.desc": "Tener 45 pasturas en modo Voluntad de hierro",
+    "achievements.spaceOddity.title": "Singularidad Espacial",
     "achievements.spaceOddity.desc": "Completa un programa lunar en modo Voluntad de hierro",
     "achievements.spaceOddity.starDesc": "Obtener el programa de la luna en IW sin ningún punto de parangón",
     "achievements.sunGod.title": "Dios Sol",
@@ -49,95 +49,95 @@
     "achievements.theElderLegacy.desc": "Sé el primer jugador en probar Kittens Game Móvil",
     "achievements.uberkatzhen.title": "Uberkatzchen",
     "achievements.uberkatzhen.desc": "Lo que no te mata te hace más fuerte",
-    "achievements.uniception.title": "El uniorigen",
-    "achievements.uniception.desc": "Descubre la conspiración dentro de la conspiración",
-    "achievements.unicornConspiracy.title": "Uniconspiración",
-    "achievements.unicornConspiracy.desc": "¡Desvela la conspiración de los unicornios!",
+    "achievements.uniception.title": "Unicepción",
+    "achievements.uniception.desc": "Encuentra la conspiración dentro de la conspiración",
+    "achievements.unicornConspiracy.title": "Conspiración de unicornios",
+    "achievements.unicornConspiracy.desc": "¡Levanta la mortaja de la conspiración Unicornio!",
     "achievements.utopiaProject.title": "Proyecto Utopía",
-    "achievements.utopiaProject.desc": "Obtén una felicidad total de más de 150 %",
-    "achievements.utopiaProject.starDesc": "Obtén una felicidad todal de más de 500 %",
-    "achievements.winterIsComing.title": "El invierno se acerca",
-    "achievements.winterIsComing.desc": "Deja morir a 10 gatitos",
-    "achievements.youMonster.title": "Cómo pudiste",
-    "achievements.youMonster.desc": "Pobres gatitos.",
-    "ai.apocalypse.msg": "IA ha destruido el {0} % de tus recursos",
-    "bld.msg.automation": "Activando automatización del taller",
-    "bld.msg.automation.beams": "Gastaste {0} maderas, ¡vigas +{1}!",
-    "bld.msg.automation.plates": "Gastaste {0} hierros, ¡placas +{1}!",
-    "bld.msg.automation.skip": "Omitiendo automatización del taller...",
-    "bld.msg.automation.slabs": "Gastaste {0} minerales, ¡losas +{1}!",
-    "btn.all": "Todo",
-    "btn.all.minor": "todo",
+    "achievements.utopiaProject.desc": "Obtenga una felicidad total de más del 150%",
+    "achievements.utopiaProject.starDesc": "Obtenga una felicidad total de más del 500%",
+    "achievements.winterIsComing.title": "Se acerca el invierno",
+    "achievements.winterIsComing.desc": "Muere 10 gatitos",
+    "achievements.youMonster.title": "Tú, monstruo",
+    "achievements.youMonster.desc": "Pobres gatitos",
+    "ai.apocalypse.msg": "AI ha destruido {0}% de tus recursos",
+    "bld.msg.automation": "Activación de la automatización del taller",
+    "bld.msg.automation.beams": "¡Gastado {0} madera, + {1} vigas!",
+    "bld.msg.automation.plates": "¡Gastado {0} planchas de hierro, + {1}!",
+    "bld.msg.automation.skip": "Saltarse la automatización del taller ...",
+    "bld.msg.automation.slabs": "¡Gastado {0} minerales, + {1} losas!",
+    "btn.all": "Todos",
+    "btn.all.minor": "todos",
     "btn.all.assign": "[+todo]",
-    "btn.all.unassign": "[-all]",
+    "btn.all.unassign": "[-todo]",
     "btn.aoff.tooltip": "Automatización desactivada",
-    "btn.aon.tooltip": "Automatización habilitada",
+    "btn.aon.tooltip": "Automatización activada",
     "btn.build": "Construir",
     "btn.challenge": "Iniciar desafío",
-    "btn.complete": "(terminado)",
-    "btn.complete.capital": "(Terminado)",
-    "btn.craft": "Fabricar",
+    "btn.complete": "(completo)",
+    "btn.complete.capital": "(Completo)",
+    "btn.craft": "Artesanía",
     "btn.feed": "Alimentar",
-    "btn.fix.cryo": "Reparar criocámara",
+    "btn.fix.cryo": "Reparar Criocámara",
     "btn.leader": "Líder",
     "btn.nextPage": "Página siguiente",
     "btn.off.minor": "apagado",
     "btn.off.tooltip": "Edificio desactivado",
     "btn.on.minor": "encendido",
-    "btn.on.tooltip": "Edificio habilitado",
-    "btn.precraft": "Prefabricar",
+    "btn.on.tooltip": "Edificio activado",
+    "btn.precraft": "Precraftear",
     "btn.prevPage": "Página anterior",
     "btn.promote": "Promover",
-    "btn.refine": "Refinar",
-    "btn.research": "Investigar",
+    "btn.refine": "Refineria",
+    "btn.research": "Investigación",
     "btn.reset": "Restablecer",
     "btn.sell": "Vender",
     "btn.sell.minor": "vender",
-    "btn.trade": "Cambiar",
+    "btn.trade": "Comercio",
     "btn.blocked.capital": "(Bloqueado)",
-    "sell.all.confirmation.msg": "¿Seguro que quieres vender todo?",
+    "sell.all.confirmation.msg": "¿Estás seguro de que quieres vender todo?",
     "construct.all.confirmation.title": "Construir todo",
-    "construct.all.confirmation.msg": "¿Seguro que quieres construir todos los edificios?",
+    "construct.all.confirmation.msg": "¿Estás seguro de que deseas construir todos los edificios?",
     "construct.all.msg": "{0} x{1} construido.",
     "buildings.academy.label": "Academia",
-    "buildings.academy.desc": "Mejora tu tasa de investigación y la velocidad de crecimiento de las habilidades de tus gatitos. Cada nivel de mejora aumenta tu producción científica en un 20 %",
-    "buildings.academy.flavor": "La curiosidad es la base de la ciencia. Sus felinas muertes fueron nobles",
+    "buildings.academy.desc": "Mejora tu ratio de investigación y la velocidad de crecimiento de tus habilidades con los gatitos. Cada nivel de mejora mejora tu producción científica en un 20%",
+    "buildings.academy.flavor": "La curiosidad es la base de la ciencia. Nuestros gatos murieron noblemente",
     "buildings.accelerator.label": "Acelerador",
-    "buildings.accelerator.desc": "Convierte titanio en uranio",
-    "buildings.accelerator.flavor": "Gran Colisionador de Gatrones",
+    "buildings.accelerator.desc": "Convierte titanio en uranio (sic)",
+    "buildings.accelerator.flavor": "Gran Colisionador Catron",
     "buildings.aicore.label": "Núcleo de IA",
-    "buildings.aicore.desc": "FelinOS, una inteligencia artificial de última generación. Absolutamente inofensiva. Cada nivel de mejora aumenta el consumo de energía del núcleo en un 75 %.",
-    "buildings.aicore.flavor": "Es hora de hacer a un lado nuestras diferencias, prrrrr la ciencia.",
+    "buildings.aicore.desc": "FelineOS, una inteligencia artificial de última generación. Absolutamente inofensivo. Cada nivel de actualización aumentará el consumo de energía central en un 75%",
+    "buildings.aicore.flavor": "Es hora de poner nuestras diferencias a un lado para la ciencia",
     "buildings.aicore.attemptsell": "Acceso denegado.",
     "buildings.amphitheatre.label": "Anfiteatro",
-    "buildings.amphitheatre.desc": "Reduce los efectos negativos de la sobrepoblación en un 5 %. El efecto es acumulativo, pero sus beneficios serán cada vez menores. Genera cultura.",
-    "buildings.amphitheatre.flavor": "Proyectando \"Todos los perros van al cielo\" de lunes a domingo",
+    "buildings.amphitheatre.desc": "Reduce los efectos negativos de la superpoblación en un 5%. Este efecto se acumula pero tiene un rendimiento decreciente. Produce cultura",
+    "buildings.amphitheatre.flavor": "Todos los días 'Todos los perros van a las exhibiciones del cielo'",
     "buildings.aqueduct.label": "Acueducto",
-    "buildings.aqueduct.desc": "+3 % en producción de hierba gatera",
-    "buildings.aqueduct.flavor": "Prohibido nadar",
+    "buildings.aqueduct.desc": "+ 3% a la producción de catnip",
+    "buildings.aqueduct.flavor": "No nadar",
     "buildings.barn.label": "Granero",
-    "buildings.barn.desc": "Proporciona un espacio para almacenar tus recursos.",
+    "buildings.barn.desc": "Proporciona un espacio para almacenar sus recursos.",
     "buildings.barn.flavor": "¡Las ratas no son un problema para nosotros!",
-    "buildings.biolab.label": "Lab. biológico",
-    "buildings.biolab.desc": "Mejora la efectividad del refinamiento de hierba gatera en un 10 %. Potenciado es aún más efectivo.",
-    "buildings.biolab.flavor": "Nuevos puestos de posdoctorado disponibles.",
+    "buildings.biolab.label": "Laboratorio biológico",
+    "buildings.biolab.desc": "Mejora la efectividad del refinamiento de catnip en un 10%. Más eficaz si está alimentado.",
+    "buildings.biolab.flavor": "Nuevas posiciones postdoctorado disponibles.",
     "buildings.broadcasttower.label": "Torre de transmisión",
-    "buildings.broadcasttower.desc": "Genera cultura y felicidad. Con una alta producción energética es aún más efectiva.",
-    "buildings.calciner.label": "Horno de calcinación",
-    "buildings.calciner.desc": "Una fuente muy efectiva de metal. Consume 1,5 minerales y 0,02 petróleo por punto. Produce hierro y algo de titanio",
+    "buildings.broadcasttower.desc": "Genera cultura y felicidad. Más efectivo con producción de alta energía",
+    "buildings.calciner.label": "Calcinador",
+    "buildings.calciner.desc": "Una fuente de metal muy efectiva. Consume 1,5 minerales y 0,02 de aceite por tick. Produce hierro y una pequeña cantidad de titanio",
     "buildings.chapel.label": "Capilla",
-    "buildings.chapel.desc": "Genera algo de cultura y fe por punto. Puede perfeccionarse con mejoras religiosas",
-    "buildings.chronosphere.label": "Cronósfera",
-    "buildings.chronosphere.desc": "Reubica una pequeña cantidad de recursos a través del tiempo. Se puede mejorar. Cada cronósfera aumenta las posibilidades de paradoja temporal.",
+    "buildings.chapel.desc": "Produce un poco de cultura y fe por tick. Puede mejorarse con actualizaciones religiosas",
+    "buildings.chronosphere.label": "Cronoesfera",
+    "buildings.chronosphere.desc": "Reubica una pequeña cantidad de recursos a través del tiempo. Se puede actualizar aún más. Cada Cronoesfera aumenta las posibilidades de Paradoja Temporal",
     "buildings.dataCenter.label": "Centro de datos",
-    "buildings.dataCenter.desc": "Aumenta el efecto total de los compedios en tu ciencia máxima",
+    "buildings.dataCenter.desc": "Incremento total del efecto del compendio en tu almacén máximo de ciencia",
     "buildings.factory.label": "Fábrica",
-    "buildings.factory.desc": "Mejora la efectividad de lo que fabriques",
-    "buildings.field.label": "Campo de hierba gatera",
-    "buildings.field.desc": "Planta algo de hierba gatera para que crezca en la aldea. Los campos tienen +50 % de producción en primavera y -75 % de producción en invierno",
-    "buildings.field.flavor": "Hierba gatera hasta donde llega la vista.",
-    "buildings.gatherCatnip.label": "Recolectar hierba gatera",
-    "buildings.gatherCatnip.desc": "Recolecta hierba gatera en el bosque",
+    "buildings.factory.desc": "Mejora la efectividad de las artesanías",
+    "buildings.field.label": "Campo de Catnip",
+    "buildings.field.desc": "Planta algo de catnip para crecer en la aldea. Los campos tienen una producción de +50% en primavera y -75% de producción en invierno",
+    "buildings.field.flavor": "'Catnip hasta donde alcanza la vista.",
+    "buildings.gatherCatnip.label": "Reunir catnip",
+    "buildings.gatherCatnip.desc": "Recoge un catnip en el bosque",
     "buildings.harbor.label": "Puerto",
     "buildings.harbor.desc": "Proporciona un espacio para almacenar sus recursos",
     "buildings.harbor.flavor": "¡Ahoy, marineros!",
@@ -158,22 +158,22 @@
     "buildings.magneto.label": "Magneto",
     "buildings.magneto.desc": "Mejora tu producción total de recursos en un 2%. Cada Steamworks aumentará este efecto en un 15%. Consume petróleo.",
     "buildings.mansion.label": "Mansión",
-    "buildings.mansion.desc": "Una espaciosa mansión (cabe 1 gatito)",
-    "buildings.mansion.flavor": "El mejor contenedor disponible",
+    "buildings.mansion.desc": "Una mansión espaciosa (cada una tiene un espacio para 1 gatito)",
+    "buildings.mansion.flavor": "El mejor contenedor de envío disponible",
     "buildings.mine.label": "Mina",
-    "buildings.mine.desc": "Desbloquea el trabajo: minero. Cada nivel de mejora aumenta tu producción de mineral en 20 %",
-    "buildings.mine.flavor": "Los gatitos no le temen a la oscuridad",
-    "buildings.mint.label": "Casa de Moneda",
-    "buildings.mint.desc": "Produce recursos de lujo proporcionales a tu fuerza felina. Consume fuerza felina y algo de oro.",
+    "buildings.mine.desc": "Desbloquea el trabajo de minero. Cada nivel mejora tu producción de mineral en un 20%",
+    "buildings.mine.flavor": "100 días sin diggor mortis",
+    "buildings.mint.label": "Casa de la moneda",
+    "buildings.mint.desc": "Produce recursos de lujo proporcionales a su potencia máxima de transmisión. Consume potencia y un poco de oro",
     "buildings.observatory.label": "Observatorio",
-    "buildings.observatory.desc": "Aumenta la probabilidad de eventos astronómicos en 0,2 %",
-    "buildings.observatory.flavor": "Para algún día atrapar esa hadita de luz roja",
-    "buildings.oilWell.label": "Pozo petrolero",
-    "buildings.oilWell.desc": "Produce algo de petróleo y aumenta en 1500 el límite máximo de petróleo",
-    "buildings.oilWell.flavor": "Levantarse temprano, trabajar hasta tarde y encontrar petróleo.",
-    "buildings.pasture.label": "Pastizal",
-    "buildings.pasture.desc": "Proporciona una fuente de alimento alternativa que reduce el consumo de hierba gatera.",
-    "buildings.pasture.flavor": "¡Tómese una pinta de leche, señor!",
+    "buildings.observatory.desc": "Aumenta las posibilidades de eventos astronómicos en 0.2%",
+    "buildings.observatory.flavor": "Anhelando un día atrapar al hada de luz roja",
+    "buildings.oilWell.label": "Pozo de petróleo",
+    "buildings.oilWell.desc": "Produce un poco de aceite, +1500 al límite máximo de aceite",
+    "buildings.oilWell.flavor": "Levántese temprano, trabaje duro, golpee el petróleo",
+    "buildings.pasture.label": "Pasto",
+    "buildings.pasture.desc": "Proporciona una fuente alternativa de alimentos, que reduce el consumo de catnip",
+    "buildings.pasture.flavor": "¡Toma una pinta de leche, señor!",
     "buildings.quarry.label": "Cantera",
     "buildings.quarry.desc": "Las canteras mejoran su eficiencia minera en un 35% y producen un poco de carbón",
     "buildings.quarry.flavor": "¡Está lleno de ratones! Espera, 'cantera' equivocada",
diff --git a/res/i18n/crowdin/he.json b/res/i18n/crowdin/he.json
index ab5e3445c2..d872bcf603 100644
--- a/res/i18n/crowdin/he.json
+++ b/res/i18n/crowdin/he.json
@@ -208,7 +208,6 @@
     "buildings.workshop.desc": "מספק מגוון רחב של שדרוגים. משפר יעילות מלאכה ב6%",
     "buildings.workshop.flavor": "צעצועים בחינם לעובדים",
     "buildings.zebraForge.label": "מפחת זברות",
-    "buildings.zebraForge.desc": "מאפשר יצירת אבני דם וט-מיתריל",
     "buildings.zebraOutpost.label": "מוצב זברות",
     "buildings.zebraOutpost.desc": "משמש כבסיס למשלחות ציד. כל שלב משפר את יעילות המשלחת ב5%",
     "buildings.zebraWorkshop.label": "סדנת זברות",
@@ -257,6 +256,8 @@
     "calendar.year.tooltip": "שנה:",
     "challendge.panel.label": "אתגרים",
     "challendge.pending": "ממתינים",
+    "challendge.reclaimReserves.label": "אסוף מצבורים",
+    "challendge.reclaimReserves.desc": "אסוף מצבורים מהעולם הבא",
     "challendge.applyPending.label": "החל שינויים ממתינים ({0})",
     "challendge.applyPending.desc": "הפעל מיידית אתגרים/תנאים המסומנים כממתינים",
     "challendge.1000Years.label": "1000 שנים",
@@ -278,12 +279,9 @@
     "challendge.ironWill.label": "רצון ברזך",
     "challendge.ironWill.desc": "רצון ברזל הוא מעין אתגר חבוי ואין צורך ללחוץ כאן כדי לאפשרו: אתחל את המשחק ושחק ללא חתלתולים.",
     "challendge.ironWill.effect.desc": "כלום",
-    "challendge.reclaimReserves.label": "אסוף מצבורים",
-    "challendge.reclaimReserves.desc": "אסוף מצבורים מהעולם הבא",
     "challendge.winterIsComing.label": "החורף מגיע",
     "challendge.winterIsComing.desc": "אתחל את המשק עם חורף כהעונה היחידה. (מופת לא תיטיב ייצור נפית.)<br><br>מטרה: הגעה להליוס.",
     "challendge.winterIsComing.effect.desc": "עונות חמימות יהיו תדירות יותר, ועונות קרות תדירות פחות.",
-    "challendge.btn.chronosphere.desc": " לא תשיג תוספת אתחול מגלגלי הזמן.",
     "challendge.btn.chronosphere.with.ironWill.desc": " לא תשיג תוספת אתחול מגלגלי הזמן.<br>*אזהרה*: תוספת האתחול מגלגלי הזמן יבטלו אוטומטית את ר\"ב.",
     "challendge.btn.confirmation.title": "אישור אתגר",
     "challendge.btn.confirmation.msg": "האם אתה בטוח שאתה רוצה להתחיל אתגר זה על ידי אתחול המשחק?",
@@ -424,8 +422,6 @@
     "policy.openWoodlands.label": "יערות משגשגים",
     "policy.openWoodlands.desc": "מאפשר פיתוח מוגבל של אדמות, יגדיל את ייצור העץ והמינרלים.",
     "policy.republic.desc": "מיטיב עבור חברות גדולות. מנהיגתלתולים בדרגות גבוהות ייטיבו את תפוקתם של כלל החתלתולים.",
-    "policy.stoicism.desc": "הסטואים מלמדים שעלינו לנשוא קשיים ללא תלונה. חוצה את הצריכה של משאבי יוקרה.",
-    "policy.tradition.desc": "טוב לחברות קטנות המבוססות על תרבות. מוריד את המחיר של כתבי יד ומשפר את השפעתם. ישפיע על אילו מדינויות יתאפשרו בעתיד!",
     "policy.transkittenism.label": "טרנסתוליות",
     "policy.transkittenism.desc": "וותר על חתוליות והתאחד עם ה-AI. ליבות AI יהיו יעילות כפליים, ולא ולרמת AI לא תהיה מגרעה.",
     "policy.zebraRelationsAppeasement.desc": "נסה לחבור על הזברות, למרות שהן שונאות אותך. תנאי השחר יהיו פחות קשוחים, אבל הכנסת הזהב תונמך במעט.",
@@ -465,7 +461,6 @@
     "religion.sacrificeBtn.label": "הקרב חדי קרן",
     "religion.sacrificeBtn.desc": "מחזיר חדי קרן למימד חדי הקרן. תקבל דמעת חד קרן אחת עבור כל זיקורת שברשותך.",
     "religion.sacrificeBtn.sacrifice.msg": "הוקרבו {0} חדי קרן. השגת {1} דמעות חדי קרן!",
-    "religion.transcend.confirmation.msg": "האם אתה בטוח שאתה רוצה לאבד חלק מהגילוי שלך?\n\nאתה תוכל להגיע לרמות עילוי מיוחדות על ידי הקרבת חלק מהגילוי שלך. \n\nכל רמה תשפר את יעילות המרת השבח (הערץ את הכוכבים).\n\nכל רמה צורכת כמות הקרבה גדלה יחסית של שבח.\n\nתוספת זו נערמת ועוברת בין אתחולים.\n\n*ללחוץ על כפתור זה ימחק חלק מהשבח שלך ויעילות הילול*.",
     "religion.tu.blackCore.desc": "הטה והשחת קלות את חוקי המציאות עצמה.<br>כל רמה של ליבה שחורה תעלה את תקרת הצנ\"ש ב1%.",
     "religion.tu.blackCore.flavor": "עשוי מעצמותיהן של חתלתולים שהוקרבו.",
     "religion.tu.blackNexus.desc": "משפר את קצב זיקוק גבישי הזמן לשרידים.<br>כל כל קשר שחור יגדיל את יעילות זיקוק השרידים ככמות פירמידות השחור.<br>השפעה זו גם תגדיל את יעילותן של תחנות השרידים",
@@ -564,7 +559,6 @@
     "stats.unicorns": "חדי קרן שהוקרבו",
     "tab.name.trade": "סחר",
     "tab.name.workshop": "סדנא",
-    "time.cfu.temporalAccelerator.desc": "משפר ייצור שצף אנרגיה ב-5%",
     "time.cfu.temporalBattery.desc": "משפר את קיבולת אנרגיית השצף ב-25%",
     "time.chronoheat": "חום זמני מיוצר על ידי שבירת גביש הזמן ויפחת לאורך זמן. כל יחידת חום מעל הגבול תגדיל את מחיר שבירת גבישי הזמן ב1%<br>",
     "time.fixCryochambers.label": "תקן תאי קריו",
@@ -635,7 +629,6 @@
     "console.filter.workshopAutomation": "אוטומציית סדנה",
     "console.filter.unicornRift": "קרעי חדי קרן",
     "console.filter.alicornRift": "קרעי מכונפי קרן",
-    "console.filter.tc": "גבישי זמן",
     "village.bonus.desc.chemist": "הטבת ייצור כימי",
     "village.bonus.desc.engineer": "הטבת ייצור",
     "village.bonus.desc.manager": "הטבת ציד",
@@ -771,7 +764,6 @@
     "workshop.astrophysicists.desc": "כל מלומד עכשיו ייצר מפות כוכבים.",
     "workshop.automatedPlants.desc": "מפעלי פלדה משופרים ב-25% מיחס היצירה",
     "workshop.biofuel.label": "עיבוד דלק ביולוגי",
-    "workshop.biofuel.desc": "מעבדות ימירו נפית לנפט",
     "workshop.cadSystems.desc": "כל הבניינים המדעיים ישפרו את יעילות יצירת תרשימים",
     "workshop.caravanserai.desc": "לתחנות הסחר תהיה השפעה קטנה על מעמד בין המינים",
     "workshop.cargoShips.desc": "כל ספינה תוסיף 1% לקיבלת המספנות",
diff --git a/res/i18n/crowdin/it.json b/res/i18n/crowdin/it.json
index 15df7665e6..1bee6df73b 100644
--- a/res/i18n/crowdin/it.json
+++ b/res/i18n/crowdin/it.json
@@ -209,7 +209,6 @@
     "buildings.workshop.desc": "Fornisce una grande varietà di potenziamenti. Aumenta l'efficacia di creazione del 6%",
     "buildings.workshop.flavor": "Giocattoli gratis per i dipendenti",
     "buildings.zebraForge.label": "Fucina delle zebre",
-    "buildings.zebraForge.desc": "Sblocca la produzione di eliotropio e t-mythril",
     "buildings.zebraOutpost.label": "Avamposto delle zebre",
     "buildings.zebraOutpost.desc": "Fornisce una base per le spedizioni di caccia. Ogni livello di potenziamento migliora l' efficacia delle spedizioni del 5%",
     "buildings.zebraWorkshop.label": "Officina delle zebre",
@@ -258,6 +257,8 @@
     "calendar.year.tooltip": "Anno:",
     "challendge.panel.label": "Sfide",
     "challendge.pending": "In attesa",
+    "challendge.reclaimReserves.label": "Recupera le risorse",
+    "challendge.reclaimReserves.desc": "Recupera le risorse dall'aldilà",
     "challendge.applyPending.label": "Applica Modifiche in sospeso ({0})",
     "challendge.applyPending.desc": "Attiva Sfide/Condizioni contrassegnate come in sospeso immediatamente",
     "challendge.1000Years.label": "1000 anni",
@@ -279,12 +280,9 @@
     "challendge.ironWill.label": "Volontà Ferrea",
     "challendge.ironWill.desc": "Iron Will è una sfida un po' nascosta e non c'è bisogno di cliccare qui per attivarlo: resetta il gioco e gioca senza gattini.",
     "challendge.ironWill.effect.desc": "Niente",
-    "challendge.reclaimReserves.label": "Recupera le risorse",
-    "challendge.reclaimReserves.desc": "Recupera le risorse dall'aldilà",
     "challendge.winterIsComing.label": "L'inverno è arrivato",
     "challendge.winterIsComing.desc": "Ricomincia il gioco con solo stagioni invernali (i punti paragon non influiranno sulla produzione d'erba gatta).<br><br>Obiettivo: raggiungi Helios.",
     "challendge.winterIsComing.effect.desc": "Le stagioni calde sono più frequenti, quelle fredde più rare.",
-    "challendge.btn.chronosphere.desc": " Non otterrai un bonus di nuovo inizio dalle cronosfere.",
     "challendge.btn.chronosphere.with.ironWill.desc": " Non otterrai un bonus di nuovo inizio dalle cronosfere.<br>ATTENZIONE: il bonus dalle cronosfere disattiverà automaticamente la Volontà Ferrea.",
     "challendge.btn.confirmation.title": "Conferma la sfida",
     "challendge.btn.confirmation.msg": "Sei sicuro di voler iniziare questa sfida ripristinando il gioco?",
@@ -367,8 +365,8 @@
     "effectsMgr.statics.factoryCostReduction.title": "Riduzione del costo delle fabbriche",
     "effectsMgr.statics.factoryRefineRatio.title": "Bonus raffinazione fabbrica",
     "effectsMgr.statics.faithRatioReligion.title": "Bonus fede",
-    "effectsMgr.statics.festivalRatio.title": "Effetti del Festival",
     "effectsMgr.statics.festivalArrivalRatio.title": "Tasso di crescita del festival",
+    "effectsMgr.statics.festivalRatio.title": "Effetti del Festival",
     "effectsMgr.statics.gflopsConsumption.title": "Conversione GFlops",
     "effectsMgr.statics.globalRelationsBonus.title": "Bonus Relazioni",
     "effectsMgr.statics.globalResourceRatio.title": "Bonus risorse massime",
@@ -398,7 +396,6 @@
     "effectsMgr.statics.logHouseCostReduction.title": "Riduzione costo baite",
     "effectsMgr.statics.lumberMillRatio.title": "Bonus Segheria",
     "effectsMgr.statics.lunarOutpostRatio.title": "Bonus Avamposto Lunare",
-    "effectsMgr.statics.luxuryConsuptionReduction.title": "Riduzione dei consumi di lusso",
     "effectsMgr.statics.luxuryHappinessBonus.title": "Bonus felicità da materiali di lusso",
     "effectsMgr.statics.magnetoBoostRatio.title": "Bonus alternatore",
     "effectsMgr.statics.magnetoRatio.title": "Bonus alla produzione",
@@ -474,9 +471,9 @@
     "effectsMgr.statics.terraformingMaxKittens.title": "Bonus gattini Stazione Terraformazione",
     "effectsMgr.statics.theocracyFaithProductionBonus.title": "Bonus produzione dovuto alla religione",
     "effectsMgr.statics.timeImpedance.title": "Ritardo della penalità Temporale",
+    "effectsMgr.statics.timeRatio.title": "Temporal flux bonus",
     "effectsMgr.statics.tradeCatpowerDiscount.title": "Sconto sul costo di potere del gatto per il commercio",
     "effectsMgr.statics.tradeGoldDiscount.title": "Sconto sul costo in Oro nello scambio",
-    "effectsMgr.statics.timeRatio.title": "Temporal flux bonus",
     "effectsMgr.statics.tradeRatio.title": "Rapporto di scambio",
     "effectsMgr.statics.umbraBoostRatio.title": "Bonus Mietitore HR",
     "effectsMgr.statics.unhappinessRatio.title": "Riduzione dell'infelicità",
@@ -634,7 +631,6 @@
     "policy.technocracy.label": "Tecnocrazia",
     "policy.technocracy.desc": "Gli scienziati prendono il controllo del governo, aumentando la capacità massima di scienza.",
     "policy.tradition.label": "Tradizione",
-    "policy.tradition.desc": "Buona per piccole società orientate alla cultura. Riduce il costo dei manoscritti e ne aumenta l'effetto. Questo influenzerà quali politiche saranno disponibili in futuro!",
     "policy.transkittenism.label": "Transgattinismo",
     "policy.transkittenism.desc": "Rinuncia al gattinismo e fonditi con l'AI. I nuclei AI saranno il doppio più efficienti e non ci saranno alcune penalità per il livello dell'AI.",
     "policy.zebraRelationsAppeasement.desc": "Cerca di fare amicizia con le zebre, anche se ti odiano. I termini di scambio saranno meno duri, ma il guadagno in oro sarà leggermente inferiore.",
@@ -828,8 +824,6 @@
     "resources.zebras.title": "zebre",
     "resources.sorrow.full": "Disperazione nera liquida",
     "resources.sorrow.short": "ORL",
-    "gift.repaire": "Gli Dei Anziani hanno riparato la tua confezione regalo",
-    "gift.metaphysics": "Sbloccato {0}!",
     "save.export.msg": "Esportazione salvataggio riuscita!",
     "save.import.confirmation.msg": "Sei sicuro? Questo sovrascriverà il tuo salvataggio!",
     "science.acoustics.label": "Acustico",
@@ -1050,7 +1044,6 @@
     "time.cfu.blastFurnace.label": "Cronofornace",
     "time.cfu.blastFurnace.desc": "Opera basandosi sul cronocalore. Aumenta il massimo di calore di 100.",
     "time.cfu.ressourceRetrieval.label": "Recupero risorse",
-    "time.cfu.temporalAccelerator.desc": "Migliora la generazione del flusso di energia di 5%",
     "time.cfu.temporalBattery.desc": "Migliora la capacità del tuo flusso di energia del 25%",
     "time.cfu.temporalImpedance.desc": "Suppress effect of Dark Future temporal penalty by 1000 years.",
     "time.cfu.timeBoiler.desc": "Espande la capacità termica dei forni Chrono.",
@@ -1100,8 +1093,6 @@
     "trade.bcoin.buy.msg": "Hai comprato {0} blackcoin",
     "trade.bcoin.sell.desc": "Vendi i tuoi blackcoin e riprenditi le reliquie",
     "trade.bcoin.crash": "Infastidisci l'Invisibile Mano Nera",
-    "trade.embassy.open": "Apri ambasciata",
-    "trade.embassy": "Livello ambasciata ({0})",
     "trade.embassy.desc": "Migliora le tue relazioni diplomatiche istituendo un'ambasciata",
     "trade.embassy.pinned": "Appuntato",
     "trade.embassy.unpinned": "Sbloccato",
@@ -1326,7 +1317,6 @@
     "workshop.astrophysicists.desc": "Ogni studioso ora genererà anche carte celesti.",
     "workshop.automatedPlants.desc": "Le acciaierie hanno un bonus del 25% del tuo tasso di produzione",
     "workshop.biofuel.label": "Biofuel processing",
-    "workshop.biofuel.desc": "Biolabs will convert catnip into oil",
     "workshop.bolas.desc": "Arma da lancio costituita da pesi di pietra. I tuoi cacciatori sarano efficaci il doppio",
     "workshop.bolas.flavor": "Patata dolce trasformata in arma da lancio",
     "workshop.cadSystems.desc": "Tutti gli edifici scientifici miglioreranno l'efficacia della creazione di progetti",
@@ -1472,7 +1462,6 @@
     "workshop.spaceEngineers.label": "Ingegneri spaziali",
     "workshop.spaceEngineers.desc": "Migliora l'efficacia dell'ingegnere",
     "workshop.spaceManufacturing.label": "Produzione Spaziale",
-    "workshop.spaceManufacturing.desc": "Le Fabbriche offrono un bonus a Ascensori Spaziali e Schieramenti Orbitali",
     "workshop.starlink.label": "Starlink",
     "workshop.starlink.desc": "Ogni data center fornirà un ulteriore 1% di bonus ai Bio Labs",
     "workshop.stasisChambers.label": "Camere di stasi",
diff --git a/res/i18n/crowdin/ja.json b/res/i18n/crowdin/ja.json
index 0981a8d041..e749577a4a 100644
--- a/res/i18n/crowdin/ja.json
+++ b/res/i18n/crowdin/ja.json
@@ -209,7 +209,6 @@
     "buildings.workshop.desc": "非常に多くのアップグレードを提供します。クラフトの効率が6%上昇します。",
     "buildings.workshop.flavor": "労働者向けの無料のおもちゃ",
     "buildings.zebraForge.label": "シマウマ鍛冶場",
-    "buildings.zebraForge.desc": "ブラッドストーンとT-ミスリルの作成をアンロックします。",
     "buildings.zebraOutpost.label": "シマウマ族の前哨基地",
     "buildings.zebraOutpost.desc": "狩猟遠征の拠点を提供します。アップグレードする度に遠征の有効性が5%向上します。",
     "buildings.zebraWorkshop.label": "シマウマ工房",
@@ -258,6 +257,8 @@
     "calendar.year.tooltip": "年:",
     "challendge.panel.label": "チャレンジ",
     "challendge.pending": "保留",
+    "challendge.reclaimReserves.label": "備蓄を取り戻す",
+    "challendge.reclaimReserves.desc": "彼方から資源を回収します",
     "challendge.applyPending.label": "保留中の変更を適用 ({0})",
     "challendge.applyPending.desc": "直ちに保留としてマークされたチャレンジ/条件を有効にする",
     "challendge.1000Years.label": "1000年",
@@ -279,12 +280,9 @@
     "challendge.ironWill.label": "Iron Will",
     "challendge.ironWill.desc": "Iron Willはすこし隠されたチャレンジであなたはここをクリックする必要はありません。: ゲームをリセットして子猫たちなしでプレイしてください。",
     "challendge.ironWill.effect.desc": "何もなし",
-    "challendge.reclaimReserves.label": "備蓄を取り戻す",
-    "challendge.reclaimReserves.desc": "彼方から資源を回収します",
     "challendge.winterIsComing.label": "冬がきた",
     "challendge.winterIsComing.desc": "季節が冬期のみでゲームがリスタートします。<br><br>目標: ヘリオスに到着する。",
     "challendge.winterIsComing.effect.desc": "全体的に天気が良くなります。",
-    "challendge.btn.chronosphere.desc": "クロノスフィアによるリセットボーナスは得られません。",
     "challendge.btn.chronosphere.with.ironWill.desc": " クロノスフィアによるリセットボーナスは得られません。<br>警告: クロノスフィアからのリセットボーナスは Iron Wii を自動的に無効にします。",
     "challendge.btn.confirmation.title": "チャレンジの確認",
     "challendge.btn.confirmation.msg": "本当にゲームをリセットしてこのチャレンジを始めたいですか？",
@@ -367,8 +365,8 @@
     "effectsMgr.statics.factoryCostReduction.title": "工場のコスト削減",
     "effectsMgr.statics.factoryRefineRatio.title": "工場精製ボーナス",
     "effectsMgr.statics.faithRatioReligion.title": "信仰ボーナス",
-    "effectsMgr.statics.festivalRatio.title": "フェスティバルの効果",
     "effectsMgr.statics.festivalArrivalRatio.title": "フェスティバルの成長率",
+    "effectsMgr.statics.festivalRatio.title": "フェスティバルの効果",
     "effectsMgr.statics.gflopsConsumption.title": "ギガフロップ変換",
     "effectsMgr.statics.globalRelationsBonus.title": "同盟ボーナス",
     "effectsMgr.statics.globalResourceRatio.title": "最大資源ボーナス",
@@ -398,7 +396,6 @@
     "effectsMgr.statics.logHouseCostReduction.title": "ログハウスのコストを下げる",
     "effectsMgr.statics.lumberMillRatio.title": "木材加工場ボーナス",
     "effectsMgr.statics.lunarOutpostRatio.title": "月前哨基地ボーナス",
-    "effectsMgr.statics.luxuryConsuptionReduction.title": "贅沢品の消費減少",
     "effectsMgr.statics.luxuryHappinessBonus.title": "贅沢品の幸福ボーナス",
     "effectsMgr.statics.magnetoBoostRatio.title": "マグネトーブースト",
     "effectsMgr.statics.magnetoRatio.title": "生産ボーナス",
@@ -475,9 +472,9 @@
     "effectsMgr.statics.terraformingMaxKittens.title": "テラフォーミングステーションの子猫ボーナス",
     "effectsMgr.statics.theocracyFaithProductionBonus.title": "信仰値の生産ボーナス",
     "effectsMgr.statics.timeImpedance.title": "時間ペナルティ遅延",
+    "effectsMgr.statics.timeRatio.title": "時に関係したボーナス",
     "effectsMgr.statics.tradeCatpowerDiscount.title": "交易時キャットパワー割引",
     "effectsMgr.statics.tradeGoldDiscount.title": "交易時ゴールド割引",
-    "effectsMgr.statics.timeRatio.title": "時に関係したボーナス",
     "effectsMgr.statics.tradeRatio.title": "交易比率",
     "effectsMgr.statics.umbraBoostRatio.title": "ホーキング放射ハーベスターボーナス",
     "effectsMgr.statics.unhappinessRatio.title": "不幸度減少",
@@ -639,7 +636,6 @@
     "policy.liberalism.label": "自由主義",
     "policy.liberalism.desc": "平和で開放的な社会。すべての貿易パートナーとの関係を改善し、建物に必要なゴールドを少なくします。",
     "policy.liberty.label": "自由",
-    "policy.liberty.desc": "大規模で広範な社会に適しています。人口ペナルティを半減させます。これは将来利用可能なポリシーに影響します！",
     "policy.militarizeSpace.label": "宇宙の軍事化",
     "policy.militarizeSpace.desc": "空の占領を試みます。天文台の人工衛星による科学ボーナスが10%強化されます。",
     "policy.monarchy.label": "君主制",
@@ -653,7 +649,6 @@
     "policy.outerSpaceTreaty.label": "宇宙条約",
     "policy.outerSpaceTreaty.desc": "宇宙はCathの全種族共有の領域であることに合意します。 すべての貿易相手国との関係を強化します。",
     "policy.radicalXenophobia.label": "急進的排異種族主義",
-    "policy.radicalXenophobia.desc": "悪の宇宙人と悪のロボットの両方を拒絶する。聖なる虐殺の効果が2倍になります。",
     "policy.rationality.label": "合理主義",
     "policy.rationality.desc": "世界は根本的に理解可能であるという見解を受け入れましょう。科学力と鉄の生産に少しのボーナスを得ます。後で馬鹿に見えるかもしれませんが。",
     "policy.republic.label": "共和制",
@@ -663,7 +658,6 @@
     "policy.spaceBasedTerraforming.label": "宇宙基盤テラフォーミング",
     "policy.spaceBasedTerraforming.desc": "宇宙に巨大な鏡を置き、太陽光発電所の効率を高める宇宙鏡をアンロックします。",
     "policy.stoicism.label": "ストア派",
-    "policy.stoicism.desc": "禁欲主義者は、苦難には文句を言わずに耐えるべきだと教えています。贅沢品の消費を半減させます。",
     "policy.stripMining.label": "露天掘り",
     "policy.stripMining.desc": "あなたの鉱物生産を向上させるために丘を更地にします。",
     "policy.sustainability.label": "サスティナビリティ",
@@ -673,7 +667,6 @@
     "policy.theocracy.label": "星の理",
     "policy.theocracy.desc": "宇宙飛行士たちは空の向こうにておぞましいものを目撃してしまいました。聖職者たちがそれを引き受けることで、信仰生産を上昇させます。",
     "policy.tradition.label": "伝統",
-    "policy.tradition.desc": "小さな文化志向の社会に適しています。原稿価格を下げ、その効果を高めます。これは将来どのような政策が利用できるかに影響します！",
     "policy.transkittenism.label": "超子猫主義",
     "policy.transkittenism.desc": "子猫の身体を捨てAIと統合します。AIコアは2倍の効率を発揮し、AIレベルに悪影響はありません。",
     "policy.zebraRelationsAppeasement.label": "シマウマ族関係：融和政策",
@@ -807,7 +800,6 @@
     "religion.sacrificeBtn.desc": "ユニコーンを彼らの次元へ戻します。ジグラートの所持数に応じてユニコーンの涙を受け取ります。",
     "religion.sacrificeBtn.sacrifice.msg": "{0} 頭のユニコーンが生贄にされた。あなたは {1} 滴のユニコーンの涙を手に入れた!",
     "religion.transcend.confirmation.title": "超越しますか?",
-    "religion.transcend.confirmation.msg": "本当に悟りを捨てますか?\n\n悟りを捧げて特別な超越レベルに達することができます。\n\nレベルごとに、崇拝の変換 (銀河を崇拝する) 効率がアップします。\n\nレベルが上がるにつれ、より多くの悟りが必要です。\n\nこのボーナスはリセット後も蓄積され、受け継がれます。\n\nこのボタンをクリックすると、悟りとそれによる祈りの効率アップの効果が一部失われます。",
     "religion.transcend.msg.failure": "次のステップへの進捗: {0}%",
     "religion.transcend.msg.success": "あなたは死の淵を超越した T-level: {0}",
     "religion.transcendBtn.label": "超越する",
@@ -817,7 +809,6 @@
     "religion.tu.blackCore.flavor": "子猫が生贄にした骨で造られた。",
     "religion.tu.blackLibrary.label": "黒の図書館",
     "religion.tu.blackLibrary.desc": "すべての黒い図書館はリヴァイアシアヌス経典を2%向上させます。この値は、ユニコーンの墓場によってさらに改善されます。",
-    "religion.tu.blackLibary.flavor": "わざと暗くして書物を読めないようにしているのかもしれません。",
     "religion.tu.blackNexus.label": "黒い連鎖",
     "religion.tu.blackNexus.desc": "時間結晶からレリックを精製する比率を向上させます。<br>各黒い連鎖は、黒いピラミッドの数に応じてレリックの精製効率を増加させます。<br>レリックステーションの効果も上昇します。",
     "religion.tu.blackNexus.flavor": "空から見る目",
@@ -834,7 +825,6 @@
     "religion.tu.darkNova.desc": "全体のエネルギー生産を2%向上させます。",
     "religion.tu.darkNova.flavor": "星々は死に絶えた。我々の希望と夢もまた...",
     "religion.tu.holyGenocide.label": "聖なる虐殺",
-    "religion.tu.holyGenocide.desc": "そして涙はこぼれ落ちない",
     "religion.tu.holyGenocide.flavor": "私たちは無限の黒い海の真ん中にある静かな無知の島で生き続けており、遥かな航海に乗り出すべくいわれも無かった。",
     "religion.tu.singularity.label": "事象の地平面",
     "religion.tu.singularity.desc": "全体の資源最大値を10%向上させます。",
@@ -987,12 +977,9 @@
     "resources.zebras.title": "シマウマ族",
     "resources.sorrow.full": "悲哀の黒い水",
     "resources.sorrow.short": "悲哀の黒い水",
-    "gift.get": "ホッホッホッ！ 古の神々からギフトボックスが届きました！",
-    "gift.repaire": "古の神々によりギフトボックスが修復された。",
     "gift.resources": "{0} {1} を手に入れた！",
     "gift.apocrypha": "アポクリファボーナスが {0}%増加！",
     "gift.transcendence": "超越レベルが4上がった！",
-    "gift.metaphysics": "{0} が解放されました！",
     "save.export.msg": "セーブデータのエクスポートに成功しました!",
     "save.import.confirmation.msg": "保存しますか? データは上書きされてしまいます!",
     "save.import.msg": "セーブデータのインポートに成功しました!",
@@ -1325,7 +1312,6 @@
     "time.cfu.ressourceRetrieval.label": "資源回復",
     "time.cfu.ressourceRetrieval.desc": "時間結晶を砕いた時、1年間の資源一部を取り戻します。",
     "time.cfu.temporalAccelerator.label": "時空加速器",
-    "time.cfu.temporalAccelerator.desc": "変位エネルギーの生成を5%向上させます。",
     "time.cfu.temporalBattery.label": "時空電池",
     "time.cfu.temporalBattery.desc": "変位エネルギーの最大値を25%向上させます。",
     "time.cfu.temporalImpedance.label": "タイム インピーダンス",
@@ -1419,8 +1405,6 @@
     "trade.bcoin.crash": "黒の見えざる手をからかう",
     "trade.bcoin.crash.desc": "ブラックコイン市場の暴落を強制する",
     "trade.correct.bcoin": "巨大な暗号市場の是正が行われました。",
-    "trade.embassy.open": "大使館を開設",
-    "trade.embassy": "大使館レベル ({0})",
     "trade.embassy.desc": "大使館を建てることで外交関係を向上させます。",
     "trade.embassy.pinned": "固定",
     "trade.embassy.unpinned": "固定解除",
@@ -1476,7 +1460,6 @@
     "ui.option.hide.bgimage": "背景画像を非表示にする <i>(テーマによって使用されている場合のみ)</i>",
     "ui.option.tooltips.right": "ツールチップを右の列に移動",
     "ui.option.more": "もっと表示...",
-    "ui.option.no.confirm": "すべてのジョブをクリアする際、ポリシーの調査、またはすべてを購入/売却する(Shift-click) 際に確認しない",
     "ui.option.iw.smelter": "Iron Willモードの際、鉄の最大値の95%に達した際に溶鉱炉を自動的にOFFにする",
     "ui.option.disable.telemetry": "ゲームのテレメトリを無効にする",
     "ui.option.enable.redshift": "オフライン中の進行を有効にする",
@@ -1521,7 +1504,6 @@
     "console.filter.ivoryMeteor": "象牙隕石",
     "console.filter.unicornRift": "ユニコーンリフト",
     "console.filter.alicornRift": "アリコーンリフト",
-    "console.filter.tc": "時間結晶",
     "console.filter.faith": "信仰値",
     "village.bonus.desc.chemist": "化学クラフトボーナス",
     "village.bonus.desc.engineer": "クラフトボーナス",
@@ -1758,7 +1740,6 @@
     "workshop.barges.label": "荷船",
     "workshop.barges.desc": "港がより多くの石炭を貯蔵します。",
     "workshop.biofuel.label": "バイオ燃料加工",
-    "workshop.biofuel.desc": "生物学研究所がキャットニップをオイルに変換するようになります。",
     "workshop.bolas.label": "ボーラ",
     "workshop.bolas.desc": "石の錘でできた投擲武器です。狩人は2倍効果が上がります。",
     "workshop.bolas.flavor": "仕込み編み糸だ",
@@ -1990,7 +1971,6 @@
     "workshop.spaceEngineers.label": "宇宙技術者",
     "workshop.spaceEngineers.desc": "技術者の効果を向上させます。",
     "workshop.spaceManufacturing.label": "宇宙製造業",
-    "workshop.spaceManufacturing.desc": "工場が宇宙エレベーターと軌道上施設にボーナスを与えます。",
     "workshop.starlink.label": "スターリンク",
     "workshop.starlink.desc": "すべてのデータセンターは、生物学研究所に追加の1%ボーナスを提供します",
     "workshop.stasisChambers.label": "ステイシスチャンバー",
diff --git a/res/i18n/crowdin/ko.json b/res/i18n/crowdin/ko.json
index 8d3de6f00b..df866452d7 100644
--- a/res/i18n/crowdin/ko.json
+++ b/res/i18n/crowdin/ko.json
@@ -209,7 +209,6 @@
     "buildings.workshop.desc": "기술 개발 및 제작을 담당하는 건물. 제작 효율을 6%p 증가시킵니다.",
     "buildings.workshop.flavor": "첫 출근 시 무료 장난감 증정",
     "buildings.zebraForge.label": "얼룩말 대장간",
-    "buildings.zebraForge.desc": "블러드 스톤의 공예와 T-미스릴을 해금합니다.",
     "buildings.zebraOutpost.label": "얼룩말 전초기지",
     "buildings.zebraOutpost.desc": "사냥 탐사를 위한 기지를 제공합니다. 매 레벨 당 탐사 효율이 5% 증가합니다.",
     "buildings.zebraWorkshop.label": "얼룩말 제작소",
@@ -258,6 +257,8 @@
     "calendar.year.tooltip": "연도:",
     "challendge.panel.label": "도전",
     "challendge.pending": "대기중",
+    "challendge.reclaimReserves.label": "예비금 회수",
+    "challendge.reclaimReserves.desc": "저 너머에서의 자원 회수",
     "challendge.applyPending.label": "대기중인 변경점들 적용하기 ({0})",
     "challendge.applyPending.desc": "보류로 표시한 도전 과제/조건들을 즉시 켜기",
     "challendge.1000Years.label": "1000년",
@@ -279,12 +280,9 @@
     "challendge.ironWill.label": "철묘 모드",
     "challendge.ironWill.desc": "철묘 모드는 조금 숨겨져있는 느낌의 도전과제이며 여길 눌러서 활성화할 필요는 없습니다. 게임을 초기화하고 고양이 없이 플레이하세요.",
     "challendge.ironWill.effect.desc": "아무것도 없음.",
-    "challendge.reclaimReserves.label": "예비금 회수",
-    "challendge.reclaimReserves.desc": "저 너머에서의 자원 회수",
     "challendge.winterIsComing.label": "겨울이 왔다",
     "challendge.winterIsComing.desc": "일년 내내 겨울인 상태로 게임을 재시작합니다. (캣닢 생산에 파라곤 보너스 또한 적용되지 않습니다.)<br><br>목표: 헬리오스 도달.",
     "challendge.winterIsComing.effect.desc": "날씨가 따듯해질 확률이 올라가고 추워질 확률이 낮아집니다.",
-    "challendge.btn.chronosphere.desc": " 시간 구체의 초기화 보너스를 획득하지 못합니다.",
     "challendge.btn.chronosphere.with.ironWill.desc": "시간 구체의 초기화 보너스를 획득하지 못합니다.<br>경고: 시간 구체의 초기화 보너스는 자동으로 철묘 모드를 비활성화합니다.",
     "challendge.btn.confirmation.title": "도전 확인",
     "challendge.btn.confirmation.msg": "게임을 초기화하고 도전을 시작하시겠습니까?",
@@ -367,8 +365,8 @@
     "effectsMgr.statics.factoryCostReduction.title": "공장 비용 감소",
     "effectsMgr.statics.factoryRefineRatio.title": "공장 정제 보너스",
     "effectsMgr.statics.faithRatioReligion.title": "신앙 보너스",
-    "effectsMgr.statics.festivalRatio.title": "축제 효과",
     "effectsMgr.statics.festivalArrivalRatio.title": "축제 성장률",
+    "effectsMgr.statics.festivalRatio.title": "축제 효과",
     "effectsMgr.statics.gflopsConsumption.title": "GFlops 변환",
     "effectsMgr.statics.globalRelationsBonus.title": "관계 보너스",
     "effectsMgr.statics.globalResourceRatio.title": "자원 한도 보너스",
@@ -398,7 +396,6 @@
     "effectsMgr.statics.logHouseCostReduction.title": "통나무집 비용 감소",
     "effectsMgr.statics.lumberMillRatio.title": "제제소 보너스",
     "effectsMgr.statics.lunarOutpostRatio.title": "달 전초기지 보너스",
-    "effectsMgr.statics.luxuryConsuptionReduction.title": "사치품 소비량 감소",
     "effectsMgr.statics.luxuryHappinessBonus.title": "사치품 행복도 보너스",
     "effectsMgr.statics.magnetoBoostRatio.title": "마그네토 부스트",
     "effectsMgr.statics.magnetoRatio.title": "제작 보너스",
@@ -475,9 +472,9 @@
     "effectsMgr.statics.terraformingMaxKittens.title": "테라포밍 정거장 고양이 보너스",
     "effectsMgr.statics.theocracyFaithProductionBonus.title": "신앙 생산력 보너스",
     "effectsMgr.statics.timeImpedance.title": "시간 페널티 지연",
+    "effectsMgr.statics.timeRatio.title": "시간 흐름 보너스",
     "effectsMgr.statics.tradeCatpowerDiscount.title": "무역 필요 묘력 감소",
     "effectsMgr.statics.tradeGoldDiscount.title": "무역 필요 금 감소",
-    "effectsMgr.statics.timeRatio.title": "시간 흐름 보너스",
     "effectsMgr.statics.tradeRatio.title": "거래 비율",
     "effectsMgr.statics.umbraBoostRatio.title": "호킹 방사선 수집기 보너스",
     "effectsMgr.statics.unhappinessRatio.title": "불행함 감소",
@@ -639,7 +636,6 @@
     "policy.liberalism.label": "자유주의",
     "policy.liberalism.desc": "평화롭고 개방된 사회입니다. 모든 무역 부족과 더 좋은 관계를 맺는 동시에 건설에 필요한 금이 감소합니다.",
     "policy.liberty.label": "자유",
-    "policy.liberty.desc": "크고 값진 사회를 구성하는데 좋습니다. 인구 패널티가 반감됩니다. 이 정책을 선택하면 미래에 영향을 끼칠 수 있습니다!",
     "policy.militarizeSpace.label": "우주 파병",
     "policy.militarizeSpace.desc": "이제부터 하늘은 우리가 점령한다. 인공위성의 천문대 과학력 보너스가 10% 증가합니다.",
     "policy.monarchy.label": "군주제",
@@ -653,7 +649,6 @@
     "policy.outerSpaceTreaty.label": "외우주 조약",
     "policy.outerSpaceTreaty.desc": "캣스의 모든 종족이 우주를 공유하는 데에 동의합니다. 모든 종족과의 관계가 향상됩니다.",
     "policy.radicalXenophobia.label": "급진적 이종족혐오",
-    "policy.radicalXenophobia.desc": "사악한 외계인과 사악한 로봇을 거부합니다. 거룩한 학살의 효과가 두 배로 적용됩니다.",
     "policy.rationality.label": "합리주의",
     "policy.rationality.desc": "세상의 근본 법칙을 이해할 수 있다는 관점을 받아들입니다. 나중에는 우습게 보일 수 있지만 어쨌든 철과 과학력의 생산량에 약간의 보너스를 획득합니다.",
     "policy.republic.label": "공화국",
@@ -663,7 +658,6 @@
     "policy.spaceBasedTerraforming.label": "우주 기반 테라포밍",
     "policy.spaceBasedTerraforming.desc": "하늘에 거대한 거울을 매달아 태양광 발전기의 효과를 상승시킵니다. 우주 거울을 해금합니다.",
     "policy.stoicism.label": "금욕주의",
-    "policy.stoicism.desc": "우리 스토아 학파는 불만 없이 고난을 받아들여야 한다고 가르칩니다. 사치 자원의 소비량이 절반으로 감소합니다.",
     "policy.stripMining.label": "노천 채굴",
     "policy.stripMining.desc": "광물 생산량을 향상시키기 위해 언덕을 갈아엎습니다.",
     "policy.sustainability.label": "환경 지속 가능성",
@@ -673,7 +667,6 @@
     "policy.theocracy.label": "별의 통치",
     "policy.theocracy.desc": "당신의 우주 비행사들은 먼 하늘에서 끔찍한 것들을 목격했습니다. 성직자들에게 맡겨, 신앙 생산량을 증가시킵니다.",
     "policy.tradition.label": "전통",
-    "policy.tradition.desc": "소규모의 문화 기반 사회에 적합합니다. 원고의 가격을 낮추고 효과를 증가시킵니다. 이후 채택 가능한 정책에 영향을 미칩니다.",
     "policy.transkittenism.label": "초묘(超猫)주의",
     "policy.transkittenism.desc": "고양이의 삶을 포기하고 인공지능과 병합합니다. 인공지능 코어의 효과가 두 배로 증가하고, 인공지능 레벨에 따른 단점이 사라집니다.",
     "policy.zebraRelationsAppeasement.label": "얼룩말 관계: 회유",
@@ -807,7 +800,6 @@
     "religion.sacrificeBtn.desc": "유니콘을 유니콘 차원으로 보냅니다. 유니콘 눈물은 지구라트 하나 당 하나를 얻습니다.",
     "religion.sacrificeBtn.sacrifice.msg": "{0} 마리의 유니콘이 희생되었습니다. {1} 개의 유니콘 눈물을 얻었습니다!",
     "religion.transcend.confirmation.title": "초월?",
-    "religion.transcend.confirmation.msg": "정말 통찰의 일부를 버리시겠습니까?\n\n당신은 통찰의 일부를 희생함으로써 특별한 초월 단계에 이를 수 있습니다.\n\n각 단계마다 숭배 전환의 효과가 높아질 것입니다(별을 숭배).\n\n모든 레벨에서 희생에 더 많은 비율의 통찰을 요구합니다.\n\n이 보너스는 누적되며 초기화 과정을 거칩니다.\n\n\"이 버튼을 누르면 통찰의 일부와 찬양 효과가 제거됩니다.\"",
     "religion.transcend.msg.failure": "한 걸음 더 가까이: {0}%",
     "religion.transcend.msg.success": "고양이의 한계를 초월하였습니다. 초월 단계: {0}",
     "religion.transcendBtn.label": "초월",
@@ -817,7 +809,6 @@
     "religion.tu.blackCore.flavor": "희생된 고양이의 뼈로 지어졌습니다.",
     "religion.tu.blackLibrary.label": "검은 도서관",
     "religion.tu.blackLibrary.desc": "검은 도서관 하나당 고문서 레비아타니아우스의 효과를 2% 증가시킵니다. 이 효과는 유니콘 묘지에 의해 증폭될 수 있습니다.",
-    "religion.tu.blackLibary.flavor": "아마 너무 어두워서 마음대로 못 읽을 걸.",
     "religion.tu.blackNexus.label": "검은 연결체",
     "religion.tu.blackNexus.desc": "시간 결정을 유물로 정제하는 비율을 향상시킵니다.<br>모든 검은 연결체는 검은 피라미드 개수만큼 유물 정제 효과를 증가시킵니다.<br>이 효과는 유물 정거장의 효과 또한 높입니다.",
     "religion.tu.blackNexus.flavor": "하늘의 눈",
@@ -834,7 +825,6 @@
     "religion.tu.darkNova.desc": "전체 전력 생산량을 2% 증가시킵니다",
     "religion.tu.darkNova.flavor": "이 별은 죽었습니다. 우리의 꿈과 희망처럼요.",
     "religion.tu.holyGenocide.label": "거룩한 학살",
-    "religion.tu.holyGenocide.desc": "그리고 눈물은 흘러내리지 않을 것입니다.",
     "religion.tu.holyGenocide.flavor": "우리는 무한한 가능성의 검은 대양을 두고도 무지한 섬에서 살아가고 있다. 우리는 장막 너머를 들여다보려 하지 않았다.",
     "religion.tu.singularity.label": "사건의 지평선",
     "religion.tu.singularity.desc": "보편적인 자원 제한 10% 증가하다",
@@ -987,12 +977,9 @@
     "resources.zebras.title": "얼룩말",
     "resources.sorrow.full": "검은 비애",
     "resources.sorrow.short": "검정색 액화 비애",
-    "gift.get": "XOXOXO! 고대신이 당신에게 선물 상자를 보냈습니다!",
-    "gift.repaire": "고대신이 당신의 선물 박스를 수리했습니다.",
     "gift.resources": "{0} {1} 획득!",
     "gift.apocrypha": "아포크리파 보너스가 {0}% 상승했습니다!",
     "gift.transcendence": "초월 단계가 4 상승했습니다!",
-    "gift.metaphysics": "{0} 잠금 해제!",
     "save.export.msg": "세이브 내보내기 성공!",
     "save.import.confirmation.msg": "데이터를 기존 데이터에 덮어씌워집니다. 진행합니까?",
     "save.import.msg": "세이브 불러오기 성공!",
@@ -1325,7 +1312,6 @@
     "time.cfu.ressourceRetrieval.label": "자원 수집기",
     "time.cfu.ressourceRetrieval.desc": "시간 결정을 연소할 때 연간 획득한 자원량의 일부를 복구합니다.",
     "time.cfu.temporalAccelerator.label": "시간 가속기",
-    "time.cfu.temporalAccelerator.desc": "시간 에너지 생산량이 5% 증가합니다.",
     "time.cfu.temporalBattery.label": "시간 전지",
     "time.cfu.temporalBattery.desc": "시간 에너지 저장 용량이 25% 증가합니다.",
     "time.cfu.temporalImpedance.label": "시간 저항",
@@ -1419,8 +1405,6 @@
     "trade.bcoin.crash": "\"보이지 않는 검은 손\"을 약올리기",
     "trade.bcoin.crash.desc": "강제로 흑전 시장을 붕괴",
     "trade.correct.bcoin": "거대한 비밀 시장의 정리가 있었습니다",
-    "trade.embassy.open": "대사관 개관",
-    "trade.embassy": "대사관 레벨 ({0})",
     "trade.embassy.desc": "대사관을 설립하여 외교 관계를 개선합니다.",
     "trade.embassy.pinned": "고정",
     "trade.embassy.unpinned": "고정",
@@ -1476,7 +1460,6 @@
     "ui.option.hide.bgimage": "배경 이미지 <i>(해당되는 색상 구성표의 경우)</i를 숨깁니다>",
     "ui.option.tooltips.right": "툴팁 우측 열로 옮기기",
     "ui.option.more": "자세히..",
-    "ui.option.no.confirm": "모든 직업 해제, 정책 연구, 전부 구매/판매 시 확인 안 함(Shift-클릭)",
     "ui.option.iw.smelter": "철묘 모드에서 철이 최대치의 95%가 되면 용광로를 정지함",
     "ui.option.disable.telemetry": "게임 원격 측정 끄기",
     "ui.option.enable.redshift": "오프라인 진행 사용",
@@ -1521,7 +1504,6 @@
     "console.filter.ivoryMeteor": "상아 운석",
     "console.filter.unicornRift": "유니콘 균열",
     "console.filter.alicornRift": "알리콘 균열",
-    "console.filter.tc": "시간 결정",
     "console.filter.faith": "신앙",
     "village.bonus.desc.chemist": "화학물 제작 보너스",
     "village.bonus.desc.engineer": "제작 보너스",
@@ -1758,7 +1740,6 @@
     "workshop.barges.label": "바지선",
     "workshop.barges.desc": "항구가 석탄을 더 많이 저장합니다",
     "workshop.biofuel.label": "바이오연료 가공",
-    "workshop.biofuel.desc": "생물연구소가 캣닢을 석유로 가공합니다",
     "workshop.bolas.label": "사냥돌",
     "workshop.bolas.desc": "돌이 무게추가 되는 투척 무기. 사냥꾼이 두 배 효율적이게 합니다",
     "workshop.bolas.flavor": "무기화한 실뭉치",
@@ -1990,7 +1971,6 @@
     "workshop.spaceEngineers.label": "우주 기술자",
     "workshop.spaceEngineers.desc": "기술자들의 효율이 증가합니다.",
     "workshop.spaceManufacturing.label": "우주 제조 기술",
-    "workshop.spaceManufacturing.desc": "공장이 우주 엘리베이터와 궤도 배열기에 보너스를 제공합니다.",
     "workshop.starlink.label": "스타 링크",
     "workshop.starlink.desc": "데이터 센터가 생체 연구소에 보너스를 1% 제공합니다.",
     "workshop.stasisChambers.label": "정체실",
diff --git a/res/i18n/crowdin/nl.json b/res/i18n/crowdin/nl.json
index b7a9840702..91c089a76b 100644
--- a/res/i18n/crowdin/nl.json
+++ b/res/i18n/crowdin/nl.json
@@ -209,7 +209,6 @@
     "buildings.workshop.desc": "Zorgt voor een uitgebreid assortiment aan verbeteringen. Verbetert bouw effectiviteit met 6%",
     "buildings.workshop.flavor": "Gratis speeltjes voor de arbeiders",
     "buildings.zebraForge.label": "Zebra Smederij",
-    "buildings.zebraForge.desc": "Ontgrendelt het ambacht van bloedstenen en t-mythril",
     "buildings.zebraOutpost.label": "Zebra Uitpost",
     "buildings.zebraOutpost.desc": "Biedt een basis voor de jachtexpedities. Elk niveau van de upgrade verbetert de expeditie met 5%",
     "buildings.zebraWorkshop.label": "Zebra Werkplaats",
@@ -258,6 +257,7 @@
     "calendar.year.tooltip": "Jaar:",
     "challendge.panel.label": "Uitdagingen",
     "challendge.pending": "In afwachting",
+    "challendge.reclaimReserves.label": "Terugvorderen reserves",
     "challendge.applyPending.label": "Wijzigingen in behandeling nemen ({0})",
     "challendge.applyPending.desc": "Schakel uitdagingen/voorwaarden die als in behandeling zijn gemarkeerd onmiddellijk in",
     "challendge.1000Years.label": "1000 jaar",
@@ -279,7 +279,6 @@
     "challendge.ironWill.label": "IJzeren Wil",
     "challendge.ironWill.desc": "Ijzeren Wil is een beetje verborgen uitdaging. Je hoeft niet hier te klikken om deze in te schakelen: reset het spel en speel zonder kittens.",
     "challendge.ironWill.effect.desc": "Niets",
-    "challendge.reclaimReserves.label": "Terugvorderen reserves",
     "challendge.winterIsComing.effect.desc": "Warme seizoenen zijn waarschijnlijker, en koude seizoenen zijn zeldzamer.",
     "challendge.btn.chronosphere.with.ironWill.desc": " You won't gain reset bonus from chronospheres.<br />WARNING: the reset bonus from chronospheres will automatically disable IW.",
     "challendge.btn.confirmation.msg": "Weet je het zeker dat je deze uitdaging wilt starten door de game te resetten?",
@@ -350,8 +349,8 @@
     "effectsMgr.statics.factoryCostReduction.title": "Vermindering kosten van Fabriek",
     "effectsMgr.statics.factoryRefineRatio.title": "Raffineerbonus van Fabriek",
     "effectsMgr.statics.faithRatioReligion.title": "Geloofsbonus",
-    "effectsMgr.statics.festivalRatio.title": "Festivaleffecten",
     "effectsMgr.statics.festivalArrivalRatio.title": "Festival groei factor",
+    "effectsMgr.statics.festivalRatio.title": "Festivaleffecten",
     "effectsMgr.statics.gflopsConsumption.title": "GFlops consumption",
     "effectsMgr.statics.globalRelationsBonus.title": "Relatie bonus",
     "effectsMgr.statics.globalResourceRatio.title": "Maximum grondstoffen bonus",
@@ -381,7 +380,6 @@
     "effectsMgr.statics.logHouseCostReduction.title": "Blokhut kosten reductie",
     "effectsMgr.statics.lumberMillRatio.title": "Houtzagerijbonus",
     "effectsMgr.statics.lunarOutpostRatio.title": "Maan buitenpost bonus",
-    "effectsMgr.statics.luxuryConsuptionReduction.title": "Vermindering van luxegoederen consumptie",
     "effectsMgr.statics.luxuryHappinessBonus.title": "Tevredenheidsbonus door luxegoederen",
     "effectsMgr.statics.magnetoBoostRatio.title": "Magneto boost",
     "effectsMgr.statics.magnetoRatio.title": "Productiebonus",
@@ -412,8 +410,8 @@
     "effectsMgr.statics.t3CraftRatio.title": "Klasse 3 ingenieur's vakkennis",
     "effectsMgr.statics.temporalParadoxDayBonus.title": "Dag in tijdsparadox",
     "effectsMgr.statics.theocracyFaithProductionBonus.title": "Geloof productie bonus",
-    "effectsMgr.statics.tradeCatpowerDiscount.title": "Katkracht handels korting",
     "effectsMgr.statics.timeRatio.title": "Chronomancy bonus",
+    "effectsMgr.statics.tradeCatpowerDiscount.title": "Katkracht handels korting",
     "effectsMgr.statics.unicornsGlobalRatio.title": "Eenhoornbonus",
     "effectsMgr.statics.unicornsRatioReligion.title": "Eenhoornbonus",
     "effectsMgr.statics.uplinkDCRatio.title": "Datacentrum synergiebonus",
@@ -501,7 +499,6 @@
     "policy.knowledgeSharing.desc": "Je wetenschappers zullen naar vreemde landen reizen, waardoor het wetenschapsinkomen lichtelijk stijgt.",
     "policy.liberalism.label": "Liberalisme",
     "policy.liberty.label": "Vrijheid",
-    "policy.liberty.desc": "Goed voor grote, uitgebreide samenlevingen. Halveert de bevolkingsstraf. Dit zal beïnvloeden welke soorten beleid er in de toekomst beschikbaar zijn!",
     "policy.monarchy.label": "Monarchie",
     "policy.mysticism.label": "Mysticisme",
     "policy.openWoodlands.label": "Open Bosland",
@@ -512,7 +509,6 @@
     "policy.socialism.desc": "Heeft geen effect",
     "policy.technocracy.label": "Technocratie",
     "policy.tradition.label": "Traditie",
-    "policy.tradition.desc": "Goed voor kleine, op cultuur georiënteerde samenlevingen. Vermindert de prijs voor manuscripten en verhoogt hun effect. Dit zal beïnvloeden welke beleidskeuzes in de toekomst beschikbaar zullen zijn!",
     "policy.transkittenism.label": "Transkittenisme",
     "policy.transkittenism.desc": "Geef je kittenheid op en word één met KI. KI kernen worden twee keer zo effectief, en er is geen minpunt aan KI level.",
     "policy.zebraRelationsBellicosity.desc": "Sta op tegen de zebra's, waardoor je handel met hen slechter wordt, maar je het respect verdient van andere rassen.",
@@ -689,7 +685,6 @@
     "resources.sorrow.full": "Zwart vloeibaar leed",
     "resources.sorrow.short": "BLS",
     "gift.resources": "Kreeg {0} {1}!",
-    "gift.metaphysics": "{0} ontgrendeld!",
     "science.toggleResearched.label": "Verstop onderzochte technologie",
     "science.acoustics.label": "Akoestiek",
     "science.acoustics.effectDesc": "Ontgrendelt kapellen",
@@ -838,7 +833,6 @@
     "tab.name.workshop": "Werkplaats",
     "time.AccelerateTimeBtn.tooltip.accelerated": "Versneld tijdsverloop",
     "time.cfu.ressourceRetrieval.desc": "Haal een gedeelte van jouw jaarlijkse middelen op wanneer je TC verbrandt",
-    "time.cfu.temporalAccelerator.desc": "Verbeterd flux energie generatie met 5%",
     "time.cfu.temporalImpedance.label": "Tijd impedantie",
     "time.cfu.temporalImpedance.desc": "Vertraag het effect van Donkere Toekomst penalty met 1000 jaar.",
     "time.cfu.timeBoiler.label": "Tijdboiler",
@@ -897,8 +891,6 @@
     "trade.bcoin.sell.desc": "Verkoop je blackcoins en krijg relikwieën terug",
     "trade.bcoin.sell.msg": "Je hebt {0} relikwieën",
     "trade.bcoin.crash": "Erger de Onzichtbare Zwarte Hand",
-    "trade.embassy.open": "Open ambassade",
-    "trade.embassy": "Ambassadeniveau ({0})",
     "trade.embassy.desc": "Verbeter je diplomatieke relaties door een ambassade op te richten",
     "trade.embassy.unpinned": "Losgemaakt",
     "ui.filter.available": "Beschikbaar",
@@ -934,7 +926,6 @@
     "console.filter.meteor": "Meteoren",
     "console.filter.ivoryMeteor": "Ivoormeteoren",
     "console.filter.alicornRift": "Alicorn Kloven",
-    "console.filter.tc": "Tijdskristallen",
     "village.bonus.desc.chemist": "Chemische bouw bonus",
     "village.bonus.desc.engineer": "Productiebonus",
     "village.bonus.desc.manager": "Jachtbonus",
@@ -1069,7 +1060,6 @@
     "workshop.astrophysicists.desc": "Elke geleerde zal nu sterrenkaarten genereren.",
     "workshop.barges.desc": "Havens slaan meer steenkool op",
     "workshop.biofuel.label": "Biobrandstof verwerking",
-    "workshop.biofuel.desc": "Biolabs will convert catnip into oil",
     "workshop.cargoShips.label": "Vergrote lading",
     "workshop.chronoEngineers.label": "Chrono-ingenieur",
     "workshop.chronoEngineers.desc": "Improves Engineer's effectiveness",
diff --git a/res/i18n/crowdin/no.json b/res/i18n/crowdin/no.json
index e1cdb66c19..946144b001 100644
--- a/res/i18n/crowdin/no.json
+++ b/res/i18n/crowdin/no.json
@@ -236,7 +236,6 @@
     "challendge.winterIsComing.label": "Vinteren kjem",
     "challendge.winterIsComing.desc": "Nullstill spelet med berre vinter.<br><br>Mål: Nå Helios.",
     "challendge.winterIsComing.effect.desc": "Veret blir i snitt betre.",
-    "challendge.btn.chronosphere.desc": " Du får ikkje nullstillingsbonusar frå kronosfærar.",
     "challendge.btn.chronosphere.with.ironWill.desc": " Du får ikkje nullstillingsbonusar frå kronosfærar.<br />ÅTVARING: nullstillingsbonusen frå kronosfærar vil slå av jarnvilje.",
     "challendge.btn.desc": "<br />Tjen: {0}<br /><br />Spelet ditt blir nullstillt for å starta denne utfordringa. {1}",
     "challendge.btn.log.message.on.complete": "Gratulerer! Du klarte utfordringa {0}.",
@@ -935,7 +934,6 @@
     "workshop.barges.label": "Flåter",
     "workshop.barges.desc": "Meir hamneplass for kol",
     "workshop.biofuel.label": "Biodrivstoff",
-    "workshop.biofuel.desc": "Bio-laboratorium kan laga kattemynte om til olje",
     "workshop.bolas.label": "Lasso",
     "workshop.cadSystems.label": "Digitalt design",
     "workshop.caravanserai.label": "Gjestegard",
diff --git a/res/i18n/crowdin/pl.json b/res/i18n/crowdin/pl.json
index 7d33c13c47..35a728c6cb 100644
--- a/res/i18n/crowdin/pl.json
+++ b/res/i18n/crowdin/pl.json
@@ -209,7 +209,6 @@
     "buildings.workshop.desc": "Zapewnia szeroką gamę ulepszeń. Poprawia wydajność wytwarzania o 6%",
     "buildings.workshop.flavor": "Darmowe zabawki dla pracowników",
     "buildings.zebraForge.label": "Kuźnia Zebry",
-    "buildings.zebraForge.desc": "Odblokowuje tworzenie krwawych kamieni i t-mytrylu",
     "buildings.zebraOutpost.label": "Placówka Zebry",
     "buildings.zebraOutpost.desc": "Stanowi bazę dla wypraw myśliwskich. Każdy poziom ulepszenia poprawia skuteczność wyprawy o 5%",
     "buildings.zebraWorkshop.label": "Warsztaty Zebry",
@@ -258,6 +257,8 @@
     "calendar.year.tooltip": "Rok:",
     "challendge.panel.label": "Wyzwania",
     "challendge.pending": "Oczekujące",
+    "challendge.reclaimReserves.label": "Odzyskaj rezerwy",
+    "challendge.reclaimReserves.desc": "Odzyskaj zasoby z zaświatów",
     "challendge.applyPending.label": "Zastosuj Oczekujące Zmiany ({0})",
     "challendge.applyPending.desc": "Włącz Wyzwania/Warunki oznaczone jako Oczekujące natychmiast",
     "challendge.1000Years.label": "1000 lat",
@@ -279,12 +280,9 @@
     "challendge.ironWill.label": "Żelazna Wola",
     "challendge.ironWill.desc": "Żelazna Wola jest takim trochę ukrytym wyzwaniem i nie musisz nic klikać aby go aktywować: zrestartuj grę i graj bez kotków.",
     "challendge.ironWill.effect.desc": "Nic",
-    "challendge.reclaimReserves.label": "Odzyskaj rezerwy",
-    "challendge.reclaimReserves.desc": "Odzyskaj zasoby z zaświatów",
     "challendge.winterIsComing.label": "Nadchodzi zima",
     "challendge.winterIsComing.desc": "Zrestartuj grę z samymi zimami.<br><br>Cel: Dotarcie do Heliosa.",
     "challendge.winterIsComing.effect.desc": "Pogoda się globalnie polepsza.",
-    "challendge.btn.chronosphere.desc": " Nie będziesz otrzymywać bonusu z restartu od chronosfer.",
     "challendge.btn.chronosphere.with.ironWill.desc": " Nie będziesz otrzymywać bonusu z restartu od chronosfer.<br />OSTRZEŻENIE: bonus z restartu z chronosfer automatycznie wyłączy tryb Żelaznej Woli.",
     "challendge.btn.confirmation.title": "Potwierdzenie wyzwania",
     "challendge.btn.confirmation.msg": "Jesteś pewien że chcesz rozpocząć te wyzwanie restartując grę?",
@@ -367,8 +365,8 @@
     "effectsMgr.statics.factoryCostReduction.title": "Redukcja kosztów fabryk",
     "effectsMgr.statics.factoryRefineRatio.title": "Premia do rafinacji fabryk",
     "effectsMgr.statics.faithRatioReligion.title": "Premia do wiary",
-    "effectsMgr.statics.festivalRatio.title": "Efekty festiwalu",
     "effectsMgr.statics.festivalArrivalRatio.title": "Tempo wzrostu festiwalu",
+    "effectsMgr.statics.festivalRatio.title": "Efekty festiwalu",
     "effectsMgr.statics.gflopsConsumption.title": "Zużycie GFlops",
     "effectsMgr.statics.globalRelationsBonus.title": "Bonus relacji",
     "effectsMgr.statics.globalResourceRatio.title": "Premia za maksymalne zasoby",
@@ -398,7 +396,6 @@
     "effectsMgr.statics.logHouseCostReduction.title": "Redukcja kosztów Drewnianego Domu",
     "effectsMgr.statics.lumberMillRatio.title": "Premia do tartaku",
     "effectsMgr.statics.lunarOutpostRatio.title": "Premia do posterunku księżycowego",
-    "effectsMgr.statics.luxuryConsuptionReduction.title": "Redukcja zużycia materiałów luksusowych",
     "effectsMgr.statics.luxuryHappinessBonus.title": "Bonus szczęścia z towarów luksusowych",
     "effectsMgr.statics.magnetoBoostRatio.title": "Iskrownik podnieść",
     "effectsMgr.statics.magnetoRatio.title": "Premia produkcyjna",
@@ -474,9 +471,9 @@
     "effectsMgr.statics.terraformingMaxKittens.title": "Bonus Stacji Terra formacji kociąt",
     "effectsMgr.statics.theocracyFaithProductionBonus.title": "Bonus do produkcji wiary",
     "effectsMgr.statics.timeImpedance.title": "Kara czasowa",
+    "effectsMgr.statics.timeRatio.title": "Premia do przepływu czasowego",
     "effectsMgr.statics.tradeCatpowerDiscount.title": "Zniżka handlu siłą kociąt",
     "effectsMgr.statics.tradeGoldDiscount.title": "Zniżka handlu złotem",
-    "effectsMgr.statics.timeRatio.title": "Premia do przepływu czasowego",
     "effectsMgr.statics.tradeRatio.title": "Stosunek handlu",
     "effectsMgr.statics.umbraBoostRatio.title": "Bonus HR Żniwiarza",
     "effectsMgr.statics.unhappinessRatio.title": "Redukcja niezadowolenia",
@@ -638,7 +635,6 @@
     "policy.liberalism.label": "Liberalizm",
     "policy.liberalism.desc": "Pokojowe i otwarte społeczeństwo. Zyskujesz lepsze relacje handlowe z innymi cywilizacjami, a budynki wymagają mniej złota.",
     "policy.liberty.label": "Wolność",
-    "policy.liberty.desc": "Odpowiednie dla dużych, ekspansywnych społeczeństw. Zmniejsza karę za przeludnienie o połowę. Wpłynie na to, jakie doktryny będą dostępne w przyszłości!",
     "policy.militarizeSpace.label": "Zmilitaryzuj Kosmos",
     "policy.militarizeSpace.desc": "Spróbuj przejąć niebo. Bonus naukowy twoich satelit do obserwatoriów jest o 10% potężniejszy.",
     "policy.monarchy.label": "Monarchia",
@@ -652,7 +648,6 @@
     "policy.outerSpaceTreaty.label": "Traktat Przestrzeni Kosmicznej",
     "policy.outerSpaceTreaty.desc": "Przyznaj, że kosmos jest wspólną przestrzenią życiową wszystkich ras Cath, polepszając stosunki z partnerami handlowymi.",
     "policy.radicalXenophobia.label": "Radykalna Ksenofobia",
-    "policy.radicalXenophobia.desc": "Odrzuć zarówno złych kosmitów, jak i złe robotów. Święta wojna jest dwukrotnie skuteczniejsza.",
     "policy.rationality.label": "Racjonalizm",
     "policy.rationality.desc": "Zaakceptuj pogląd, że świat może być fundamentalnie zrozumiany. Zdobądź małą premię do nauki i produkcji żelaza, chociaż możesz wyglądać głupio później.",
     "policy.republic.label": "Republika",
@@ -662,7 +657,6 @@
     "policy.spaceBasedTerraforming.label": "Terraformacja oparta na kosmosie",
     "policy.spaceBasedTerraforming.desc": "Umieść olbrzymie lustra na niebie, zwiększając niezawodność farm słonecznych. Odblokowuje Lustra Kosmiczne.",
     "policy.stoicism.label": "Stoicyzm",
-    "policy.stoicism.desc": "Stoicy uczą że powinniśmy wytrzymywać trudności bez narzekania. Zmniejsza konsumpcję towarów luksusowych o połowę.",
     "policy.stripMining.label": "Kopalnictwo odkrywkowe",
     "policy.stripMining.desc": "Zrównaj pagórki z ziemią w wysiłku mającym na celu zwiększenie produkcji minerałów.",
     "policy.sustainability.label": "Zrównoważony rozwój",
@@ -672,7 +666,6 @@
     "policy.theocracy.label": "Zakon Gwiazd",
     "policy.theocracy.desc": "Twoi astronauci zobaczyli straszne rzeczy w odległych niebach. Niech księża przejmą władzę, zwiększając produkcję wiary.",
     "policy.tradition.label": "Tradycja",
-    "policy.tradition.desc": "Dobre dla małych społeczeństw zorientowanych na kulturę. Zmniejsza cenę manuskryptów i zwiększa ich efekt. To wpłynie na to, jakie polityki są dostępne w przyszłości!",
     "policy.transkittenism.label": "Transkocianizm",
     "policy.transkittenism.desc": "Wyrzeknij się kotowatości i zespól się ze sztuczną inteligencją. Wydajność rdzeni AI podwoi się, a poziom AI nie wywoła negatywnych skutków.",
     "policy.zebraRelationsAppeasement.label": "Relacje z Zebrami: Ugodowość",
@@ -806,7 +799,6 @@
     "religion.sacrificeBtn.desc": "Zwróć Jednorożce do ich wymiaru. Za każdy ziggurat otrzymasz jedną Łzę Jednorożca.",
     "religion.sacrificeBtn.sacrifice.msg": "{0} jednorożce zostały poświęcone. Masz {1} łzy jednorożca!",
     "religion.transcend.confirmation.title": "Przekroczyć?",
-    "religion.transcend.confirmation.msg": "Czy na pewno chcesz porzucić część premii epifanii?\n\nMożesz osiągnąć specjalne szczeble transcendencji poświęcając swój bonus epifanii.\n\nKażdy szczebel podniesie efektywność przekształcenia adoracji (Podziwiaj galaktykę).\n\nKażdy poziom wymaga poświęcenia proporcjonalnie więcej premii za wiarę.\n\nTa premia będzie się gromadzić i będzie zachowywana przez resety.\n\nKLIKNIĘCIE TEGO PRZYCISKU USUNIE CZĘŚĆ TWOJEJ EPIFANII ORAZ EFEKTYWNOŚCI MODLITW.",
     "religion.transcend.msg.failure": "Jeden krok bliżej: {0}%",
     "religion.transcend.msg.success": "Przekroczyłeś granice śmiertelności. Poziom T: {0}",
     "religion.transcendBtn.label": "Przekroczyć",
@@ -816,7 +808,6 @@
     "religion.tu.blackCore.flavor": "Zbudowany z kości ofiar kociąt.",
     "religion.tu.blackLibrary.label": "Czarna Biblioteka",
     "religion.tu.blackLibrary.desc": "Każda Czarna Biblioteka poprawia skalowanie Kodeksów Leviathanianus o 2%. Wartość ta jest dodatkowo ulepszana przez Cmentarze Jednorożców.",
-    "religion.tu.blackLibary.flavor": "Może nie bez powodu to jest zbyt ciemne by przeczytać",
     "religion.tu.blackNexus.label": "Czarny Nexus",
     "religion.tu.blackNexus.desc": "Poprawia tempo ulepszania kryształów czasu w relikwiach. <br /> Każdy Czarny Nexus zwiększy efektywność Redukcji Reliktów o liczbę Czarnych Piramid. <br> Efekt ten zwiększa również efektywność Stacji Relikwii",
     "religion.tu.blackNexus.flavor": "Oko na niebie.",
@@ -832,7 +823,6 @@
     "religion.tu.darkNova.desc": "Poprawia globalną produkcję energii o 2%",
     "religion.tu.darkNova.flavor": "Gwiazdy są martwe. Tak jak nasze nadzieje i marzenia.",
     "religion.tu.holyGenocide.label": "Święte ludobójstwo",
-    "religion.tu.holyGenocide.desc": "I łza nie spadnie",
     "religion.tu.holyGenocide.flavor": "Żyjemy na łagodnej wyspie ignorancji pośród czarnych mórz nieskończoności i nie oznaczało to, że powinniśmy podróżować daleko.",
     "religion.tu.singularity.label": "Horyzont zdarzeń",
     "religion.tu.singularity.desc": "Popraw globalne limity zasobów o 10%",
@@ -985,12 +975,9 @@
     "resources.zebras.title": "Zebry",
     "resources.sorrow.full": "Smutek w postaci czarnego płynu",
     "resources.sorrow.short": "CPS",
-    "gift.get": "XOXOXO! Starzy Bogowie zesłali ci prezent!",
-    "gift.repaire": "Starsi Bogowie naprawili Twoją skrzynkę podarunkową",
     "gift.resources": "Masz {0} {1}!",
     "gift.apocrypha": "Premia z Apokryfów zwiększona o {0}%!",
     "gift.transcendence": "Poziom Transcendencji zwiększony o 4!",
-    "gift.metaphysics": "Odblokowano {0}!",
     "save.export.msg": "Exportowanie zapisu pomyślne!",
     "save.import.confirmation.msg": "Jesteś pewny? Spowoduje to zastąpienie Twojego zapisu!",
     "save.import.msg": "Importowanie zapisu pomyślne!",
@@ -1319,7 +1306,6 @@
     "time.cfu.ressourceRetrieval.label": "Odzyskiwanie Zasobów",
     "time.cfu.ressourceRetrieval.desc": "Odzyskaj część swoich rocznych zasobów kiedy spalasz KC",
     "time.cfu.temporalAccelerator.label": "Tymczasowy Akcelerator",
-    "time.cfu.temporalAccelerator.desc": "Poprawia generowanie energii strumienia o 5%",
     "time.cfu.temporalBattery.label": "Czasowa Bateria",
     "time.cfu.temporalBattery.desc": "Poprawia pojemność energetyczną strumienia o 25%",
     "time.cfu.temporalImpedance.label": "Impedancja czasu",
@@ -1411,8 +1397,6 @@
     "trade.bcoin.crash": "Denerwuj Niewidzialną Czarną Dłoń",
     "trade.bcoin.crash.desc": "Wywołaj zapaść rynku czarnogroszy",
     "trade.correct.bcoin": "Nastąpiła ogromna korekta na rynku kryptowalutowym",
-    "trade.embassy.open": "Otwórz ambasadę",
-    "trade.embassy": "Poziom ambasady ({0})",
     "trade.embassy.desc": "Załóż ambasadę i popraw dzięki niej stosunki dyplomatyczne",
     "trade.embassy.pinned": "Przypięte",
     "trade.embassy.unpinned": "Odpięte",
@@ -1467,7 +1451,6 @@
     "ui.option.hide.bgimage": "Ukryj obraz tła <i>(dla schematów kolorów, gdy możliwe)</i>",
     "ui.option.tooltips.right": "Przenieś podpowiedzi do prawej kolumny",
     "ui.option.more": "Więcej..",
-    "ui.option.no.confirm": "Nie pytaj o potwierdzenie przy zwalnianiu wszystkich miejsc pracy, wybieraniu doktryny ani przy zakupie lub sprzedaży wszystkiego (Shift+klik)",
     "ui.option.iw.smelter": "Huty wyłączają się przy 95% maksymalnego żelaza w trybie Żelaznej Woli",
     "ui.option.disable.telemetry": "Wyłącz telemetrię",
     "ui.option.enable.redshift": "Włącz postęp offline",
@@ -1510,7 +1493,6 @@
     "console.filter.ivoryMeteor": "Meteory Kości Słoniowej",
     "console.filter.unicornRift": "Szczeliny Jednorożców",
     "console.filter.alicornRift": "Szczeliny Skrzydłorożców",
-    "console.filter.tc": "Kryształy Czasu",
     "console.filter.faith": "Wiara",
     "village.bonus.desc.chemist": "Premia do wytwarzania chemikaliów",
     "village.bonus.desc.engineer": "Bonus do tworzenia",
@@ -1746,7 +1728,6 @@
     "workshop.barges.label": "Barki",
     "workshop.barges.desc": "Porty przechowują więcej węgla",
     "workshop.biofuel.label": "Przetwarzanie Biopaliw",
-    "workshop.biofuel.desc": "Biolaboratoria zamienią kocimiętkę w ropę",
     "workshop.bolas.label": "Bolas",
     "workshop.bolas.desc": "Broń do rzucania wykonana z ciężkich kamieni. Twoi myśliwi są dwa razy skuteczniejsi",
     "workshop.bolas.flavor": "Broń przędzona",
@@ -1978,7 +1959,6 @@
     "workshop.spaceEngineers.label": "Inżynierowie Kosmiczni",
     "workshop.spaceEngineers.desc": "Poprawia efektywność inżyniera",
     "workshop.spaceManufacturing.label": "Produkcja Kosmiczna",
-    "workshop.spaceManufacturing.desc": "Fabryki zapewniają bonus do wind kosmicznych i tablic orbitalnych",
     "workshop.starlink.label": "Gwiezdne łącze",
     "workshop.starlink.desc": "Każde Centrum Danych zapewni dodatkowy 1% bonus do Laboratoriów Biologicznych",
     "workshop.stasisChambers.label": "Komora Zastoju",
diff --git a/res/i18n/crowdin/ro.json b/res/i18n/crowdin/ro.json
index 513b119838..c620a3a252 100644
--- a/res/i18n/crowdin/ro.json
+++ b/res/i18n/crowdin/ro.json
@@ -125,7 +125,6 @@
     "space.planet.yarn.terraformingStation.label": "Stație de Terraformare",
     "stats.buildings": "Clădirile au fost construite",
     "stats.trades.current": "Comerturi terminate",
-    "time.cfu.temporalAccelerator.desc": "Îmbunătățește generarea energiei de flux cu 5%",
     "trade.race.zebras": "Zebre",
     "village.btn.hunters": "Trimite vanatori",
     "village.census.lbl.happiness": "Fericire",
diff --git a/res/i18n/crowdin/ru.json b/res/i18n/crowdin/ru.json
index 96b0f8c696..b938826544 100644
--- a/res/i18n/crowdin/ru.json
+++ b/res/i18n/crowdin/ru.json
@@ -209,7 +209,6 @@
     "buildings.workshop.desc": "Даёт доступ к мириаде улучшений. Плюс 6% к эффективности изготовления.",
     "buildings.workshop.flavor": "Работникам - бесплатные игрушки.",
     "buildings.zebraForge.label": "Печи зебр",
-    "buildings.zebraForge.desc": "Открывает создание кровавых камней и т-мифрила",
     "buildings.zebraOutpost.label": "Аванпост зебр",
     "buildings.zebraOutpost.desc": "Предоставляет базу для охотничьих экспедиций. Каждый уровень повышает эффективность экспедиции на 5%",
     "buildings.zebraWorkshop.label": "Мастерская зебр",
@@ -258,6 +257,8 @@
     "calendar.year.tooltip": "Год:",
     "challendge.panel.label": "Вызовы",
     "challendge.pending": "В процессе",
+    "challendge.reclaimReserves.label": "Восстановить запасы",
+    "challendge.reclaimReserves.desc": "Добывать ресурсы извне",
     "challendge.applyPending.desc": "Включите Вызовы/Условия, помеченные как Ожидающие решения",
     "challendge.1000Years.label": "1000 лет",
     "challendge.1000Years.desc": "Начни игру с половиной игрового времени.<br><br>Цель: Достичь года 1000",
@@ -277,12 +278,9 @@
     "challendge.ironWill.label": "Железная Воля",
     "challendge.ironWill.desc": "Железная Воля - это особый тип вызова. Его не нужно принимать здесь - просто играй без котят.",
     "challendge.ironWill.effect.desc": "Без эффекта",
-    "challendge.reclaimReserves.label": "Восстановить запасы",
-    "challendge.reclaimReserves.desc": "Добывать ресурсы извне",
     "challendge.winterIsComing.label": "Зима пришла",
     "challendge.winterIsComing.desc": "Начни партию с вечной зимой.<br><br>Цель: Доберись до Гелиоса.",
     "challendge.winterIsComing.effect.desc": "Погода в общем улучшится.",
-    "challendge.btn.chronosphere.desc": "Без бонусов от хроносфер",
     "challendge.btn.chronosphere.with.ironWill.desc": "Без бонусов от хроносфер.<br>ВНИМАНИЕ: бонус от хроносфер автоматически отменит Железную Волю",
     "challendge.btn.confirmation.title": "Подтверждение принятия вызова",
     "challendge.btn.confirmation.msg": "Принять этот вызов и начать новую партию?",
@@ -362,8 +360,8 @@
     "effectsMgr.statics.factoryCostReduction.title": "Снижение стоимости фабрик",
     "effectsMgr.statics.factoryRefineRatio.title": "Бонус к фабричной обработке нефти",
     "effectsMgr.statics.faithRatioReligion.title": "Бонус веры",
-    "effectsMgr.statics.festivalRatio.title": "Эффект фестиваля",
     "effectsMgr.statics.festivalArrivalRatio.title": "Скорость прибытия от фестиваля",
+    "effectsMgr.statics.festivalRatio.title": "Эффект фестиваля",
     "effectsMgr.statics.gflopsConsumption.title": "Переработка гигафлопов",
     "effectsMgr.statics.globalRelationsBonus.title": "Бонус отношений",
     "effectsMgr.statics.globalResourceRatio.title": "Бонус к максимуму ресурсов",
@@ -393,7 +391,6 @@
     "effectsMgr.statics.logHouseCostReduction.title": "Уменьшение цены хижин",
     "effectsMgr.statics.lumberMillRatio.title": "Бонус к лесопилке",
     "effectsMgr.statics.lunarOutpostRatio.title": "Бонус к лунным шахтам",
-    "effectsMgr.statics.luxuryConsuptionReduction.title": "Снижение потребления ресурсов роскоши",
     "effectsMgr.statics.luxuryHappinessBonus.title": "Бонус счастья ресурсов роскоши",
     "effectsMgr.statics.magnetoBoostRatio.title": "Генераторный бонус",
     "effectsMgr.statics.magnetoRatio.title": "Генераторный бонус к производству",
@@ -465,9 +462,9 @@
     "effectsMgr.statics.terraformingMaxKittens.title": "Бонус котятам при терраформации",
     "effectsMgr.statics.theocracyFaithProductionBonus.title": "Бонус производству веру",
     "effectsMgr.statics.timeImpedance.title": "Задержка временно́го штрафа",
+    "effectsMgr.statics.timeRatio.title": "Бонус к связанные со временем",
     "effectsMgr.statics.tradeCatpowerDiscount.title": "Скидка торгам в котосиле",
     "effectsMgr.statics.tradeGoldDiscount.title": "Скидка торгам в золоте",
-    "effectsMgr.statics.timeRatio.title": "Бонус к связанные со временем",
     "effectsMgr.statics.tradeRatio.title": "Коэффициент торговли",
     "effectsMgr.statics.umbraBoostRatio.title": "Бонус сборщикам ИХ",
     "effectsMgr.statics.unhappinessRatio.title": "Уменьшение недовольства",
@@ -627,7 +624,6 @@
     "policy.liberalism.label": "Либерализм",
     "policy.liberalism.desc": "Мирное и открытое общество. Улучшает отношения со всеми торговыми партнерами и здания стоят меньше золота.",
     "policy.liberty.label": "Свобода",
-    "policy.liberty.desc": "Подходит для больших, растущих обществ. Делит пополам пенальти от населения к счастью. Этот выбор повлияет на доступность дальнейших политик!",
     "policy.militarizeSpace.label": "Военизировать космос",
     "policy.militarizeSpace.desc": "Попытаться захватить небеса. Спутники дают на 10% больше бонуса к науке.",
     "policy.monarchy.label": "Монархия",
@@ -641,7 +637,6 @@
     "policy.outerSpaceTreaty.label": "Договор о космосе",
     "policy.outerSpaceTreaty.desc": "Согласиться что космос это общая территория всего населения Катта, улучшает отношения с торговыми партнерами.",
     "policy.radicalXenophobia.label": "Радикальная ксенофобия",
-    "policy.radicalXenophobia.desc": "Отвергнуть и злых чужих, и злых роботов. Святой геноцид эффективнее в два раза.",
     "policy.rationality.label": "Рациональность",
     "policy.rationality.desc": "Принять видение, что мир может быть фундаментально осознан. Получите небольшой бонус к производству науки и железа, однако будете выглядеть глупо в будущем.",
     "policy.republic.label": "Республика",
@@ -651,7 +646,6 @@
     "policy.spaceBasedTerraforming.label": "Космическое терраформирование",
     "policy.spaceBasedTerraforming.desc": "Запустите гигансткие зеркала в небо, улучшая стабильность работы солнечных панелей. Открывает космические зеркала.",
     "policy.stoicism.label": "Стоицизм",
-    "policy.stoicism.desc": "Стоики учат, что мы должны выдерживать испытания без жалоб. Потребление ресурсов роскоши уменьшено вдвое.",
     "policy.stripMining.label": "Открытое горное дело",
     "policy.stripMining.desc": "Срежьте горы в попытке улучшить производство минералов.",
     "policy.sustainability.label": "Устойчивость",
@@ -661,7 +655,6 @@
     "policy.theocracy.label": "Орден звёзд",
     "policy.theocracy.desc": "Ваши космонавты видели ужасающие вещи в далёких небесах. Позвольте жрецам захватить власть, с увеличением производства веры.",
     "policy.tradition.label": "Традиция",
-    "policy.tradition.desc": "Подходит для маленьких культурно-ориентированных обществ. Уменьшите стоимость рукописей и увеличьте их эффект. Этот выбор повлияет на доступность дальнейших политик!",
     "policy.transkittenism.label": "Транскошачество",
     "policy.transkittenism.desc": "Откажитесь от кошачества и слейтесь с ИИ. Ядра ИИ эффективнее в два раза, и у уровней ИИ нет негативных последствий.",
     "policy.zebraRelationsAppeasement.label": "Отношения с зебрами: успокоение",
@@ -792,7 +785,6 @@
     "religion.sacrificeBtn.desc": "Отправить единорогов обратно в их мир. Даёт слезу единорога за каждый зиккурат.",
     "religion.sacrificeBtn.sacrifice.msg": "{0} единорогов были пожертвованы. Получено слез единорога - {1}!",
     "religion.transcend.confirmation.title": "Взойти?",
-    "religion.transcend.confirmation.msg": "Отказаться от бонуса к молитвам?\n\nЭто приведет к росту уровня восхождения.\n\nКаждый следующий уровень требует пропорционально большего взноса.\n\nСброс не повлияет на уровни восхождения.\n\nНАЖАТИЕ НА ЭТУ КНОПКУ УБЕРЕТ ЧАСТЬ БОНУСА К МОЛИТВАМ.",
     "religion.transcend.msg.failure": "На шаг ближе: {0}%",
     "religion.transcend.msg.success": "Пределы смертных превзойдены. Уровень восхождения: {0}",
     "religion.transcendBtn.label": "Взойти",
@@ -802,7 +794,6 @@
     "religion.tu.blackCore.flavor": "Построено из костей жертвенных котят.",
     "religion.tu.blackLibrary.label": "Черная библиотека",
     "religion.tu.blackLibrary.desc": "Каждая черная библиотека улучшает эффект Кодекса Левиафанов на 2%. Это значение также улучшается кладбищами единорогов.",
-    "religion.tu.blackLibary.flavor": "Быть может, здесь специально слишком темно для чтения.",
     "religion.tu.blackNexus.label": "Чёрный Нексус",
     "religion.tu.blackNexus.desc": "Улучшает переработку кристаллов времени в реликвии.<br />Каждый черный фокус увеличит эффективность создания реликвий на количество черных пирамид.<br>Этот эффект также влияет на станции реликвий.",
     "religion.tu.blackNexus.flavor": "Глаз в небе.",
@@ -819,7 +810,6 @@
     "religion.tu.darkNova.desc": "Улучшит общее электрогенерацию на 2%",
     "religion.tu.darkNova.flavor": "Звезды мертвы. Как наши надежды и мечты.",
     "religion.tu.holyGenocide.label": "Святой Геноцид",
-    "religion.tu.holyGenocide.desc": "Не упадёт ни слезинки.",
     "religion.tu.holyGenocide.flavor": "Мы живём на тихом острове невежества среди чёрных морей безумия - и нам не предназначено заплывать далеко.",
     "religion.tu.singularity.label": "Горизонт событий",
     "religion.tu.singularity.desc": "Увеличивает все хранилища на 10%",
@@ -971,12 +961,9 @@
     "resources.zebras.title": "зебры",
     "resources.sorrow.full": "Чёрная жидкая печаль",
     "resources.sorrow.short": "Печаль",
-    "gift.get": "XOXOXO! Древние боги послали тебе подарок!",
-    "gift.repaire": "Древние боги починили твой подарок",
     "gift.resources": "Получен {0} {1}!",
     "gift.apocrypha": "Бонус апокрифе увеличен на {0}%!",
     "gift.transcendence": "Уровень восхождения увеличен на 4!",
-    "gift.metaphysics": "Разблокирован {0}!",
     "save.export.msg": "Экспорт удачен!",
     "save.import.confirmation.msg": "Точно? Это перезапишет твоё сохранение!",
     "save.import.msg": "Импорт удачен!",
@@ -1309,7 +1296,6 @@
     "time.cfu.ressourceRetrieval.label": "Восстановление ресурсов",
     "time.cfu.ressourceRetrieval.desc": "Восстановить часть годового запаса ресурсов при сжигании кристалла времени.",
     "time.cfu.temporalAccelerator.label": "Временно́й ускоритель",
-    "time.cfu.temporalAccelerator.desc": "Ускоряет генерацию временно́го потока на 5%",
     "time.cfu.temporalBattery.label": "Временнáя батарея",
     "time.cfu.temporalBattery.desc": "Улучшает хранилище временно́го потока на 25%",
     "time.cfu.temporalImpedance.label": "Сопротивление времени",
@@ -1402,8 +1388,6 @@
     "trade.bcoin.crash": "Разозлить Невидимую Чёрную Руку",
     "trade.bcoin.crash.desc": "Заставить рынок блэккоина рухнуть",
     "trade.correct.bcoin": "Произошла огромная коррекция на крипторынке",
-    "trade.embassy.open": "Открыть посольство",
-    "trade.embassy": "Уровень посольства ({0})",
     "trade.embassy.desc": "Улучшить ваши дипломатические отношения путём открытия посольства",
     "trade.embassy.pinned": "Закреплено",
     "trade.embassy.unpinned": "Откреплено",
@@ -1459,7 +1443,6 @@
     "ui.option.hide.bgimage": "Спрятать фоновое изображение <i>(для цветовых схем где имеется)</i>",
     "ui.option.tooltips.right": "Подсказки в правой части экрана",
     "ui.option.more": "Больше..",
-    "ui.option.no.confirm": "Без окон подтверждения для аврала, исследования политик или полной покупке/продаже (Shift-click)",
     "ui.option.iw.smelter": "Плавильни отключаются на 95% максимума в режиме Железной воли",
     "ui.option.disable.telemetry": "Отключить игровую телеметрию",
     "ui.option.enable.redshift": "Включить оффлайн прогресс",
@@ -1500,7 +1483,6 @@
     "console.filter.ivoryMeteor": "Костяные метеоры",
     "console.filter.unicornRift": "Порталы единорогов",
     "console.filter.alicornRift": "Порталы аликорнов",
-    "console.filter.tc": "Кристаллы времени",
     "console.filter.faith": "Вера",
     "village.bonus.desc.chemist": "Бонус к химическому изготовлению",
     "village.bonus.desc.engineer": "Бонус к изготовлению",
@@ -1723,7 +1705,6 @@
     "workshop.barges.label": "Баржи",
     "workshop.barges.desc": "Порты будут вмещать больше угля.",
     "workshop.biofuel.label": "Переработка биотоплива",
-    "workshop.biofuel.desc": "Биолаборатории станут конвертировать мяту в нефть.",
     "workshop.bolas.label": "Болеадорас",
     "workshop.bolas.desc": "Метательное оружие из тяжёлых камней. Охотники эффективнее в 2 раза.",
     "workshop.bolas.flavor": "Боевые клубки.",
@@ -1954,7 +1935,6 @@
     "workshop.spaceEngineers.label": "Космические инженеры",
     "workshop.spaceEngineers.desc": "Увеличивает эффективность инженеров.",
     "workshop.spaceManufacturing.label": "Космическое Производство",
-    "workshop.spaceManufacturing.desc": "Фабрики дают бонус космическим лифтам и орбитальным поясам.",
     "workshop.starlink.label": "Спутниковый канал связи",
     "workshop.starlink.desc": "Каждый ЦОД дает дополнительный 1% бонус биолабораториям",
     "workshop.stasisChambers.label": "Стазис-камеры",
diff --git a/res/i18n/crowdin/tr.json b/res/i18n/crowdin/tr.json
index cf32389a70..cba4adc14c 100644
--- a/res/i18n/crowdin/tr.json
+++ b/res/i18n/crowdin/tr.json
@@ -208,7 +208,6 @@
     "buildings.workshop.desc": "Çok çeşitli geliştirme seçenekleri sunar. Dönüşüm verimliliğini %6 artırır",
     "buildings.workshop.flavor": "Çalışanlara ücretsiz oyuncak imkanı",
     "buildings.zebraForge.label": "Zebra demirhanesi",
-    "buildings.zebraForge.desc": "Kan taşı ve t-mitril üretiminin kilidini açar",
     "buildings.zebraOutpost.label": "Zebra karakolu",
     "buildings.zebraOutpost.desc": "Av gezileri için bir üs sağlar. Her geliştirme seviyesi gezi verimliliğini %5 arttırır",
     "buildings.zebraWorkshop.label": "Zebra atölyesi",
@@ -257,6 +256,8 @@
     "calendar.year.tooltip": "Yıl:",
     "challendge.panel.label": "Meydan okumalar",
     "challendge.pending": "Bekliyor",
+    "challendge.reclaimReserves.label": "Rezervleri geri al",
+    "challendge.reclaimReserves.desc": "Kaynakları öteden geri kazan",
     "challendge.applyPending.label": "Bekleyen değişiklikleri uygula ({0})",
     "challendge.applyPending.desc": "Bekleyen meydan okumaları/Durumları hemen uygula",
     "challendge.1000Years.label": "1000 yıl",
@@ -277,12 +278,9 @@
     "challendge.ironWill.label": "Demir İrade",
     "challendge.ironWill.desc": "Demir irade biraz gizli bir meydan okumadır ve aktif etmek için tıklamak gerekmez: Sadece oyunu sıfırla ve kediler olmadan oyna.",
     "challendge.ironWill.effect.desc": "Hiçbir şey",
-    "challendge.reclaimReserves.label": "Rezervleri geri al",
-    "challendge.reclaimReserves.desc": "Kaynakları öteden geri kazan",
     "challendge.winterIsComing.label": "Kış geldi",
     "challendge.winterIsComing.desc": "Oyunu sadece kış mevsimleriyle yeniden başlatın. (Kedi nanesi Paragon üretim bonusundan faydalanmayacak)<br><br>Hedef: Helios'a ulaş.",
     "challendge.winterIsComing.effect.desc": "Sıcak mevsimler daha olası ve soğuk mevsimler daha az olası.",
-    "challendge.btn.chronosphere.desc": " Kronosferden sıfırlama bonusu kazanamazsınız.",
     "challendge.btn.chronosphere.with.ironWill.desc": " Kronosferden sıfırlama bonusu kazanamazsınız. <br> DİKKAT: Kronosferlerin sıfırlama bonusu otomatik olarak devre dışıdır.",
     "challendge.btn.confirmation.title": "Meydan okuma onayı",
     "challendge.btn.confirmation.msg": "Oyunu sıfırlayarak bu meydan okumayı başlatmak istediğinize emin misiniz?",
@@ -360,8 +358,8 @@
     "effectsMgr.statics.factoryCostReduction.title": "Fabrika maliyet indirimi",
     "effectsMgr.statics.factoryRefineRatio.title": "Fabrika arıtma bonusu",
     "effectsMgr.statics.faithRatioReligion.title": "İnanç bonusu",
-    "effectsMgr.statics.festivalRatio.title": "Festival etkileri",
     "effectsMgr.statics.festivalArrivalRatio.title": "Şenlik büyüme oranı",
+    "effectsMgr.statics.festivalRatio.title": "Festival etkileri",
     "effectsMgr.statics.globalRelationsBonus.title": "İlişki bonusu",
     "effectsMgr.statics.globalResourceRatio.title": "Maks kaynaklar bonusu",
     "effectsMgr.statics.goldCostReduction.title": "Altın masrafında azalma",
@@ -387,7 +385,6 @@
     "effectsMgr.statics.logHouseCostReduction.title": "Kütük ev maliyet azalımı",
     "effectsMgr.statics.lumberMillRatio.title": "Odunhane bonusu",
     "effectsMgr.statics.lunarOutpostRatio.title": "Ay üssü bonusu",
-    "effectsMgr.statics.luxuryConsuptionReduction.title": "Lüks tüketim azalımı",
     "effectsMgr.statics.luxuryHappinessBonus.title": "Lüks mutluluk bonusu",
     "effectsMgr.statics.magnetoBoostRatio.title": "Manyeto etkisinde artış",
     "effectsMgr.statics.magnetoRatio.title": "Üretim bonusu",
@@ -518,7 +515,6 @@
     "religion.faithCount.bonus": "1",
     "religion.faithCount.pool": "Dua:{0}",
     "religion.tu.blackCore.flavor": "Yavru kedi kurbanlarının kemikleriyle inşa edildi.",
-    "religion.tu.holyGenocide.desc": "Ve yaş dökülmez",
     "religion.zu.marker.label": "İşaretleyici",
     "res.stack.sharedKnowledge": "Paylaşılan bilgi",
     "resources.alloy.title": "alaşım",
diff --git a/res/i18n/crowdin/uk.json b/res/i18n/crowdin/uk.json
index af80d6ee72..3377c81d6e 100644
--- a/res/i18n/crowdin/uk.json
+++ b/res/i18n/crowdin/uk.json
@@ -362,7 +362,6 @@
     "resources.epiphany.title": "прозріння",
     "resources.wrappingPaper.title": "обгортковий папір",
     "resources.zebras.title": "зебри",
-    "gift.metaphysics": "Розблоковано {0}!",
     "save.export.msg": "Експорт збереження успішний!",
     "science.agriculture.label": "Сільське господарство",
     "science.animal.effectDesc": "牧草地のロックを解除",
diff --git a/res/i18n/crowdin/zh.json b/res/i18n/crowdin/zh.json
index 1a158c9613..a0b164920c 100644
--- a/res/i18n/crowdin/zh.json
+++ b/res/i18n/crowdin/zh.json
@@ -209,7 +209,6 @@
     "buildings.workshop.desc": "提供大量的可升级项。工艺制作效率提升 6%",
     "buildings.workshop.flavor": "猫玩具供员工免费使用",
     "buildings.zebraForge.label": "斑马锻造",
-    "buildings.zebraForge.desc": "解锁使用血石和秘银的工艺",
     "buildings.zebraOutpost.label": "斑马前哨",
     "buildings.zebraOutpost.desc": "为狩猎探险的队伍提供基地。每一级使狩猎探险的效率提升 5%",
     "buildings.zebraWorkshop.label": "斑马工坊",
@@ -258,6 +257,8 @@
     "calendar.year.tooltip": "日历年:",
     "challendge.panel.label": "挑战",
     "challendge.pending": "选中",
+    "challendge.reclaimReserves.label": "收回储备金",
+    "challendge.reclaimReserves.desc": "从外部回收资源",
     "challendge.applyPending.label": "应用选中挑战 ({0})",
     "challendge.applyPending.desc": "立即重置时间线，开始选定的挑战",
     "challendge.1000Years.label": "千禧年",
@@ -279,12 +280,9 @@
     "challendge.ironWill.label": "钢铁意志",
     "challendge.ironWill.desc": "钢铁意志是一个有点隐藏的挑战，你不需要点击这里就能进行:重启游戏，在没有小猫的情况下进行游戏",
     "challendge.ironWill.effect.desc": "什么都没有",
-    "challendge.reclaimReserves.label": "收回储备金",
-    "challendge.reclaimReserves.desc": "从外部回收资源",
     "challendge.winterIsComing.label": "冬天来了",
     "challendge.winterIsComing.desc": "重启游戏，只有冬天:猫薄荷不会受到领导力的生产加成<br><br>目标: 到达太阳",
     "challendge.winterIsComing.effect.desc": "温暖季节出现的机会增加，寒冷季节出现的机会减少",
-    "challendge.btn.chronosphere.desc": "你将不能获得超时空传送仪的重置效果",
     "challendge.btn.chronosphere.with.ironWill.desc": "你将不能获得超时空传送仪的重置效果。<br />警告:超时空传送仪的重置效果将自动关闭钢铁意志模式。",
     "challendge.btn.confirmation.title": "确认挑战",
     "challendge.btn.confirmation.msg": "你确定要重置当前游戏并开始此挑战吗?",
@@ -367,8 +365,8 @@
     "effectsMgr.statics.factoryCostReduction.title": "工厂成本降低",
     "effectsMgr.statics.factoryRefineRatio.title": "工厂炼油加成",
     "effectsMgr.statics.faithRatioReligion.title": "信仰加成",
-    "effectsMgr.statics.festivalRatio.title": "节日效果",
     "effectsMgr.statics.festivalArrivalRatio.title": "节日增加比率",
+    "effectsMgr.statics.festivalRatio.title": "节日效果",
     "effectsMgr.statics.gflopsConsumption.title": "GFlops 转化",
     "effectsMgr.statics.globalRelationsBonus.title": "关系加成",
     "effectsMgr.statics.globalResourceRatio.title": "资源上限加成",
@@ -398,7 +396,6 @@
     "effectsMgr.statics.logHouseCostReduction.title": "木屋成本降低",
     "effectsMgr.statics.lumberMillRatio.title": "木材厂加成",
     "effectsMgr.statics.lunarOutpostRatio.title": "月球前哨加成",
-    "effectsMgr.statics.luxuryConsuptionReduction.title": "奢侈品消耗降低",
     "effectsMgr.statics.luxuryHappinessBonus.title": "奢侈品幸福度加成",
     "effectsMgr.statics.magnetoBoostRatio.title": "磁电机增幅",
     "effectsMgr.statics.magnetoRatio.title": "生产加成",
@@ -475,9 +472,9 @@
     "effectsMgr.statics.terraformingMaxKittens.title": "星球改造站猫口上限加成",
     "effectsMgr.statics.theocracyFaithProductionBonus.title": "信仰生产加成",
     "effectsMgr.statics.timeImpedance.title": "时间惩罚延迟",
+    "effectsMgr.statics.timeRatio.title": "时间科技加成",
     "effectsMgr.statics.tradeCatpowerDiscount.title": "贸易所需喵力减少",
     "effectsMgr.statics.tradeGoldDiscount.title": "贸易所需黄金减少",
-    "effectsMgr.statics.timeRatio.title": "时间科技加成",
     "effectsMgr.statics.tradeRatio.title": "贸易比率",
     "effectsMgr.statics.umbraBoostRatio.title": "HR收割机加成",
     "effectsMgr.statics.unhappinessRatio.title": "不幸福度减少",
@@ -639,7 +636,6 @@
     "policy.liberalism.label": "自由主义",
     "policy.liberalism.desc": "和平开放的社会，提升与所有贸易伙伴的关系，并降低建筑所需黄金",
     "policy.liberty.label": "自由",
-    "policy.liberty.desc": "适合大型、广阔的社会。使猫口惩罚减半。这会影响未来政策方向!",
     "policy.militarizeSpace.label": "太空军事化",
     "policy.militarizeSpace.desc": "尝试接管天空。卫星对天文台的加成提升 10%",
     "policy.monarchy.label": "君主制",
@@ -653,7 +649,6 @@
     "policy.outerSpaceTreaty.label": "外层空间条约",
     "policy.outerSpaceTreaty.desc": "同意太空是喵星所有种族的共同领土。改善与所有贸易伙伴的关系",
     "policy.radicalXenophobia.label": "激进排外",
-    "policy.radicalXenophobia.desc": "排斥邪恶的外星人和机器人。神圣灭绝的效果翻倍",
     "policy.rationality.label": "理性",
     "policy.rationality.desc": "接受可以从根本上理解世界的观点，尽管以后看起来可能很蠢。获得轻微科学和钢铁产量加成",
     "policy.republic.label": "共和",
@@ -663,7 +658,6 @@
     "policy.spaceBasedTerraforming.label": "天基星球改造",
     "policy.spaceBasedTerraforming.desc": "在太空中放置巨型反射镜，提高太阳能发电站的一致性。解锁空间反射镜",
     "policy.stoicism.label": "斯多葛主义",
-    "policy.stoicism.desc": "禁欲主义者告诉我们应当无怨苦行。奢侈品消耗减半",
     "policy.stripMining.label": "露天采矿",
     "policy.stripMining.desc": "剖开山丘，提升矿物产出",
     "policy.sustainability.label": "可持续发展",
@@ -673,7 +667,6 @@
     "policy.theocracy.label": "星球秩序",
     "policy.theocracy.desc": "宇航员在遥远的太空看见了可怕的事物。让牧师接管，增加信仰产出",
     "policy.tradition.label": "传统",
-    "policy.tradition.desc": "适合小型文化导向社会。降低手稿价格并提高其效果。这会影响未来政策方向!",
     "policy.transkittenism.label": "超猫主义",
     "policy.transkittenism.desc": "放弃猫身，与 AI 融合。AI 核心的效率翻倍，并且 AI 等级不再有不利影响",
     "policy.zebraRelationsAppeasement.label": "斑马关系: 绥靖政策",
@@ -807,7 +800,6 @@
     "religion.sacrificeBtn.desc": "使独角兽回归独角兽的维度。每级庙塔会收到一滴独角兽眼泪",
     "religion.sacrificeBtn.sacrifice.msg": "{0} 只独角兽被献祭。你获得了 {1} 滴独角兽眼泪!",
     "religion.transcend.confirmation.title": "要进行次元超越吗?",
-    "religion.transcend.confirmation.msg": "确定要舍弃部分顿悟吗?\n\n通过牺牲一部分顿悟可以提升到新的超越等级。\n\n每个超越等级都将提升信仰转化为虔诚的效率。\n\n每次提升超越等级都需要牺牲更多的顿悟。\n\n此加成可以累积并在游戏重置时保留。\n\n点击此按钮将移除一部分顿悟和祈祷效率。",
     "religion.transcend.msg.failure": "更近一步: {0}%",
     "religion.transcend.msg.success": "超越了猫类的极限。达到超越等级: {0}",
     "religion.transcendBtn.label": "次元超越",
@@ -817,7 +809,6 @@
     "religion.tu.blackCore.flavor": "以活祭之猫的骸骨建造",
     "religion.tu.blackLibrary.label": "黑图书馆",
     "religion.tu.blackLibrary.desc": "每级黑图书馆使利维坦法典的效能提升 2%，此加成可被独角兽墓园进一步增益",
-    "religion.tu.blackLibary.flavor": "也许是被故意弄成黑到没法看书",
     "religion.tu.blackNexus.label": "黑之连结",
     "religion.tu.blackNexus.desc": "提高时间水晶精炼为遗物的产率。<br />每级黑之连结都会通过黑金字塔的等级提高遗物的精炼产率。<br>这项加成同样提升遗物站的效率",
     "religion.tu.blackNexus.flavor": "天空中的眼睛",
@@ -834,7 +825,6 @@
     "religion.tu.darkNova.desc": "全局能源产出提高 2%",
     "religion.tu.darkNova.flavor": "那颗星已经死了，就像我们的希望和梦想。",
     "religion.tu.holyGenocide.label": "神圣灭绝",
-    "religion.tu.holyGenocide.desc": "眼泪再也无法落下",
     "religion.tu.holyGenocide.flavor": "我们居住在黑暗的无限之海中一座名为无知的平静小岛，而这并不意味着我们应该远航。",
     "religion.tu.singularity.label": "黑洞视界",
     "religion.tu.singularity.desc": "全局资源存储上限提升 10%",
@@ -987,12 +977,9 @@
     "resources.zebras.title": "斑马",
     "resources.sorrow.full": "黑色悲伤液体",
     "resources.sorrow.short": "悲伤",
-    "gift.get": "XOXOXO! 上古神送给你一个礼物盒!",
-    "gift.repaire": "上古神修好了你的礼物盒",
     "gift.resources": "获得 {1} 个 {0}!",
     "gift.apocrypha": "新月外传加成增加 {0}%!",
     "gift.transcendence": "超越等级增加 4!",
-    "gift.metaphysics": "解锁 {0}!",
     "save.export.msg": "存档导出成功!",
     "save.import.confirmation.msg": "确定吗?这样做会覆盖你当前游戏数据!",
     "save.import.msg": "存档导入成功!",
@@ -1325,7 +1312,6 @@
     "time.cfu.ressourceRetrieval.label": "资源回复",
     "time.cfu.ressourceRetrieval.desc": "燃烧时间水晶时获得一部分每年原应产出的资源",
     "time.cfu.temporalAccelerator.label": "时空加速器",
-    "time.cfu.temporalAccelerator.desc": "时间通量的产量提升 5%",
     "time.cfu.temporalBattery.label": "时间电池",
     "time.cfu.temporalBattery.desc": "时间通量的容量提升 25%",
     "time.cfu.temporalImpedance.label": "时间阻抗",
@@ -1419,8 +1405,6 @@
     "trade.bcoin.crash": "惹怒看不见的黑手",
     "trade.bcoin.crash.desc": "迫使黑币市场崩溃",
     "trade.correct.bcoin": "加密货币市场出现了巨大的调整",
-    "trade.embassy.open": "设立大使馆",
-    "trade.embassy": "大使馆等级 ({0})",
     "trade.embassy.desc": "设立大使馆，改善外交关系",
     "trade.embassy.pinned": "固定",
     "trade.embassy.unpinned": "取消固定",
@@ -1476,7 +1460,6 @@
     "ui.option.hide.bgimage": "隐藏背景图片",
     "ui.option.tooltips.right": "移动提示窗到右侧",
     "ui.option.more": "更多设置..",
-    "ui.option.no.confirm": "清除所有工作或全部出售时无需确认(Shift+单击)",
     "ui.option.iw.smelter": "钢铁意志模式下，铁储量不足95%时关闭熔炉",
     "ui.option.disable.telemetry": "禁用游戏遥测",
     "ui.option.enable.redshift": "启用离线进度",
@@ -1521,7 +1504,6 @@
     "console.filter.ivoryMeteor": "象牙流星",
     "console.filter.unicornRift": "独角兽裂隙",
     "console.filter.alicornRift": "天角兽裂隙",
-    "console.filter.tc": "时间水晶",
     "console.filter.faith": "信仰",
     "village.bonus.desc.chemist": "化学工艺制作加成",
     "village.bonus.desc.engineer": "工艺制作加成",
@@ -1758,7 +1740,6 @@
     "workshop.barges.label": "驳船",
     "workshop.barges.desc": "港口可以储存更多的煤",
     "workshop.biofuel.label": "生物燃料加工",
-    "workshop.biofuel.desc": "生物实验室将猫薄荷转化为石油",
     "workshop.bolas.label": "投石索",
     "workshop.bolas.desc": "用沉重的石块制作的投掷武器。猎人的狩猎效率增至 2 倍",
     "workshop.bolas.flavor": "变成武器的毛线团",
@@ -1990,7 +1971,6 @@
     "workshop.spaceEngineers.label": "空间工程师",
     "workshop.spaceEngineers.desc": "提高工程师的工作效率",
     "workshop.spaceManufacturing.label": "太空制造",
-    "workshop.spaceManufacturing.desc": "工厂为太空电梯和轨道阵列提供加成",
     "workshop.starlink.label": "星链",
     "workshop.starlink.desc": "每级数据中心为生物实验室提供额外 1％ 的加成",
     "workshop.stasisChambers.label": "静止室",
diff --git a/res/i18n/crowdin/zht.json b/res/i18n/crowdin/zht.json
index ec08dc2b17..82dfff9764 100644
--- a/res/i18n/crowdin/zht.json
+++ b/res/i18n/crowdin/zht.json
@@ -209,7 +209,6 @@
     "buildings.workshop.desc": "提供大量的可升級項目。工藝製作效率提升 6%",
     "buildings.workshop.flavor": "貓玩具提供給員工免費使用",
     "buildings.zebraForge.label": "斑馬鍛造",
-    "buildings.zebraForge.desc": "解鎖使用血石和秘銀的工藝",
     "buildings.zebraOutpost.label": "斑馬前哨",
     "buildings.zebraOutpost.desc": "為狩獵探險的隊伍提供基地。每一級使狩獵探險的效率提升 5%",
     "buildings.zebraWorkshop.label": "斑馬工坊",
@@ -258,6 +257,8 @@
     "calendar.year.tooltip": "年份：",
     "challendge.panel.label": "挑戰",
     "challendge.pending": "選中",
+    "challendge.reclaimReserves.label": "取回存儲資源",
+    "challendge.reclaimReserves.desc": "從外部回收資源",
     "challendge.applyPending.label": "应用选中的变更 ({0})",
     "challendge.applyPending.desc": "立即重置時間線，開始選定的挑戰",
     "challendge.1000Years.label": "千禧年",
@@ -279,12 +280,9 @@
     "challendge.ironWill.label": "鋼鐵意志",
     "challendge.ironWill.desc": "鋼鐵意志是一個有點隱藏的挑戰，你不需要點擊這裡就能進行：重置遊戲，在沒有小貓的情況下進行遊戲。",
     "challendge.ironWill.effect.desc": "什麼都沒有",
-    "challendge.reclaimReserves.label": "取回存儲資源",
-    "challendge.reclaimReserves.desc": "從外部回收資源",
     "challendge.winterIsComing.label": "冬天來了",
     "challendge.winterIsComing.desc": "重置遊戲，只有冬天（貓薄荷不會受到領導力的加成）。<br><br>目標：到達太陽。",
     "challendge.winterIsComing.effect.desc": "溫暖季節出現的機會增加，寒冷季節出現的機會減少。",
-    "challendge.btn.chronosphere.desc": " 你將不能獲得超時空傳送儀的重置效果。",
     "challendge.btn.chronosphere.with.ironWill.desc": " 你將不能獲得超時空傳送儀的重置效果。<br />警告：超時空傳送儀的重置效果將自動關閉鋼鐵意志模式。",
     "challendge.btn.confirmation.title": "確認挑戰",
     "challendge.btn.confirmation.msg": "你確定要重置當前遊戲並開始此挑戰嗎？",
@@ -367,8 +365,8 @@
     "effectsMgr.statics.factoryCostReduction.title": "工廠成本降低",
     "effectsMgr.statics.factoryRefineRatio.title": "工廠提煉加成",
     "effectsMgr.statics.faithRatioReligion.title": "信仰加成",
-    "effectsMgr.statics.festivalRatio.title": "節日效果",
     "effectsMgr.statics.festivalArrivalRatio.title": "節日增加比率",
+    "effectsMgr.statics.festivalRatio.title": "節日效果",
     "effectsMgr.statics.gflopsConsumption.title": "GFlops轉化",
     "effectsMgr.statics.globalRelationsBonus.title": "關係加成",
     "effectsMgr.statics.globalResourceRatio.title": "資源上限加成",
@@ -398,7 +396,6 @@
     "effectsMgr.statics.logHouseCostReduction.title": "木屋成本降低",
     "effectsMgr.statics.lumberMillRatio.title": "伐木場加成",
     "effectsMgr.statics.lunarOutpostRatio.title": "月球前哨加成",
-    "effectsMgr.statics.luxuryConsuptionReduction.title": "奢侈品消耗降低",
     "effectsMgr.statics.luxuryHappinessBonus.title": "奢侈品幸福度加成",
     "effectsMgr.statics.magnetoBoostRatio.title": "磁電機增幅",
     "effectsMgr.statics.magnetoRatio.title": "生產加成",
@@ -475,9 +472,9 @@
     "effectsMgr.statics.terraformingMaxKittens.title": "星球改造站貓口上限加成",
     "effectsMgr.statics.theocracyFaithProductionBonus.title": "信仰生產加成",
     "effectsMgr.statics.timeImpedance.title": "時間懲罰延遲",
+    "effectsMgr.statics.timeRatio.title": "時間科技加成",
     "effectsMgr.statics.tradeCatpowerDiscount.title": "貿易所需喵力減少",
     "effectsMgr.statics.tradeGoldDiscount.title": "貿易所需黃金減少",
-    "effectsMgr.statics.timeRatio.title": "時間科技加成",
     "effectsMgr.statics.tradeRatio.title": "貿易比率",
     "effectsMgr.statics.umbraBoostRatio.title": "HR收割機加成",
     "effectsMgr.statics.unhappinessRatio.title": "不幸福度減少",
@@ -639,7 +636,6 @@
     "policy.liberalism.label": "自由主義",
     "policy.liberalism.desc": "和平開放的社會，提升與所有貿易夥伴的關係，並降低建築所需黃金。",
     "policy.liberty.label": "自由",
-    "policy.liberty.desc": "適合大型、廣闊的社會。使貓口懲罰減半。這會影響未來政策方向！",
     "policy.militarizeSpace.label": "太空軍事化",
     "policy.militarizeSpace.desc": "嘗試接管天空。衛星對天文台的加成提升 10%",
     "policy.monarchy.label": "君主制",
@@ -653,7 +649,6 @@
     "policy.outerSpaceTreaty.label": "外太空條約",
     "policy.outerSpaceTreaty.desc": "同意太空是喵星所有種族的共同領土。改善與所有貿易夥伴的關係。",
     "policy.radicalXenophobia.label": "激進排外",
-    "policy.radicalXenophobia.desc": "排斥邪惡的外星人和機器人。神聖滅絕的效果翻倍。",
     "policy.rationality.label": "理性",
     "policy.rationality.desc": "接受可以從根本上理解世界的觀點，儘管以後看起來可能很蠢。獲得輕微科學和鋼鐵產量加成。",
     "policy.republic.label": "共和",
@@ -663,7 +658,6 @@
     "policy.spaceBasedTerraforming.label": "天基星球改造",
     "policy.spaceBasedTerraforming.desc": "在太空中放置巨型反射鏡，提高太陽能發電站的一致性。解鎖空間反射鏡。",
     "policy.stoicism.label": "斯多葛主義",
-    "policy.stoicism.desc": "禁慾主義者告訴我們應當無怨苦行。奢侈品消耗減半。",
     "policy.stripMining.label": "露天採礦",
     "policy.stripMining.desc": "開墾山丘，提升礦物產出。",
     "policy.sustainability.label": "可持續發展",
@@ -673,7 +667,6 @@
     "policy.theocracy.label": "星球秩序",
     "policy.theocracy.desc": "宇航員在遙遠的太空看見了可怕的事物。讓牧師接管，增加信仰產出。",
     "policy.tradition.label": "傳統",
-    "policy.tradition.desc": "適合小型文化導向社會。降低手稿價格並提高其效果。這會影響未來政策方向！",
     "policy.transkittenism.label": "超貓主義",
     "policy.transkittenism.desc": "放棄貓身，與 AI 融合。 AI 核心的效率翻倍，並且 AI 等級不再有不利影響。",
     "policy.zebraRelationsAppeasement.label": "斑馬關係：綏靖政策",
@@ -807,7 +800,6 @@
     "religion.sacrificeBtn.desc": "讓獨角獸回歸獨角獸的維度。 每個廟塔會讓你收到一滴獨角獸眼淚。",
     "religion.sacrificeBtn.sacrifice.msg": "{0} 隻獨角獸被獻祭，你獲得了 {1} 份獨角獸眼淚！",
     "religion.transcend.confirmation.title": "要進行次元超越嗎？",
-    "religion.transcend.confirmation.msg": "確定要捨棄部分頓悟嗎?\n\n通過犧牲一部分頓悟可以提升到新的超越等級。\n\n每個超越等級都將提升信仰轉化為虔誠的效率。\n\n每次提升超越等級都需要犧牲更多的頓悟。\n\n此加成可以累積並在遊戲重置時保留。\n\n點擊此按鈕將移除一部分頓悟和祈禱效率。",
     "religion.transcend.msg.failure": "更近一步：{0} %",
     "religion.transcend.msg.success": "超越了貓族的極限。達到超越等級：{0}",
     "religion.transcendBtn.label": "次元超越",
@@ -817,7 +809,6 @@
     "religion.tu.blackCore.flavor": "以被活祭的貓之骸骨建造。",
     "religion.tu.blackLibrary.label": "黑圖書館",
     "religion.tu.blackLibrary.desc": "每級黑圖書館使利維坦法典的效能提升 2%，此加成可被獨角獸墓園進一步增益。",
-    "religion.tu.blackLibary.flavor": "也許是被故意弄成黑到沒法看書。",
     "religion.tu.blackNexus.label": "黑之連結",
     "religion.tu.blackNexus.desc": "提高時間水晶提煉為遺物的產量。 <br />每級黑之連結都會通過黑金字塔的等級提高遺物的提煉產量。 <br>這項加成同樣提升遺物站的效率",
     "religion.tu.blackNexus.flavor": "天空中的眼睛",
@@ -834,7 +825,6 @@
     "religion.tu.darkNova.desc": "全域能源產出提高 2%",
     "religion.tu.darkNova.flavor": "星星們都死了。就像我們的希望和夢想。",
     "religion.tu.holyGenocide.label": "神聖滅絕",
-    "religion.tu.holyGenocide.desc": "眼淚再也不會落下",
     "religion.tu.holyGenocide.flavor": "我們居住在黑暗的無限之海中一座名為無知的平靜小島，而這並不意味著我們應該遠航。",
     "religion.tu.singularity.label": "黑洞視界",
     "religion.tu.singularity.desc": "全局資源存儲上限提升 10%",
@@ -987,12 +977,9 @@
     "resources.zebras.title": "斑馬",
     "resources.sorrow.full": "黑色悲傷液體",
     "resources.sorrow.short": "黑色液體悲傷（BLS）",
-    "gift.get": "XOXOXO! 上古神送給你一個禮物盒!",
-    "gift.repaire": "上古神修好了你的禮物盒",
     "gift.resources": "獲得 {1} 個 {0}!",
     "gift.apocrypha": "新約外傳獎勵增加 {0}%!",
     "gift.transcendence": "超越等級增加 4!",
-    "gift.metaphysics": "解鎖 {0}!",
     "save.export.msg": "匯出存檔成功!",
     "save.import.confirmation.msg": "確定嗎?這樣做會覆蓋你目前的遊戲存檔!",
     "save.import.msg": "導入存檔成功!",
@@ -1325,7 +1312,6 @@
     "time.cfu.ressourceRetrieval.label": "資源恢復",
     "time.cfu.ressourceRetrieval.desc": "當你燃燒TC的時候恢復你的年度資源的一部分，",
     "time.cfu.temporalAccelerator.label": "時間加速器",
-    "time.cfu.temporalAccelerator.desc": "時間通量的產量提升 5%",
     "time.cfu.temporalBattery.label": "時間電池",
     "time.cfu.temporalBattery.desc": "時間通量的容量提升 25%",
     "time.cfu.temporalImpedance.label": "時間阻抗",
@@ -1692,7 +1678,6 @@
     "workshop.barges.label": "駁船",
     "workshop.barges.desc": "港口可以儲存更多的煤炭",
     "workshop.biofuel.label": "生物燃料製作",
-    "workshop.biofuel.desc": "生物實驗室能夠將貓薄荷轉化為石油",
     "workshop.bolas.label": "套牛繩",
     "workshop.bolas.desc": "由沉重的石頭組成的投擲武器. 獵人效率提升至 兩倍",
     "workshop.bolas.flavor": "線繩製成的武器",
@@ -1923,7 +1908,6 @@
     "workshop.spaceEngineers.label": "太空工程師",
     "workshop.spaceEngineers.desc": "提高工程師的有效性",
     "workshop.spaceManufacturing.label": "太空製造業",
-    "workshop.spaceManufacturing.desc": "工廠向空間電梯和軌道陣列提供加成",
     "workshop.starlink.label": "星鏈",
     "workshop.starlink.desc": "每級數據中心為生物實驗室提供額外 1％ 的加成",
     "workshop.stasisChambers.label": "停滯間",

From 93d4f18fa9889d266460ec0f1958b129d650fcf2 Mon Sep 17 00:00:00 2001
From: Pedro Zunino <pedrozunino7@gmail.com>
Date: Sun, 29 Oct 2023 17:00:22 +0000
Subject: [PATCH 37/63] Merged in feat/move-queue-items (pull request #1242)

fix: parse string queue indices

* fix: parse string queue indices
---
 js/jsx/queue.jsx.js | 3 ++-
 js/time.js          | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/js/jsx/queue.jsx.js b/js/jsx/queue.jsx.js
index 9525d6887f..00da7c3ae1 100644
--- a/js/jsx/queue.jsx.js
+++ b/js/jsx/queue.jsx.js
@@ -182,7 +182,8 @@ WQueue = React.createClass({
         var queueManager = self.state.game.time.queue;
         var queueItems = queueManager.queueItems;
         
-        for (var i in queueItems){
+        for (var index in queueItems){
+            var i = parseInt(index);
             var item = queueItems[i];
             items.push($r(WQueueItem, {
                 item: item,
diff --git a/js/time.js b/js/time.js
index 89d15cabfb..63f0b5d8cf 100644
--- a/js/time.js
+++ b/js/time.js
@@ -1789,7 +1789,6 @@ dojo.declare("classes.queue.manager", null,{
      * @returns true if element was moved successfully and false otherwise
      */
     pushBack: function(index){
-        console.log("pushback", index);
         if (index < 0 || index >= this.queueItems.length - 1 ){
             console.warn("queue#remove - invalid index", index);
             return false;
@@ -1809,7 +1808,6 @@ dojo.declare("classes.queue.manager", null,{
      * @returns true if element was moved successfully and false otherwise
      */
     pushFront: function(index){
-        console.log("pushfront", index);
         if (index < 1 || index >= this.queueItems.length){
             console.warn("queue#remove - invalid index", index);
             return false;

From 89688e7b1ff0f09e01f89ded1e95521dc435abbb Mon Sep 17 00:00:00 2001
From: Ziggurat <ziggurat0001@protonmail.com>
Date: Sun, 29 Oct 2023 21:34:02 +0000
Subject: [PATCH 38/63] Merged in master (pull request #1244)

Master

* this might make a merge conflict later but I do not think it will make anything worse than it already is

* Merged bloodrizer/kitten-game:master into AZiggurat/kitten-game-ziggurats-fork:master
* Merged bloodrizer/kitten-game:master into AZiggurat/kitten-game-ziggurats-fork:master
* fix siphoning not using necrocornsNaiveFastForward
fix bug where corruption is multiplied by days and divided by ticks per day for comparison of necrocorn per day values in necrocornFastForward
---
 js/jsx/queue.jsx.js | 3 ++-
 js/time.js          | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/js/jsx/queue.jsx.js b/js/jsx/queue.jsx.js
index 9525d6887f..00da7c3ae1 100644
--- a/js/jsx/queue.jsx.js
+++ b/js/jsx/queue.jsx.js
@@ -182,7 +182,8 @@ WQueue = React.createClass({
         var queueManager = self.state.game.time.queue;
         var queueItems = queueManager.queueItems;
         
-        for (var i in queueItems){
+        for (var index in queueItems){
+            var i = parseInt(index);
             var item = queueItems[i];
             items.push($r(WQueueItem, {
                 item: item,
diff --git a/js/time.js b/js/time.js
index 89d15cabfb..63f0b5d8cf 100644
--- a/js/time.js
+++ b/js/time.js
@@ -1789,7 +1789,6 @@ dojo.declare("classes.queue.manager", null,{
      * @returns true if element was moved successfully and false otherwise
      */
     pushBack: function(index){
-        console.log("pushback", index);
         if (index < 0 || index >= this.queueItems.length - 1 ){
             console.warn("queue#remove - invalid index", index);
             return false;
@@ -1809,7 +1808,6 @@ dojo.declare("classes.queue.manager", null,{
      * @returns true if element was moved successfully and false otherwise
      */
     pushFront: function(index){
-        console.log("pushfront", index);
         if (index < 1 || index >= this.queueItems.length){
             console.warn("queue#remove - invalid index", index);
             return false;

From 7e38fd6b161eaa095f2d272bc340dabaa8ea51d8 Mon Sep 17 00:00:00 2001
From: Ziggurat <ziggurat0001@protonmail.com>
Date: Sun, 29 Oct 2023 22:01:27 +0000
Subject: [PATCH 39/63] Merged in dev/beta (pull request #1243)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Dev/beta

* Merged in automationDescriptions (pull request #1231)

Automation Descriptions

Approved-by: Arima B.
* tweaking spaceport scaling

* fix unit test

* reducing spaceport effect even further

* Merged in spaceportBalancing (pull request #1233)

Increased Spaceport effect, decreased power consumption

* Increased Spaceport effect, decreased power consumption


Approved-by: Arima B.
* Merged in dev/beta (pull request #1238)

master -> Dev/beta

* small siphoning ui fixes, siphoning description change and adding totalPerDayDelta for alicorns

* improve description

* Merged in master (pull request #1225)

Siphoning and pacts ui improvements
* fix siphoning not using necrocornsNaiveFastForward
fix bug where corruption is multiplied by days and divided by ticks per day for comparison of necrocorn per day values in necrocornFastForward

* Merged in master (pull request #1234)

Redshift pacts logic bugfixes

* fix siphoning not using necrocornsNaiveFastForward
fix bug where corruption is multiplied by days and divided by ticks per day for comparison of necrocorn per day values in necrocornFastForward
* Merged in Ziggurat/set-queue_redshift-flag-to-true-on-main-1698452752943 (pull request #1237)

set QUEUE_REDSHIFT flag to true on main
* Merged bloodrizer/kitten-game:master into AZiggurat/kitten-game-ziggurats-fork:master
* Merged bloodrizer/kitten-game:dev/beta into AZiggurat/kitten-game-ziggur…
* Merged in dev/beta (pull request #1240)

Dev/beta (master -> beta)

* small siphoning ui fixes, siphoning description change and adding totalPerDayDelta for alicorns

* get rid of debug things

* improve description

* Merged in master (pull request #1225)

Siphoning and pacts ui improvements
* fix siphoning not using necrocornsNaiveFastForward
fix bug where corruption is multiplied by days and divided by ticks per day for comparison of necrocorn per day values in necrocornFastForward

* Merged in master (pull request #1234)

Redshift pacts logic bugfixes

* fix siphoning not using necrocornsNaiveFastForward
fix bug where corruption is multiplied by days and divided by ticks per day for comparison of necrocorn per day values in necrocornFastForward
* Merged in Ziggurat/set-queue_redshift-flag-to-true-on-main-1698452752943 (pull request #1237)

set QUEUE_REDSHIFT flag to true on main
* Merged bloodrizer/kitten-game:master into AZiggurat/kitten-game-ziggurats-fork:master
* Merged bloodrizer/kitten-game:dev/beta…
* Merged in feat/move-queue-items (pull request #1236)

feat: rearrange queue items

* feat: rearrange queue items
* Merged in bsk/emptySky (pull request #1229)

Sattelite penalty under repeated BSK

* Sattelite penalty under repeated BSK


Approved-by: Brent Call
* Merged in feat/move-queue-items (pull request #1242)

fix: parse string queue indices

* fix: parse string queue indices

From e056cd2d809fbd8b24fbddb139a468e2df5fc1ef Mon Sep 17 00:00:00 2001
From: bloodrizer <cheshire.panther@gmail.com>
Date: Sun, 29 Oct 2023 15:33:28 -0700
Subject: [PATCH 40/63] safety switches

---
 js/jsx/queue.jsx.js | 12 +++++++++---
 js/time.js          |  7 +++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/js/jsx/queue.jsx.js b/js/jsx/queue.jsx.js
index 00da7c3ae1..8f448a43b8 100644
--- a/js/jsx/queue.jsx.js
+++ b/js/jsx/queue.jsx.js
@@ -45,7 +45,7 @@ WQueueItem = React.createClass({
         //TODO: attach tooltip as if it is a button
         return $r("div", {}, 
         [
-            "[" + item.type + "][" + item.name + "] - ", 
+            "[" + item.type + "] - ", 
             $r("span", {ref:"itemLabel", className:"queue-label"}, item.label),
             (
                 item.value ? (" " + item.value ) : ""
@@ -182,9 +182,15 @@ WQueue = React.createClass({
         var queueManager = self.state.game.time.queue;
         var queueItems = queueManager.queueItems;
         
-        for (var index in queueItems){
-            var i = parseInt(index);
+        for (var i = 0; i < queueItems.length; i++){
             var item = queueItems[i];
+
+            //null element safe switch
+            if (!item){
+                items.push($r("div", {}, "<unknown>"));
+                continue;
+            }
+
             items.push($r(WQueueItem, {
                 item: item,
                 index: i,
diff --git a/js/time.js b/js/time.js
index 63f0b5d8cf..36cbb9d145 100644
--- a/js/time.js
+++ b/js/time.js
@@ -2173,6 +2173,13 @@ dojo.declare("classes.queue.manager", null,{
         }
         var el = this.queueItems[0];
 
+        if (!el){
+            console.warn("null queue item, skipping");
+            this.queueItems.shift();
+            this.game._publish("ui/update", this.game);
+            return;
+        }
+
         var itemMetaRaw = this.game.getUnlockByName(el.name, el.type);
         var compare = "val"; //we should do some sort of refractoring of the switch mechanism
 

From fe4ee03e3e6c4c6354f4a368a5ecf12e6f47dc00 Mon Sep 17 00:00:00 2001
From: bloodrizer <cheshire.panther@gmail.com>
Date: Sun, 29 Oct 2023 19:40:10 -0700
Subject: [PATCH 41/63] switching redhift queue off for mainline

---
 game.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/game.js b/game.js
index f4938dcb41..6ea7bb3b93 100644
--- a/game.js
+++ b/game.js
@@ -1833,8 +1833,8 @@ dojo.declare("com.nuclearunicorn.game.ui.GamePage", null, {
 		},
 		QUEUE_REDSHIFT: {
 			beta: true,
-			main: true,
-			mobile: true
+			main: false,
+			mobile: false
 		}
 	},
 

From 41fab88ea32c51deb44fd7f8a2f5cf6c17e87e3b Mon Sep 17 00:00:00 2001
From: Brent Call <tnerbcall@gmail.com>
Date: Mon, 30 Oct 2023 19:12:57 +0000
Subject: [PATCH 42/63] Merged in fixQueueRedshift (pull request #1245)

Fix Queue Redshift

* Fix issue with negative resource production, fix issue with null queue items

* Don't register undo changes when we fail to build something in the Bonfire tab

* Re-enable queue redshift for mainline

* Allow adding new items to queue even if queue has nulls in it
---
 game.js         |  4 ++--
 js/buildings.js |  3 +++
 js/time.js      | 42 +++++++++++++++++++++++++++++++++---------
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/game.js b/game.js
index 6ea7bb3b93..f4938dcb41 100644
--- a/game.js
+++ b/game.js
@@ -1833,8 +1833,8 @@ dojo.declare("com.nuclearunicorn.game.ui.GamePage", null, {
 		},
 		QUEUE_REDSHIFT: {
 			beta: true,
-			main: false,
-			mobile: false
+			main: true,
+			mobile: true
 		}
 	},
 
diff --git a/js/buildings.js b/js/buildings.js
index 092dd156b7..5c647f2ce6 100644
--- a/js/buildings.js
+++ b/js/buildings.js
@@ -2864,6 +2864,9 @@ dojo.declare("classes.ui.btn.BuildingBtnModernController", com.nuclearunicorn.ga
 
     build: function(model, opts){
 		var counter = this.inherited(arguments);
+		if (!counter) {
+			return; //Skip stats & undo if nothing was built
+		}
 
 		//update stats
 		this.game.stats.getStat("buildingsConstructed").val += counter;
diff --git a/js/time.js b/js/time.js
index 36cbb9d145..3a7238a3aa 100644
--- a/js/time.js
+++ b/js/time.js
@@ -240,6 +240,7 @@ dojo.declare("classes.managers.TimeManager", com.nuclearunicorn.core.TabManager,
             daysOffset = offset;
         }
         if(this.game.getFeatureFlag("QUEUE_REDSHIFT")){
+            //console.log( "Calculating queue redshift for the following queue:", this.queue.queueItems );
             var result = this.queue.getFirstItemEtaDay();
             var daysOffsetLeft = daysOffset;
             var redshiftQueueWorked = true;
@@ -256,6 +257,13 @@ dojo.declare("classes.managers.TimeManager", com.nuclearunicorn.core.TabManager,
                 }
                 if (result[1] & redshiftQueueWorked){
                     var daysNeeded = result[0];// + 5; //let's have a little bit more days in case steamwork automation messes things up.
+                    if (daysNeeded < 1) {
+                        //There are legitimate cases in which the number of days needed would be less than 1.
+                        //However, if we were to allow daysNeeded to be 0, there'd be risk of an infinite loop,
+                        //so we set the minimum value to 1.
+                        //console.log( "Estimated days needed for queue item", this.queue.queueItems[ 0 ], "is too small; setting to a minimum value." );
+                        daysNeeded = 1;
+                    }
                     daysNeeded /= (this.game.calendar.daysPerSeason * this.game.calendar.seasonsPerYear);
                     daysNeeded = Math.ceil(daysNeeded);
                     daysNeeded *= (this.game.calendar.daysPerSeason * this.game.calendar.seasonsPerYear);
@@ -277,6 +285,7 @@ dojo.declare("classes.managers.TimeManager", com.nuclearunicorn.core.TabManager,
                 }
             }
             numberEvents = this.game.calendar.fastForward(daysOffset);
+            //console.log( "Queue redshift calculations finished.  This is the new queue:", this.queue.queueItems );
         }
         else{
             numberEvents = this.applyRedshift(daysOffset);
@@ -1593,6 +1602,11 @@ dojo.declare("classes.queue.manager", null,{
         }
         var eta = 0;
         var element = this.queueItems[0];
+        if (!element) {
+            //This is probably a null queue item.  Treat it as if it were a valid building that can be built for free.
+            //Later on when we update the queue, this null item should be removed & we'll go on to the next.
+            return [0, true];
+        }
         var modelElement = this.getQueueElementModel(element);
         var prices = modelElement.prices;
         var engineersConsumed = this.game.workshop.getConsumptionEngineers();
@@ -1600,17 +1614,20 @@ dojo.declare("classes.queue.manager", null,{
             var price = prices[ind];
             var res = this.game.resPool.get(price.name);
 		    if (res.value >= price.val){
+                //We already have enough of this resource.
                 continue;
             }
             if (res.maxValue < price.val){
+                //We don't have enough storage space to ever be able to afford the price.
                 return [eta, false];
             }
             var resPerTick = this.game.getResourcePerTick(res.name, true);
-            if (!resPerTick) {
-                return [eta, false];
-            }
             var engineersProduced = this.game.workshop.getEffectEngineer(res.name, true);
             var deltaPerTick = resPerTick + (engineersConsumed[res.name] || 0)+ engineersProduced;
+            if (deltaPerTick <= 0) {
+                //We are losing this resource over time (or not producing any), so we'll never be able to afford the price.
+                return [eta, false];
+            }
             eta = Math.max(eta,
             (price.val - res.value) / (deltaPerTick) / this.game.calendar.ticksPerDay
             );
@@ -1710,9 +1727,12 @@ dojo.declare("classes.queue.manager", null,{
      * */
     queueLength: function(){
         var length = 0;
-        for (var i in this.queueItems){
-            length += (this.queueItems[i].value || 1);
-        }
+        dojo.forEach(this.queueItems, function(item) {
+            if(item) {
+                length += item.value || 1;
+            }
+            //Else, the item is null or invalid, so don't count it.
+        });
         return length;
     },
 
@@ -1727,12 +1747,13 @@ dojo.declare("classes.queue.manager", null,{
         }
 
         //TODO: too complex logic, can we streamline it somehow?
-        if(this.queueItems.length > 0 && this.queueItems[this.queueItems.length - 1].name == name){
+        var lastItem = this.queueItems[this.queueItems.length - 1];
+        if(this.queueItems.length > 0 && lastItem && lastItem.name == name){
             if(this.queueNonStackable.includes(type)){
                 return;
             }
-            var valOfItem = (this.queueItems[this.queueItems.length - 1].value || 1) + 1;
-            this.queueItems[this.queueItems.length - 1].value = valOfItem;
+            var valOfItem = (lastItem.value || 1) + 1;
+            lastItem.value = valOfItem;
 
             if (shiftKey){
                 while(this.queueLength() < this.cap){
@@ -2322,6 +2343,9 @@ dojo.declare("classes.queue.manager", null,{
         if(changed){
             this.dropLastItem();
             this.game._publish("ui/update", this.game);
+            //console.log( "Successfully built " + el.name + " using the queue." );
+        } else {
+            //console.log( "Tried to build " + el.name + " using the queue, but failed." );
         }
 
         if(compare == "research" || compare == "reached" && model.metadata[compare] == true

From 0774de33c35d5751f6f4e11846b489bddee63575 Mon Sep 17 00:00:00 2001
From: "nuclear.unicorn" <cheshire.panther@gmail.com>
Date: Thu, 2 Nov 2023 19:38:41 -0700
Subject: [PATCH 43/63] Create main.yml

---
 .github/workflows/main.yml | 39 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000000..3ee290d326
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,39 @@
+name: Deploy
+on:
+  push:
+    branches: [ "master", "dev/*" ]
+  pull_request:
+    branches: [ "master", "dev/*" ]
+
+  jobs:
+    build:
+      runs-on: ubuntu-latest
+      steps:
+        - uses: actions/checkout@v4
+
+        - name: Yarn setup
+          uses: DerYeger/yarn-setup-action@master
+          with:
+            node-version: 16
+        
+        - name: Install dependencies
+          run: yarn
+          
+        - name: Lint
+          run: yarn lint
+
+        - name: Test
+          run: yarn test
+
+    deploy:
+      runs-on: ubuntu-latest
+      needs: build
+      steps:
+        - name: executing remote ssh commands using password
+          uses: appleboy/ssh-action@v1.0.0
+          with:
+            username: ${{ secrets.USERNAME }}
+            host: ${{ secrets.HOST }}
+            script: /var/www/kittensgame.com/html/deploy.sh
+        
+        

From 86983800460e24fc8ba98d4d81bd79335423debb Mon Sep 17 00:00:00 2001
From: "nuclear.unicorn" <cheshire.panther@gmail.com>
Date: Thu, 2 Nov 2023 19:42:42 -0700
Subject: [PATCH 44/63] Update main.yml

---
 .github/workflows/main.yml | 52 +++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3ee290d326..5d39679454 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,35 +5,35 @@ on:
   pull_request:
     branches: [ "master", "dev/*" ]
 
-  jobs:
-    build:
-      runs-on: ubuntu-latest
-      steps:
-        - uses: actions/checkout@v4
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
 
-        - name: Yarn setup
-          uses: DerYeger/yarn-setup-action@master
-          with:
-            node-version: 16
+      - name: Yarn setup
+        uses: DerYeger/yarn-setup-action@master
+        with:
+          node-version: 16
+      
+      - name: Install dependencies
+        run: yarn
         
-        - name: Install dependencies
-          run: yarn
-          
-        - name: Lint
-          run: yarn lint
+      - name: Lint
+        run: yarn lint
 
-        - name: Test
-          run: yarn test
+      - name: Test
+        run: yarn test
 
-    deploy:
-      runs-on: ubuntu-latest
-      needs: build
-      steps:
-        - name: executing remote ssh commands using password
-          uses: appleboy/ssh-action@v1.0.0
-          with:
-            username: ${{ secrets.USERNAME }}
-            host: ${{ secrets.HOST }}
-            script: /var/www/kittensgame.com/html/deploy.sh
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: executing remote ssh commands using password
+        uses: appleboy/ssh-action@v1.0.0
+        with:
+          username: ${{ secrets.KG_SSH_USER }}
+          host: ${{ secrets.KG_SSH_HOST }}
+          script: /var/www/kittensgame.com/html/deploy.sh
         
         

From ffcf91469ab6351400d76522c28609c35046052a Mon Sep 17 00:00:00 2001
From: "nuclear.unicorn" <cheshire.panther@gmail.com>
Date: Thu, 2 Nov 2023 20:01:34 -0700
Subject: [PATCH 45/63] CICD - update pipeline to include RSA key

---
 .github/workflows/main.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5d39679454..67c0f661c4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,4 +1,4 @@
-name: Deploy
+name: KG Deploy code
 on:
   push:
     branches: [ "master", "dev/*" ]
@@ -34,6 +34,7 @@ jobs:
         with:
           username: ${{ secrets.KG_SSH_USER }}
           host: ${{ secrets.KG_SSH_HOST }}
+          key: ${{ secrets.KG_SSH_KEY }}
           script: /var/www/kittensgame.com/html/deploy.sh
         
         

From 25608306159158c8306f0daab194589867578ccb Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Thu, 9 Nov 2023 18:12:32 -0500
Subject: [PATCH 46/63] Speed up tests by ~10x

---
 game.js                 |   3 +
 test/challenges.test.js | 321 ++++++++++++++++++++++------------------
 2 files changed, 179 insertions(+), 145 deletions(-)

diff --git a/game.js b/game.js
index f4938dcb41..14fd6f36c8 100644
--- a/game.js
+++ b/game.js
@@ -5130,6 +5130,9 @@ dojo.declare("com.nuclearunicorn.game.ui.GamePage", null, {
 				}
 			}
 		}
+
+		//Update caches again to include the latest changes:
+		this.updateCaches();
 	},
 
 	toggleFilters: function(){
diff --git a/test/challenges.test.js b/test/challenges.test.js
index 12cb5b7804..5975b0f9b9 100644
--- a/test/challenges.test.js
+++ b/test/challenges.test.js
@@ -34,16 +34,23 @@ afterEach(() => {
 //--------------------------------
 test("Winter Challenge--Effects should have correct values", () => {
     //TODO: implement tests to make sure the cold chance works correctly.  I wasn't sure how to write a test for it given that it's non-deterministic.
-    var winterChallenge = game.challenges.getChallenge("winterIsComing");
+
+    //Save constant references to objects we're going to be accessing frequently:
+    const winterChallenge = game.challenges.getChallenge("winterIsComing");
+    const calendar = game.calendar;
+    const solarFarm = game.bld.get("pasture").stages[1];
+    const catnipResource = game.resPool.get("catnip");
+
+    //Helper functions:
+    const catnipModifier = function() { return calendar.getWeatherMod(catnipResource); };
+    const calculateWhatIsRelevant = function() { game.upgrade({ challenges: ["winterIsComing"]}); };
+
     winterChallenge.researched = false;
     winterChallenge.on = 0;
     winterChallenge.active = false;
-    var solarFarm = game.bld.get("pasture").stages[1];
-    game.calendar.season = 0; //We will conduct this entire test in spring (which transforms into Winter I during the Winter Challenge)
-    //Helper function:
-    var catnipModifier = function() { return game.calendar.getWeatherMod(game.resPool.get("catnip")); }
-    
-    game.calculateAllEffects();
+    calendar.season = 0; //We will conduct this entire test in spring (which transforms into Winter I during the Winter Challenge)
+
+    calculateWhatIsRelevant();
     //With 0 Winter Challenges attempted/completed, Solar Farms should produce 2/2.666667/2/1.5 energy.
     expect(solarFarm.calculateEnergyProduction(game, 0 /*Spring*/)).toBe(2);
     expect(solarFarm.calculateEnergyProduction(game, 1 /*Summer*/)).toBeCloseTo(2.666667);
@@ -51,148 +58,148 @@ test("Winter Challenge--Effects should have correct values", () => {
     expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter*/)).toBeCloseTo(1.5);
 
     //Catnip production in spring should be +50% by default, ±15% for weather.
-    game.calendar.weather = "cold";
+    calendar.weather = "cold";
     expect(catnipModifier()).toBeCloseTo(1.35);
-    game.calendar.weather = "warm";
+    calendar.weather = "warm";
     expect(catnipModifier()).toBeCloseTo(1.65);
-    game.calendar.weather = null; //Normal weather
+    calendar.weather = null; //Normal weather
     expect(catnipModifier()).toBeCloseTo(1.5);
 
     //Activate the first Winter Challenge -> endless winter
     winterChallenge.active = true;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     expect(solarFarm.calculateEnergyProduction(game, 0 /*Winter I*/)).toBeCloseTo(1.5);
     expect(solarFarm.calculateEnergyProduction(game, 1 /*Winter II*/)).toBeCloseTo(1.5);
     expect(solarFarm.calculateEnergyProduction(game, 2 /*Winter III*/)).toBeCloseTo(1.5);
     expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter IV*/)).toBeCloseTo(1.5);
 
     //Catnip production in Winter I should be -75% by default, ±15% for weather.
-    game.calendar.weather = "cold";
+    calendar.weather = "cold";
     expect(catnipModifier()).toBeCloseTo(0.1);
-    game.calendar.weather = "warm";
+    calendar.weather = "warm";
     expect(catnipModifier()).toBeCloseTo(0.4);
-    game.calendar.weather = null; //Normal weather
+    calendar.weather = null; //Normal weather
     expect(catnipModifier()).toBeCloseTo(0.25);
 
     //Complete the first Winter Challenge -> 5% more energy in summer
     winterChallenge.researched = true;
     winterChallenge.on = 1;
     winterChallenge.active = false;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     expect(solarFarm.calculateEnergyProduction(game, 0 /*Spring*/)).toBe(2);
     expect(solarFarm.calculateEnergyProduction(game, 1 /*Summer*/)).toBeCloseTo(1.05 * 2.666667);
     expect(solarFarm.calculateEnergyProduction(game, 2 /*Autumn*/)).toBe(2);
     expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter*/)).toBeCloseTo(1.5);
 
     //With 1 Winter Challenge completion, catnip is boosted by 5%
-    game.calendar.weather = "cold";
+    calendar.weather = "cold";
     expect(catnipModifier()).toBeCloseTo(1.05 * 1.35);
-    game.calendar.weather = "warm";
+    calendar.weather = "warm";
     expect(catnipModifier()).toBeCloseTo(1.05 * 1.65);
-    game.calendar.weather = null; //Normal weather
+    calendar.weather = null; //Normal weather
     expect(catnipModifier()).toBeCloseTo(1.05 * 1.5);
 
     winterChallenge.on = 5; //5 completions -> 25% more energy in summer
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     expect(solarFarm.calculateEnergyProduction(game, 0 /*Spring*/)).toBe(2);
     expect(solarFarm.calculateEnergyProduction(game, 1 /*Summer*/)).toBeCloseTo(1.25 * 2.666667);
     expect(solarFarm.calculateEnergyProduction(game, 2 /*Autumn*/)).toBe(2);
     expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter*/)).toBeCloseTo(1.5);
 
     //With 5 completions we can expect a 25% bonus.
-    game.calendar.weather = "cold";
+    calendar.weather = "cold";
     expect(catnipModifier()).toBeCloseTo(1.25 * 1.35);
-    game.calendar.weather = "warm";
+    calendar.weather = "warm";
     expect(catnipModifier()).toBeCloseTo(1.25 * 1.65);
-    game.calendar.weather = null; //Normal weather
+    calendar.weather = null; //Normal weather
     expect(catnipModifier()).toBeCloseTo(1.25 * 1.5);
 
     winterChallenge.active = true;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     expect(solarFarm.calculateEnergyProduction(game, 0 /*Winter I*/)).toBeCloseTo(1.5); //Cold harshness affects catnip, not solar power
     expect(solarFarm.calculateEnergyProduction(game, 1 /*Winter II*/)).toBeCloseTo(1.5);
     expect(solarFarm.calculateEnergyProduction(game, 2 /*Winter III*/)).toBeCloseTo(1.5);
     expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter IV*/)).toBeCloseTo(1.5);
     
     //We can expect cold weather to be 10% harsher
-    game.calendar.weather = "cold";
+    calendar.weather = "cold";
     expect(catnipModifier()).toBeCloseTo(0.9 * 0.1);
-    game.calendar.weather = "warm";
+    calendar.weather = "warm";
     expect(catnipModifier()).toBeCloseTo(0.4);
-    game.calendar.weather = null; //Normal weather
+    calendar.weather = null; //Normal weather
     expect(catnipModifier()).toBeCloseTo(0.25);
 
     winterChallenge.on = 37; //We should not yet be into LDR for cold harshness
-    game.calculateAllEffects();
-    game.calendar.weather = "cold";
+    calculateWhatIsRelevant();
+    calendar.weather = "cold";
     expect(catnipModifier()).toBeCloseTo(0.26 * 0.1); //-74%
-    game.calendar.weather = "warm";
+    calendar.weather = "warm";
     expect(catnipModifier()).toBeCloseTo(0.4);
-    game.calendar.weather = null; //Normal weather
+    calendar.weather = null; //Normal weather
     expect(catnipModifier()).toBeCloseTo(0.25);
 
     winterChallenge.on = 38; //That puts us into LDR for cold harshness.
-    game.calculateAllEffects();
-    game.calendar.weather = "cold";
+    calculateWhatIsRelevant();
+    calendar.weather = "cold";
     expect(catnipModifier()).toBeCloseTo((1 - game.getLimitedDR(0.76,1)) * 0.1);
-    game.calendar.weather = "warm";
+    calendar.weather = "warm";
     expect(catnipModifier()).toBeCloseTo(0.4);
-    game.calendar.weather = null; //Normal weather
+    calendar.weather = null; //Normal weather
     expect(catnipModifier()).toBeCloseTo(0.25);
 
     //With 30 Winter completions we are back out of LDR for cold harshness.
     winterChallenge.on = 30;
-    game.calculateAllEffects();
-    game.calendar.weather = "cold";
+    calculateWhatIsRelevant();
+    calendar.weather = "cold";
     expect(catnipModifier()).toBeCloseTo(0.4 * 0.1); //-60%
-    game.calendar.weather = "warm";
+    calendar.weather = "warm";
     expect(catnipModifier()).toBeCloseTo(0.4);
-    game.calendar.weather = null; //Normal weather
+    calendar.weather = null; //Normal weather
     expect(catnipModifier()).toBeCloseTo(0.25);
 
     winterChallenge.active = false;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //30 completions -> 150% more energy in summer
     //We should be 1 completion away from entering LDR
     expect(solarFarm.calculateEnergyProduction(game, 0 /*Spring*/)).toBe(2);
     expect(solarFarm.calculateEnergyProduction(game, 1 /*Summer*/)).toBeCloseTo(2.5 * 2.666667);
     expect(solarFarm.calculateEnergyProduction(game, 2 /*Autumn*/)).toBe(2);
     expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter*/)).toBeCloseTo(1.5);
-    game.calendar.weather = "cold";
+    calendar.weather = "cold";
     expect(catnipModifier()).toBeCloseTo(2.5 * 1.35); //Also 150% more catnip in spring
-    game.calendar.weather = "warm";
+    calendar.weather = "warm";
     expect(catnipModifier()).toBeCloseTo(2.5 * 1.65);
-    game.calendar.weather = null; //Normal weather
+    calendar.weather = null; //Normal weather
     expect(catnipModifier()).toBeCloseTo(2.5 * 1.5);
 
     winterChallenge.on = 31; //31 completions -> more than 150% more energy, but less than 155%
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //We should be just entering LDR territory now
-    var theBonus = 1 + game.getLimitedDR(1.55,2);
+    let theBonus = 1 + game.getLimitedDR(1.55,2);
     expect(solarFarm.calculateEnergyProduction(game, 0 /*Spring*/)).toBe(2);
     expect(solarFarm.calculateEnergyProduction(game, 1 /*Summer*/)).toBeCloseTo(theBonus * 2.666667);
     expect(solarFarm.calculateEnergyProduction(game, 2 /*Autumn*/)).toBe(2);
     expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter*/)).toBeCloseTo(1.5);
-    game.calendar.weather = "cold";
+    calendar.weather = "cold";
     expect(catnipModifier()).toBeCloseTo(theBonus * 1.35);
-    game.calendar.weather = "warm";
+    calendar.weather = "warm";
     expect(catnipModifier()).toBeCloseTo(theBonus * 1.65);
-    game.calendar.weather = null; //Normal weather
+    calendar.weather = null; //Normal weather
     expect(catnipModifier()).toBeCloseTo(theBonus * 1.5);
 
     winterChallenge.on = 100;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //Well into LDR territory
     theBonus = 1 + game.getLimitedDR(5,2);
     expect(solarFarm.calculateEnergyProduction(game, 0 /*Spring*/)).toBe(2);
     expect(solarFarm.calculateEnergyProduction(game, 1 /*Summer*/)).toBeCloseTo((1 + game.getLimitedDR(5,2)) * 2.666667);
     expect(solarFarm.calculateEnergyProduction(game, 2 /*Autumn*/)).toBe(2);
     expect(solarFarm.calculateEnergyProduction(game, 3 /*Winter*/)).toBeCloseTo(1.5);
-    game.calendar.weather = "cold";
+    calendar.weather = "cold";
     expect(catnipModifier()).toBeCloseTo(theBonus * 1.35);
-    game.calendar.weather = "warm";
+    calendar.weather = "warm";
     expect(catnipModifier()).toBeCloseTo(theBonus * 1.65);
-    game.calendar.weather = null; //Normal weather
+    calendar.weather = null; //Normal weather
     expect(catnipModifier()).toBeCloseTo(theBonus * 1.5);
 });
 
@@ -200,89 +207,94 @@ test("Winter Challenge--Effects should have correct values", () => {
 //       Anarchy Challenge
 //--------------------------------
 test("Anarchy Challenge--Effects should have correct values", () => {
+    //Save constant references to objects we're going to be accessing frequently:
+    const anarchyChallenge = game.challenges.getChallenge("anarchy");
+    const village = game.village;
+
+    //Helper functions:
+    const masterSkill = function() { return village.getValueModifierPerSkill(9001); };
+    const calculateWhatIsRelevant = function() { game.upgrade({ challenges: ["anarchy"]}); };
+
     //Let's add 300 kittens for testing purposes:
     //300 is a lot but we need the precision for some LDR checks.
-    for (var i = 0; i < 300; i++){
-        game.village.sim.addKitten();
+    for (let i = 0; i < 300; i++){
+        village.sim.addKitten();
     }
-    expect(game.village.getKittens()).toBe(300);
+    expect(village.getKittens()).toBe(300);
 
-    var anarchyChallenge = game.challenges.getChallenge("anarchy");
     anarchyChallenge.researched = false;
     anarchyChallenge.on = 0;
     anarchyChallenge.active = false;
-    game.calculateAllEffects();
-
-    var masterSkill = function() { return game.village.getValueModifierPerSkill(9001); };
+    calculateWhatIsRelevant();
 
     //0 Anarchy Challenges attempted, 0 completed should leave 300 kittens available for work:
     //Master skill effect should be unchanged:
-    expect(game.village.getFreeKittens()).toBe(300);
+    expect(village.getFreeKittens()).toBe(300);
     expect(masterSkill()).toBeCloseTo(0.1875);
 
     //Start the first Anarchy Challenge:
     anarchyChallenge.active = true;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //Half of all kittens should be lazy:
-    expect(game.village.getFreeKittens()).toBe(150);
+    expect(village.getFreeKittens()).toBe(150);
     expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
 
     //With 1 Anarchy Challenges completed, 5% more kittens should be lazy:
     anarchyChallenge.researched = true;
     anarchyChallenge.on = 1;
-    game.calculateAllEffects();
-    expect(game.village.getFreeKittens()).toBe(135);
+    calculateWhatIsRelevant();
+    expect(village.getFreeKittens()).toBe(135);
     expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
 
     anarchyChallenge.on = 2; //2 completions
-    game.calculateAllEffects();
-    expect(game.village.getFreeKittens()).toBe(120);
+    calculateWhatIsRelevant();
+    expect(village.getFreeKittens()).toBe(120);
     expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
 
     anarchyChallenge.on = 3; //3 completions
-    game.calculateAllEffects();
-    expect(game.village.getFreeKittens()).toBe(105);
+    calculateWhatIsRelevant();
+    expect(village.getFreeKittens()).toBe(105);
     expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
 
     anarchyChallenge.on = 4; //4 completions
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //We should be getting to the very beginning of LDR
-    expect(game.village.getFreeKittens()).toBe(Math.round(90.625)); //i.e. 91 kittens
+    expect(village.getFreeKittens()).toBe(Math.round(90.625)); //i.e. 91 kittens
     expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
 
     anarchyChallenge.on = 5; //5 completions
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //LDR is active
-    expect(game.village.getFreeKittens()).toBe(Math.round(84.375)); //i.e. 84 kittens
+    expect(village.getFreeKittens()).toBe(Math.round(84.375)); //i.e. 84 kittens
     expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
 
     anarchyChallenge.on = 40; //40 completions
-    game.calculateAllEffects();
-    expect(game.village.getFreeKittens()).toBe(Math.round(75.625)); //i.e. 76 kittens
+    calculateWhatIsRelevant();
+    expect(village.getFreeKittens()).toBe(Math.round(75.625)); //i.e. 76 kittens
     expect(masterSkill()).toBe(0); //Skills have no effect in Anarchy
 
     //With Anarchy Challenge inactive, no kittens should be lazy:
     anarchyChallenge.active = false;
-    game.calculateAllEffects();
-    expect(game.village.getFreeKittens()).toBe(300);
+    calculateWhatIsRelevant();
+    expect(village.getFreeKittens()).toBe(300);
     //Now test the Master skill effect at 40 completions:
     expect(masterSkill()).toBeCloseTo(0.1875 * (1 + game.getLimitedDR(8,4)));
 
     anarchyChallenge.on = 20; //20 completions
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     expect(masterSkill()).toBeCloseTo(0.1875 * (1 + game.getLimitedDR(4,4)));
 
     anarchyChallenge.on = 15; //15 completions
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //We're outisde of LDR now:
     expect(masterSkill()).toBeCloseTo(0.1875 * 4);
 
     anarchyChallenge.on = 10; //10 completions
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     expect(masterSkill()).toBeCloseTo(0.1875 * 3);
 
     anarchyChallenge.on = 1; //1 completion
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     expect(masterSkill()).toBeCloseTo(0.1875 * 1.2);
 });
 
@@ -290,98 +302,107 @@ test("Anarchy Challenge--Effects should have correct values", () => {
 //       Energy Challenge
 //--------------------------------
 test("Energy Challenge--Effects should have correct values", () => {
-    var energyChallenge = game.challenges.getChallenge("energy");
+    //Save constant references to objects we're going to be accessing frequently:
+    const energyChallenge = game.challenges.getChallenge("energy");
+    const resPool = game.resPool;
+
+    //Helper function:
+    const calculateWhatIsRelevant = function() { game.upgrade({ challenges: ["energy"]}); };
+
     energyChallenge.researched = false;
     energyChallenge.active = false;
     energyChallenge.on = 0;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
 
     //With 0 Energy Challenges completed & the Challenge inactive, there should be no effect:
-    expect(game.resPool.getEnergyConsumptionRatio()).toBe(1);
+    expect(resPool.getEnergyConsumptionRatio()).toBe(1);
 
     energyChallenge.active = true;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //With Energy Challenge active, but 0 completions, energy consumption should be doubled:
-    expect(game.resPool.getEnergyConsumptionRatio()).toBe(2);
+    expect(resPool.getEnergyConsumptionRatio()).toBe(2);
 
     game.challenges.researchChallenge("energy");
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //Energy Challenge should be inactive, researched, & have 1 completion for a 0.98 energy consumption value:
     expect(energyChallenge.researched).toBe(true);
     expect(energyChallenge.active).toBe(false);
     expect(energyChallenge.on).toBe(1);
-    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(0.98);
+    expect(resPool.getEnergyConsumptionRatio()).toBeCloseTo(0.98);
 
     energyChallenge.active = true;
     energyChallenge.on = 1;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //With Energy Challenge active, but 1 completion, energy consumption increase should be 10%, then consumption is doubled.
     expect(game.challenges.getChallenge("energy")).toBe(energyChallenge);
-    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(1.1 * 2);
+    expect(resPool.getEnergyConsumptionRatio()).toBeCloseTo(1.1 * 2);
 
     game.challenges.researchChallenge("energy");
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //Energy Challenge should be inactive, researched, & have 2 completions for a 0.96 energy consumption value:
     expect(energyChallenge.researched).toBe(true);
     expect(energyChallenge.active).toBe(false);
     expect(energyChallenge.on).toBe(2);
-    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(0.96);
+    expect(resPool.getEnergyConsumptionRatio()).toBeCloseTo(0.96);
 
     energyChallenge.active = true;
     energyChallenge.on = 100;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //With Energy Challenge active, but 100 completions, energy consumption increase should be 10%*100 = 1000% = ×11
     expect(game.challenges.getChallenge("energy")).toBe(energyChallenge);
-    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(11 * 2);
+    expect(resPool.getEnergyConsumptionRatio()).toBeCloseTo(11 * 2);
 
     energyChallenge.active = false;
     energyChallenge.on = 10;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //With Energy Challenge inactive & 10 completions at 2% reduction per level we should have -20% consumption:
-    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(0.8);
+    expect(resPool.getEnergyConsumptionRatio()).toBeCloseTo(0.8);
 
     energyChallenge.on = 37;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //With 37 completions at 2% reduction per level we should have -74% consumption; LDR hasn't kicked in yet:
-    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(0.26);
+    expect(resPool.getEnergyConsumptionRatio()).toBeCloseTo(0.26);
 
     energyChallenge.on = 38;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //With 38 completions at 2% reduction per level we should have -76% consumption; beginnings of LDR:
-    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(1 + game.getLimitedDR(-0.76,1));
+    expect(resPool.getEnergyConsumptionRatio()).toBeCloseTo(1 + game.getLimitedDR(-0.76,1));
 
     energyChallenge.on = 100;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //With 100 completions at 2% reduction per level we should be well into LDR:
-    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(1 + game.getLimitedDR(-2,1));
+    expect(resPool.getEnergyConsumptionRatio()).toBeCloseTo(1 + game.getLimitedDR(-2,1));
 
     energyChallenge.on = 10000;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //With 10k completions at 2% reduction per level we should be well into LDR:
-    expect(game.resPool.getEnergyConsumptionRatio()).toBeCloseTo(1 + game.getLimitedDR(-200,1));
+    expect(resPool.getEnergyConsumptionRatio()).toBeCloseTo(1 + game.getLimitedDR(-200,1));
 });
 
 //--------------------------------
 //       Atheism Challenge
 //--------------------------------
 test("Atheism Challenge--Solar Revolution limit should have correct value", () => {
-    var solarRevolutionUpgrade = game.religion.getRU("solarRevolution"); //We need to enable SR to calculate its bonus.
+    //Save constant references to objects we're going to be accessing frequently:
+    const religionManager = game.religion;
+    const solarRevolutionUpgrade = religionManager.getRU("solarRevolution");
+    const atheismChallenge = game.challenges.getChallenge("atheism");
+
+    //Helper functions:
+    const getSR = function() { return religionManager.getSolarRevolutionRatio(); };
+    const calculateWhatIsRelevant = function() { game.upgrade({ challenges: ["atheism"]}); };
+
+    //We need to enable SR to calculate its bonus.
     solarRevolutionUpgrade.on = 1;
     solarRevolutionUpgrade.val = 1;
-    var blackObelisk = game.religion.getTU("blackObelisk"); //Get rid of all Black Obelisks for the purposes of this test.
-    blackObelisk.on = 0;
-    blackObelisk.val = 0;
-    //game.religion.faith is the amount of Worship you have; set it to a really big number so it's very close to the limits.
-    game.religion.faith = Math.pow(10,50);
-    game.religion.transcendenceTier = 15;
-    var atheismChallenge = game.challenges.getChallenge("atheism");
+
+    //religionManager.faith is the amount of worship you have; set it to a really big number so it's very close to the limits.
+    religionManager.faith = Math.pow(10,50);
+    religionManager.transcendenceTier = 15;
     atheismChallenge.on = 0;
     atheismChallenge.researched = false;
     atheismChallenge.active = false;
-    game.calculateAllEffects();
-
-    //Utility function to make life easier:
-    var getSR = function() {return game.religion.getSolarRevolutionRatio();};
+    calculateWhatIsRelevant();
 
     //Test that with 0 Atheism completions the SR limit is at 1000%.
     expect(getSR()).toBeCloseTo(10);
@@ -389,42 +410,42 @@ test("Atheism Challenge--Solar Revolution limit should have correct value", () =
     //Test that with 1 Atheism completion the SR limit is boosted by 100% per TT, then multiplicatively by 10%.
     atheismChallenge.on = 1;
     atheismChallenge.researched = true;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     expect(getSR()).toBeCloseTo(25 * 1.1);
 
     //Test that with 2 Atheism completions the SR limit is boosted by 100% per TT, then multiplicatively by 20%.
     atheismChallenge.on = 2;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     expect(getSR()).toBeCloseTo(25 * 1.2);
 
     //Test that with 15 Atheism completions the SR limit is boosted by 100% per TT, then multiplicatively by 150%.
     atheismChallenge.on = 15;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     expect(getSR()).toBeCloseTo(25 * 2.5);
 
     //Test that it really is 100% per TT.
-    game.religion.transcendenceTier = 3;
-    game.calculateAllEffects();
+    religionManager.transcendenceTier = 3;
+    calculateWhatIsRelevant();
     expect(getSR()).toBeCloseTo(13 * 2.5);
 
     //Test that with 30 Atheism completions the SR limit is boosted by 100% per TT, then multiplicatively by 300%.
     atheismChallenge.on = 30;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     expect(getSR()).toBeCloseTo(13 * 4);
 
     //Test that with 31 Atheism completions we start dipping into LDR.
     atheismChallenge.on = 31;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     expect(getSR()).toBeCloseTo(13 * (1 + game.getLimitedDR(3.1,4)));
 
     //Test that with 70 Atheism completions we really are into LDR.
     atheismChallenge.on = 70;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     expect(getSR()).toBeCloseTo(13 * (1 + game.getLimitedDR(7,4)));
 
     //Test that with infinite Atheism completions we reach the LDR cap.
     atheismChallenge.on = Infinity;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     expect(getSR()).toBeCloseTo(13 * 5);
 });
 
@@ -432,15 +453,20 @@ test("Atheism Challenge--Solar Revolution limit should have correct value", () =
 //       Black Sky Challenge
 //--------------------------------
 test("Black Sky Challenge--Corruption bonus should have correct value", () => {
-    var CORRUPTION_FROM_1_MARKER = 0.000001; //Copied directly from religion.js
-    var markers = game.religion.getZU("marker"); //The religion building that is affected by BSK corruption bonus
+    //Save constant references to objects we're going to be accessing frequently:
+    const bskChallenge = game.challenges.getChallenge("blackSky");
+    const markers = game.religion.getZU("marker"); //The religion building that is affected by BSK corruption bonus
+    const CORRUPTION_FROM_1_MARKER = 0.000001; //Copied directly from religion.js
+    
+    //Helper function:
+    const calculateWhatIsRelevant = function() { game.upgrade({ challenges: ["blackSky"], zigguratUpgrades: ["marker"]}); };
+
     markers.val = 1;
     markers.on = 1;
-    var bskChallenge = game.challenges.getChallenge("blackSky");
     bskChallenge.on = 0;
-    bskChallenge.researhed = false;
+    bskChallenge.researched = false;
     bskChallenge.active = false;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
 
     //With 0 BSK attempts & completions, markers' effective value should be 1, & corruption ratio should be unchanged:
     expect(markers.effects["corruptionRatio"]).toBe(CORRUPTION_FROM_1_MARKER);
@@ -449,21 +475,21 @@ test("Black Sky Challenge--Corruption bonus should have correct value", () => {
     //Try with 1 BSK completion:
     bskChallenge.on = 1;
     bskChallenge.researched = true;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //Numbers should be boosted by 10%:
     expect(markers.effects["corruptionRatio"]).toBeCloseTo(1.1 * CORRUPTION_FROM_1_MARKER);
     expect(markers.getEffectiveValue(game)).toBe(1.1);
 
     //5 BSK completions:
     bskChallenge.on = 5;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //Expect a 50% bonus:
     expect(markers.effects["corruptionRatio"]).toBeCloseTo(1.5 * CORRUPTION_FROM_1_MARKER);
     expect(markers.getEffectiveValue(game)).toBe(1.5);
 
     //Try BSK active with 5 previous completions:
     bskChallenge.active = true;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //Bonus should be disabled while Challenge is active:
     expect(markers.effects["corruptionRatio"]).toBe(CORRUPTION_FROM_1_MARKER);
     expect(markers.getEffectiveValue(game)).toBe(1);
@@ -471,28 +497,28 @@ test("Black Sky Challenge--Corruption bonus should have correct value", () => {
     //15 BSK completions, Challenge completed:
     bskChallenge.on = 15;
     bskChallenge.active = false;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //Expect a 150% bonus because we aren't into LDR yet:
     expect(markers.effects["corruptionRatio"]).toBeCloseTo(2.5 * CORRUPTION_FROM_1_MARKER);
     expect(markers.getEffectiveValue(game)).toBe(2.5);
 
     //16 BSK completions:
     bskChallenge.on = 16;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //Beginnings of LDR:
     expect(markers.effects["corruptionRatio"]).toBeCloseTo((1 + game.getLimitedDR(1.6,2)) * CORRUPTION_FROM_1_MARKER);
     expect(markers.getEffectiveValue(game)).toBe(1 + game.getLimitedDR(1.6,2));
 
     //99 BSK completions:
     bskChallenge.on = 99;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //Well into LDR:
     expect(markers.effects["corruptionRatio"]).toBeCloseTo((1 + game.getLimitedDR(9.9,2)) * CORRUPTION_FROM_1_MARKER);
     expect(markers.getEffectiveValue(game)).toBe(1 + game.getLimitedDR(9.9,2));
 
     //Infinitely many BSK completions:
     bskChallenge.on = Infinity;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //Completely to the end of LDR:
     expect(markers.effects["corruptionRatio"]).toBeCloseTo(3 * CORRUPTION_FROM_1_MARKER);
     expect(markers.getEffectiveValue(game)).toBe(3);
@@ -502,12 +528,17 @@ test("Black Sky Challenge--Corruption bonus should have correct value", () => {
 //       Pacifism Challenge
 //--------------------------------
 test("Pacifism Challenge--Weapon upgrades should have correct values", () => {
-    var pacifismChallenge = game.challenges.getChallenge("pacifism");
-    var weaponUpgrades = [game.workshop.get("compositeBow"), game.workshop.get("crossbow"), game.workshop.get("railgun")];
+    //Save constant references to objects we're going to be accessing frequently:
+    const pacifismChallenge = game.challenges.getChallenge("pacifism");
+    const weaponUpgrades = [game.workshop.get("compositeBow"), game.workshop.get("crossbow"), game.workshop.get("railgun")];
+    
+    //Helper function:
+    const calculateWhatIsRelevant = function() { game.upgrade({ challenges: ["pacifism"], upgrades: ["compositeBow", "crossbow", "railgun"]}); };
+
     pacifismChallenge.on = 500;
     pacifismChallenge.researched = true;
     pacifismChallenge.active = false;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
 
     //With Pacifism inactive, the number of completions shouldn't matter for weapon upgrades:
     expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBe(0.5);
@@ -515,7 +546,7 @@ test("Pacifism Challenge--Weapon upgrades should have correct values", () => {
     expect(weaponUpgrades[2].effects["manpowerJobRatio"]).toBe(0.25);
 
     pacifismChallenge.on = 2;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //Test that the number of completions actually doesn't matter by checking with a different number of completions:
     expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBe(0.5);
     expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBe(0.25);
@@ -525,7 +556,7 @@ test("Pacifism Challenge--Weapon upgrades should have correct values", () => {
     pacifismChallenge.on = 0;
     pacifismChallenge.researched = false;
     pacifismChallenge.active = true;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //We expect numbers to be unchanged:
     expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBe(0.5);
     expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBe(0.25);
@@ -534,7 +565,7 @@ test("Pacifism Challenge--Weapon upgrades should have correct values", () => {
     //How about the 2nd Pacifism run?
     pacifismChallenge.on = 1;
     pacifismChallenge.researched = true;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //Weapon efficency should be diminished by 10%:
     expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBeCloseTo(0.9 * 0.5); //Use toBeCloseTo because we might have floating-point rounding errorrs
     expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBeCloseTo(0.9 * 0.25);
@@ -542,7 +573,7 @@ test("Pacifism Challenge--Weapon upgrades should have correct values", () => {
 
     //7th Pacifism run:
     pacifismChallenge.on = 7;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //Weapon efficency should be diminished by 70%:
     expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBeCloseTo(0.3 * 0.5);
     expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBeCloseTo(0.3 * 0.25);
@@ -550,21 +581,21 @@ test("Pacifism Challenge--Weapon upgrades should have correct values", () => {
 
     //10th Pacifism run:
     pacifismChallenge.on = 10;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //No LDR on the effect "weaponEfficency" (yes, it's misspelled) so we're at -100%:
     expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBe(0);
     expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBe(0);
     expect(weaponUpgrades[2].effects["manpowerJobRatio"]).toBe(0);
 
     pacifismChallenge.on = 11;
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //But it doesn't go below 0:
     expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBe(0);
     expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBe(0);
     expect(weaponUpgrades[2].effects["manpowerJobRatio"]).toBe(0);
     
     pacifismChallenge.on = 134769; //If you can correctly guess what this number is a reference to, I'll be impressed.
-    game.calculateAllEffects();
+    calculateWhatIsRelevant();
     //Still, effect shouldn't dip below 0:
     expect(weaponUpgrades[0].effects["manpowerJobRatio"]).toBe(0);
     expect(weaponUpgrades[1].effects["manpowerJobRatio"]).toBe(0);

From df08ed7cbcda62edde4d1fb6ed2e294256c4d025 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Fri, 10 Nov 2023 11:51:25 -0500
Subject: [PATCH 47/63] Update toggle automation links even if there are 0 of
 the building

---
 core.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/core.js b/core.js
index 90adaa0750..60f6fe844c 100644
--- a/core.js
+++ b/core.js
@@ -1853,8 +1853,12 @@ dojo.declare("com.nuclearunicorn.game.ui.BuildingBtn", com.nuclearunicorn.game.u
 		}
 
 		var building = this.model.metadata;
-		if (building && building.val){
-
+		if (!building) {
+			//Everything else we want to do here depends on the building property.
+			//If we don't have that, then skip
+			return;
+		}
+		if (building.val){
 			// -------------- sell ----------------
 			if (this.sellHref){
 				dojo.style(this.sellHref.link, "display", (building.val > 0) ? "" : "none");
@@ -1879,10 +1883,10 @@ dojo.declare("com.nuclearunicorn.game.ui.BuildingBtn", com.nuclearunicorn.game.u
 			if (this.add) {
 				dojo.toggleClass(this.add["add1"].link, "enabled", building.on < building.val);
 			}
-
 			this.updateLink(this.toggle, this.model.togglableOnOffLink);
-			this.updateLink(this.toggleAutomation, this.model.toggleAutomationLink);
 		}
+		//Update this specific link even if there are 0 of the building in question:
+		this.updateLink(this.toggleAutomation, this.model.toggleAutomationLink);
 	}
 });
 

From 802a967c14ac633612e6ff9d2daea185a480ddb0 Mon Sep 17 00:00:00 2001
From: SilenceFactor <149717374+SilenceFactor@users.noreply.github.com>
Date: Fri, 10 Nov 2023 22:19:35 +0100
Subject: [PATCH 48/63] Tech: 'Construction' increases queue cap by 1

---
 js/science.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/js/science.js b/js/science.js
index 0acdffde5d..cc626fb1b2 100644
--- a/js/science.js
+++ b/js/science.js
@@ -117,6 +117,9 @@ dojo.declare("classes.managers.ScienceManager", com.nuclearunicorn.core.TabManag
 		description: $I("science.construction.desc"),
 		effectDesc: $I("science.construction.effectDesc"),
 		prices: [{name : "science", val: 1300}],
+		effects: {
+			"queueCap": 1
+		},
 		unlocks: {
 			buildings: ["logHouse", "warehouse", "lumberMill", "ziggurat"],
 			tech: ["engineering"],

From 7f5465f0643c3ba056ff622d125847ba96eb15eb Mon Sep 17 00:00:00 2001
From: "nuclear.unicorn" <cheshire.panther@gmail.com>
Date: Sat, 11 Nov 2023 09:41:33 +0900
Subject: [PATCH 49/63] Update main.yml

More explicit branch mapping
---
 .github/workflows/main.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 67c0f661c4..769aa0e77a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,9 +1,15 @@
 name: KG Deploy code
 on:
   push:
-    branches: [ "master", "dev/*" ]
+    branches:
+      - master
+      - dev/alpha
+      - dev/beta
   pull_request:
-    branches: [ "master", "dev/*" ]
+    branches: 
+      - master
+      - dev/alpha
+      - dev/beta
 
 jobs:
   build:

From 583fa3b7903607a5b418ff806aec5f79477503bc Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Sat, 11 Nov 2023 12:26:35 -0500
Subject: [PATCH 50/63] Add tooltips to items in the queue

---
 js/jsx/queue.jsx.js | 19 +++++++++----------
 js/time.js          | 22 ++++++++++++++++------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/js/jsx/queue.jsx.js b/js/jsx/queue.jsx.js
index 8f448a43b8..6e21c2ad10 100644
--- a/js/jsx/queue.jsx.js
+++ b/js/jsx/queue.jsx.js
@@ -10,6 +10,11 @@ WQueueItem = React.createClass({
     componentDidMount: function(){
         this.attachTooltip();
     },
+    componentDidUpdate: function(prevProps, prevState){
+        if (this.props.item !== prevProps.item) {
+            this.attachTooltip();
+        }
+    },
 
     render: function(){
         var item = this.props.item;
@@ -78,19 +83,13 @@ WQueueItem = React.createClass({
         var game = this.props.game;
 
         var node = React.findDOMNode(this.refs.itemLabel);
-        //TODO: extract controller and model
 
-        //TBD
-        if (item.type != "buildings"){
+        //Extract the correct type of controller & its model for this specific item:
+        var controllerAndModel = game.time.queue.getQueueElementControllerAndModel(item);
+        if (!controllerAndModel) {
             return;
         }
-
-        var controller = new classes.ui.btn.BuildingBtnModernController(game);
-        var model = controller.fetchModel({
-            building: item.name,
-            key: item.name,
-        });
-        UIUtils.attachTooltip(game, node, 0, 200, dojo.partial(ButtonModernHelper.getTooltipHTML, controller, model));
+        UIUtils.attachTooltip(game, node, 0, 200, dojo.partial(ButtonModernHelper.getTooltipHTML, controllerAndModel.controller, controllerAndModel.model));
     }
 });
 
diff --git a/js/time.js b/js/time.js
index 3a7238a3aa..670c7c074e 100644
--- a/js/time.js
+++ b/js/time.js
@@ -1417,7 +1417,12 @@ dojo.declare("classes.ui.time.FixCryochamberBtnController", com.nuclearunicorn.g
 
 	updateVisible: function(model) {
 		model.visible = this.game.workshop.get("chronoforge").researched && this.game.time.getVSU("usedCryochambers").val != 0;
-	}
+	},
+
+    //This is a bit of a hack to get the correct description to appear in the queue tooltips...
+    getDescription: function(model) {
+        return $I("time.fixCryochambers.desc");
+    }
 });
 
 dojo.declare("classes.ui.VoidSpaceWgt", [mixin.IChildrenAware, mixin.IGameAware], {
@@ -2083,7 +2088,13 @@ dojo.declare("classes.queue.manager", null,{
         this.dropLastItem();
         this.showList();
     },
-    getQueueElementModel: function(el){
+    getQueueElementModel: function(el) {
+        var controllerAndModel = this.getQueueElementControllerAndModel(el);
+        if (controllerAndModel) {
+            return controllerAndModel.model;
+        }
+    },
+    getQueueElementControllerAndModel: function(el){
         var itemMetaRaw = this.game.getUnlockByName(el.name, el.type);
         if (!itemMetaRaw){
             console.error("invalid queue item:", el);
@@ -2142,7 +2153,7 @@ dojo.declare("classes.queue.manager", null,{
                     itemMetaRaw = this.game.getUnlockByName("cryochambers", el.type);
                     model.prices = this.game.time.getVSU("usedCryochambers").fixPrices;
                     model.enabled = this.game.resPool.hasRes(model.prices); //check we actually have enough to do one fix!
-                    console.log(model);
+                    //console.log(model);
                 }
                 break;
 
@@ -2184,8 +2195,7 @@ dojo.declare("classes.queue.manager", null,{
                 var model = props.controller.fetchModel(props);
                 break;
         }
-        //return props, model;
-        return model;
+        return { controller: props.controller, model: model };
     },
     update: function(){
         this.cap = this.calculateCap();
@@ -2279,7 +2289,7 @@ dojo.declare("classes.queue.manager", null,{
                     itemMetaRaw = this.game.getUnlockByName("cryochambers", el.type);
                     model.prices = this.game.time.getVSU("usedCryochambers").fixPrices;
                     model.enabled = this.game.resPool.hasRes(model.prices); //check we actually have enough to do one fix!
-                    console.log(model);
+                    //console.log(model);
                 }
                 break;
 

From 60bc224dc5c41ec06fd7cb9504f7b49cfbabedce Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Sat, 11 Nov 2023 13:05:49 -0500
Subject: [PATCH 51/63] Make space missions, upgrades, & techs properly drop
 off the queue if already bought

---
 js/time.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/js/time.js b/js/time.js
index 670c7c074e..776ad6557e 100644
--- a/js/time.js
+++ b/js/time.js
@@ -2262,9 +2262,8 @@ dojo.declare("classes.queue.manager", null,{
                 break;
 
             case "spaceMission":
-                compare = "reached";
                 props.controller = new com.nuclearunicorn.game.ui.SpaceProgramBtnController(this.game);
-                var oldVal = itemMetaRaw.researched;
+                var oldVal = itemMetaRaw.val;
                 var model = props.controller.fetchModel(props);
                 break;
 
@@ -2356,14 +2355,15 @@ dojo.declare("classes.queue.manager", null,{
             //console.log( "Successfully built " + el.name + " using the queue." );
         } else {
             //console.log( "Tried to build " + el.name + " using the queue, but failed." );
-        }
-
-        if(compare == "research" || compare == "reached" && model.metadata[compare] == true
-            || (compare.includes("blocked") && model.metadata["blocked"] == true) ||
-            (compare.includes("research") && model.metadata["research"] == true)
-        ){
-            this.dropLastItem();
-            this.game._publish("ui/update", this.game);
+            if( (compare == "researched" && model.metadata[compare] == true ) ||
+                (compare.includes("blocked") && model.metadata["blocked"] == true) ||
+                (compare.includes("researched") && model.metadata["researched"] == true) ||
+                (el.type === "spaceMission" && model.metadata[compare])
+            ){
+                this.dropLastItem();
+                this.game._publish("ui/update", this.game);
+                //console.log( "Dropped " + el.name + " from the queue because it can't be built anymore." );
+            }
         }
     }
 });
\ No newline at end of file

From e7e39fed4086f39caaa3fde2bfa45033ad3a1c23 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Sat, 11 Nov 2023 14:09:40 -0500
Subject: [PATCH 52/63] Building tooltips will update whenever the queue
 updates

---
 core.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core.js b/core.js
index 60f6fe844c..445ac518ac 100644
--- a/core.js
+++ b/core.js
@@ -1268,8 +1268,9 @@ dojo.declare("com.nuclearunicorn.game.ui.ButtonModernController", com.nuclearuni
 
 ButtonModernHelper = {
 	getTooltipHTML : function(controller, model){
+		//Some aspects of the metadata may have changed, so fetch the latest version of the model:
+		model = controller.fetchModel(model.options);
 		controller.fetchExtendedModel(model);
-		//throw "ButtonModern::getTooltipHTML must be implemented";
 
 		var tooltip = dojo.create("div", { className: "tooltip-inner" }, null);
 
@@ -1283,7 +1284,7 @@ ButtonModernHelper = {
 
 		// description
 		var descDiv = dojo.create("div", {
-			innerHTML: controller.getDescription(model),
+			innerHTML: model.description,
 			className: "desc"
 		}, tooltip);
 

From 686c43bc72e10db48bc39b36cf6c76ccc04865d8 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Sat, 11 Nov 2023 14:14:15 -0500
Subject: [PATCH 53/63] Fix error when using SHIFT to queue multiple items from
 an empty queue

---
 js/time.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/time.js b/js/time.js
index 776ad6557e..64818d52ca 100644
--- a/js/time.js
+++ b/js/time.js
@@ -1779,7 +1779,7 @@ dojo.declare("classes.queue.manager", null,{
             value: 1    //always store size of the queue group, even if it is a single item
         });
 
-        if (shiftKey && !this.queueNonStabkable.includes(type)){
+        if (shiftKey && !this.queueNonStackable.includes(type)){
             while(this.queueLength() < this.cap){
                 this.addToQueue(name, type, label, false);
             }

From e347cac56e34348f68d27a3841110b0b842df714 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Sat, 11 Nov 2023 15:53:02 -0500
Subject: [PATCH 54/63] Update queue labels when a building is deltagraded

---
 js/buildings.js |  6 ++++--
 js/time.js      | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/js/buildings.js b/js/buildings.js
index 5c647f2ce6..63de0f4e3c 100644
--- a/js/buildings.js
+++ b/js/buildings.js
@@ -2734,6 +2734,7 @@ dojo.declare("classes.managers.BuildingsManager", com.nuclearunicorn.core.TabMan
 			this.game.render();
 		} else if (data.action == "deltagrade"){ //Generic term for upgrading/downgrading
 			bldMetaRaw.stage = Math.max(0, bldMetaRaw.stage - amt);
+			this.game.time.queue.onDeltagrade(bld.name);
 
 			//Update because it changed when we changed stages
 			bld = new classes.BuildingMeta(bldMetaRaw).getMeta();
@@ -3012,14 +3013,15 @@ dojo.declare("classes.ui.btn.StagingBldBtnController", classes.ui.btn.BuildingBt
 			});
 			this.sellInternal(model, 0, false /*requireSellLink*/);
 		}
-		metadataRaw.stage += delta;
-		if (!metadataRaw.stage) {metadataRaw.stage = Math.max(0, delta);}
+		if (metadataRaw.stage) { metadataRaw.stage = Math.max(0, metadataRaw.stage + delta); }
+		else { metadataRaw.stage = Math.max(0, delta); }
 
 		metadataRaw.val = 0;	//TODO: fix by using separate value flags
 		metadataRaw.on = 0;
 		if (metadataRaw.calculateEffects){
 			metadataRaw.calculateEffects(metadataRaw, this.game);
 		}
+		this.game.time.queue.onDeltagrade(model.options.building);
 		this.game.upgrade(metadataRaw.upgrades);
 		this.game.render();
 	},
diff --git a/js/time.js b/js/time.js
index 64818d52ca..d5d8db275d 100644
--- a/js/time.js
+++ b/js/time.js
@@ -2365,5 +2365,27 @@ dojo.declare("classes.queue.manager", null,{
                 //console.log( "Dropped " + el.name + " from the queue because it can't be built anymore." );
             }
         }
+    },
+
+    //This function is to be called whenever a building is deltagraded.
+    //This function iterates through all queue items with the same internal ID as the
+    //deltagraded building & updates their labels to match the new version.
+    //@param itemName   String.  The ID of whichever building was deltagraded.
+    onDeltagrade: function(itemName) {
+        var buildingsManager = this.game.bld;
+        dojo.forEach(this.queueItems, function(item) {
+            if(!item || item.name !== itemName) {
+                return;
+            }
+            //Else, we have here a valid queue item matching the name of what was deltagraded.
+            if(item.type === "buildings") {
+                var building = buildingsManager.getBuildingExt(itemName).meta;
+                var newLabel = building.label;
+                if(building.stages){
+                    newLabel = building.stages[building.stage].label;
+                }
+                item.label = newLabel;
+            }
+        });
     }
 });
\ No newline at end of file

From ebe71308d3930b41801bfcc2d4c57f2dda13e29e Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 13 Nov 2023 21:16:57 -0500
Subject: [PATCH 55/63] Refactor the callback used in buyItem

---
 core.js          | 96 +++++++++++++++++++++++++++++-------------------
 js/buildings.js  |  2 +-
 js/challenges.js | 24 +-----------
 js/prestige.js   |  2 +-
 js/religion.js   | 95 ++++++++++++++++++++++++++++++-----------------
 js/science.js    | 27 ++++++++------
 js/space.js      |  2 +-
 js/time.js       | 51 ++++++++++++++-----------
 js/workshop.js   |  8 +++-
 9 files changed, 175 insertions(+), 132 deletions(-)

diff --git a/core.js b/core.js
index 445ac518ac..9e01c68e2e 100644
--- a/core.js
+++ b/core.js
@@ -708,18 +708,24 @@ dojo.declare("com.nuclearunicorn.game.ui.ButtonController", null, {
 	},
 
 	buyItem: function(model, event, callback){
-		if (model.enabled && this.hasResources(model)) {
-			this.clickHandler(model, event);
-
-			this.payPrice(model);
-
-			if (model.priceRatio){
-				this.adjustPrice(model.priceRatio);
-			}
+		if (!this.hasResources(model)) {
+			callback({ itemBought: false, reason: "cannot-afford" });
+			return;
+		}
+		if (!model.enabled) {
+			callback({ itemBought: false, reason: "not-enabled" });
+			return;
+		}
+		//Else, we meet all requirements to buy this item:
+		this.clickHandler(model, event);
+		this.payPrice(model);
 
-			callback(true);
+		if (model.priceRatio){
+			this.adjustPrice(model.priceRatio);
 		}
-		callback(false);
+
+		//A lot of normal UI buttons that don't involve building things use this method, so check if things are free:
+		callback({ itemBought: true, reason: ((model.prices && model.prices.length) ? "paid-for" : "item-is-free") });
 	},
 
 	refund: function(model){
@@ -901,7 +907,7 @@ dojo.declare("com.nuclearunicorn.game.ui.Button", com.nuclearunicorn.core.Contro
 		this.animate();
 		var self = this;
 		this.controller.buyItem(this.model, event, function(result) {
-			if (result) {
+			if (typeof(result) == "object" && result.itemBought) {
 				self.update();
 			}
 		});
@@ -1959,45 +1965,55 @@ dojo.declare("com.nuclearunicorn.game.ui.BuildingStackableBtnController", com.nu
 	},
 
 	buyItem: function(model, event, callback) {
-		if (model.enabled && this.hasResources(model) || this.game.devMode) {
-			var meta = model.metadata;
-			if (this.game.ironWill && meta.effects && meta.effects["maxKittens"] > 0 && this.game.science.get("archery").researched) {
-				var self = this;
-				this.game.ui.confirm("", $I("iron.will.break.confirmation.msg"), function() {
-					self._buyItem_step2(model, event, callback);
-				}, function() {
-					callback(false);
-				});
-			} else {
-				this._buyItem_step2(model, event, callback);
-			}
+		var isInDevMode = this.game.devMode;
+		if (!this.hasResources(model) && !isInDevMode) {
+			callback({ itemBought: false, reason: "cannot-afford" });
+			return;
+		}
+		if (!model.enabled && !isInDevMode) {
+			callback({ itemBought: false, reason: "not-enabled" });
+			return;
+		}
+		//Else, we meet all the requirements for being able to buy this item:
+		var meta = model.metadata;
+		if (this.game.ironWill && meta.effects && meta.effects["maxKittens"] > 0 && this.game.science.get("archery").researched) {
+			//Show a confirmation message if we're building something that would break Iron Will mode.
+			var self = this;
+			this.game.ui.confirm("", $I("iron.will.break.confirmation.msg"), function() {
+				self._buyItem_step2(model, event, callback);
+			}, function() {
+				callback({ itemBought: false, reason: "player-denied" /*The player decided not to buy this after all.*/ });
+			});
 		} else {
-			callback(false);
+			this._buyItem_step2(model, event, callback);
 		}
 	},
 
 	_buyItem_step2: function(model, event, callback) {
+		//This is what we pass to the callback function if we succeed:
+		var resultIfBuySuccessful = { itemBought: true, reason: (this.game.devMode ? "dev-mode" : "paid-for") };
+
 		var meta = model.metadata;
 		if (!meta.noStackable && event.shiftKey) {
 			var maxBld = 10000;
 			if (this.game.opts.noConfirm) {
 				this.build(model, maxBld);
-				callback(true);
+				callback(resultIfBuySuccessful);
 			} else {
 				var self = this;
 				this.game.ui.confirm($I("construct.all.confirmation.title"), $I("construct.all.confirmation.msg"), function() {
 					self.build(model, maxBld);
-					callback(true);
+					callback(resultIfBuySuccessful);
 				}, function() {
-					callback(false);
+					callback({ itemBought: false, reason: "player-denied" /*The player decided not to buy this after all.*/});
 				});
 			}
 		} else if (!meta.noStackable && (event.ctrlKey || event.metaKey /*osx tears*/)) {
 			this.build(model, this.game.opts.batchSize || 10);
-			callback(true);
+			callback(resultIfBuySuccessful);
 		} else {
             this.build(model, 1);
-            callback(true);
+		  callback(resultIfBuySuccessful);
         }
 	},
 
@@ -2124,16 +2140,22 @@ dojo.declare("com.nuclearunicorn.game.ui.BuildingNotStackableBtnController", com
 	},
 
 	buyItem: function(model, event, callback) {
-		if ((!model.metadata.researched && this.hasResources(model)) || this.game.devMode){
-			this.payPrice(model);
-
-			this.onPurchase(model);
-			
-			callback(true);
-			this.game.render();
+		var isInDevMode = this.game.devMode;
+		if (model.metadata.researched && !isInDevMode) {
+			callback({ itemBought: false, reason: "already-bought" });
 			return;
 		}
-		callback(false);
+		if (!this.hasResources(model) && !isInDevMode) {
+			callback({ itemBought: false, reason: "cannot-afford" });
+			return;
+		}
+		//Else, we can buy it:
+		this.payPrice(model);
+		this.onPurchase(model);
+		
+		callback({ itemBought: true, reason: (isInDevMode ? "dev-mode" : "paid-for") });
+		this.game.render();
+		return;
 	},
 
 	onPurchase: function(model){
diff --git a/js/buildings.js b/js/buildings.js
index 63de0f4e3c..5dd15abaa2 100644
--- a/js/buildings.js
+++ b/js/buildings.js
@@ -2764,7 +2764,7 @@ dojo.declare("classes.game.ui.GatherCatnipButtonController", com.nuclearunicorn.
 		}
 
 		this.game.bld.gatherCatnip();
-		callback(true);
+		callback({ itemBought: true, reason: "item-is-free" /*It costs no resources to gather catnip, so we can't fail to buy it*/});
 	}
 });
 
diff --git a/js/challenges.js b/js/challenges.js
index 792fcb894f..a1ffc502bb 100644
--- a/js/challenges.js
+++ b/js/challenges.js
@@ -713,30 +713,8 @@ dojo.declare("classes.ui.ChallengeBtnController", com.nuclearunicorn.game.ui.Bui
 	},
 
 	buyItem: function(model, event, callback) {
-		/*if (model.metadata.name == this.game.challenges.currentChallenge
-		 || (!model.enabled && !this.game.devMode)) {
-			callback(false);
-			return;
-		}
-
-		var game = this.game;
-		game.ui.confirm($I("challendge.btn.confirmation.title"), $I("challendge.btn.confirmation.msg"), function() {
-			// Set the challenge for after reset
-			game.challenges.currentChallenge = model.metadata.name == "ironWill"
-				? null
-				: model.metadata.name;
-			// Reset with any benefit of chronosphere (resources, kittens, etc...)
-			game.bld.get("chronosphere").val = 0;
-			game.bld.get("chronosphere").on = 0;
-			game.time.getVSU("cryochambers").val = 0;
-			game.time.getVSU("cryochambers").on = 0;
-			game.resetAutomatic();
-			callback(true);
-		}, function() {
-			callback(false);
-		});*/
-
 		this.togglePending(model);
+		callback({ itemBought: true, reason: "item-is-free" /*We just toggled the pending state; simple, really*/});
 	},
 
 	togglePending: function(model){
diff --git a/js/prestige.js b/js/prestige.js
index 981d9045ae..480e737b00 100644
--- a/js/prestige.js
+++ b/js/prestige.js
@@ -543,7 +543,7 @@ dojo.declare("classes.ui.PrestigeBtnController", com.nuclearunicorn.game.ui.Buil
 		if (this.game.science.get("metaphysics").researched) {
 			this.inherited(arguments);
 		} else {
-			callback(false);
+			callback({ itemBought: false, reason: "not-unlocked" });
 		}
 	},
 
diff --git a/js/religion.js b/js/religion.js
index 68c87f2be4..a84456719e 100644
--- a/js/religion.js
+++ b/js/religion.js
@@ -1371,12 +1371,23 @@ dojo.declare("classes.ui.religion.TransformBtnController", com.nuclearunicorn.ga
 	},
 
 	buyItem: function(model, event, callback) {
-		if (model.enabled && this.hasResources(model)) {
-			var batchSize = event.shiftKey ? 10000 :
-				event.ctrlKey || event.metaKey ? this.game.opts.batchSize : 1;
-			callback(this._transform(model, batchSize));
+		if (!this.hasResources(model)) {
+			callback({ itemBought: false, reason: "cannot-afford" });
+			return;
+		}
+		if (!model.enabled) {
+			callback({ itemBought: false, reason: "not-enabled" });
+			return;
+		}
+		var batchSize = event.shiftKey ? 10000 :
+			event.ctrlKey || event.metaKey ? this.game.opts.batchSize : 1;
+		var didWeSucceed = this._transform(model, batchSize);
+		if (didWeSucceed) {
+			callback({ itemBought: true, reason: "paid-for" });
+		} else {
+			//_transform(model, amt) returns false if we can't afford it
+			callback({ itemBought: false, reason: "cannot-afford" });
 		}
-		callback(false);
 	},
 
 	_canAfford: function(model) {
@@ -1385,10 +1396,21 @@ dojo.declare("classes.ui.religion.TransformBtnController", com.nuclearunicorn.ga
 
 	transform: function(model, divider, event, callback) {
 		var amt = Math.floor(this._canAfford(model) / divider);
-		if (model.enabled && amt >= 1) {
-			callback(this._transform(model, amt));
+		if (amt < 1) {
+			callback({ itemBought: false, reason: "cannot-afford" });
+			return;
+		}
+		if (!model.enabled) {
+			callback({ itemBought: false, reason: "not-enabled" });
+			return;
+		}
+		var didWeSucceed = this._transform(model, amt);
+		if (didWeSucceed) {
+			callback({ itemBought: true, reason: "paid-for" });
+		} else {
+			//_transform(model, amt) returns false if we can't afford it
+			callback({ itemBought: false, reason: "cannot-afford" });
 		}
-		callback(false);
 	},
 
 	_transform: function(model, amt) {
@@ -1470,25 +1492,29 @@ dojo.declare("classes.ui.religion.RefineTearsBtnController", com.nuclearunicorn.
 	},
 
 	buyItem: function(model, event, callback, count){
-		if (model.enabled && this.hasResources(model)) {
-			if (this.game.resPool.get("sorrow").value >= this.game.resPool.get("sorrow").maxValue){
-				this.game.msg($I("religion.refineTearsBtn.refine.msg.failure"));
-				callback(false);
-				return;
-			}
-
-			for (var batchSize = count || (event.ctrlKey ? this.game.opts.batchSize : 1);
-				 batchSize > 0
-				 && this.hasResources(model)
-				 && this.game.resPool.get("sorrow").value < this.game.resPool.get("sorrow").maxValue;
-				 batchSize--) {
-				this.payPrice(model);
-				this.refine();
-			}
-
-			callback(true);
+		if (!this.hasResources(model)) {
+			callback({ itemBought: false, reason: "cannot-afford" });
+			return;
+		}
+		if (!model.enabled) {
+			callback({ itemBought: false, reason: "not-enabled" });
+			return;
+		}
+		if (this.game.resPool.get("sorrow").value >= this.game.resPool.get("sorrow").maxValue){
+			//We can't refine because we're at the limit.
+			this.game.msg($I("religion.refineTearsBtn.refine.msg.failure"));
+			callback({ itemBought: false, reason: "already-bought" });
+			return;
 		}
-		callback(false);
+		for (var batchSize = count || (event.ctrlKey ? this.game.opts.batchSize : 1);
+			 batchSize > 0
+			 && this.hasResources(model)
+			 && this.game.resPool.get("sorrow").value < this.game.resPool.get("sorrow").maxValue;
+			 batchSize--) {
+			this.payPrice(model);
+			this.refine();
+		}
+		callback({ itemBought: true, reason: "paid-for" });
 	},
 
 	refine: function(){
@@ -1585,15 +1611,16 @@ dojo.declare("classes.ui.PactsPanel", com.nuclearunicorn.game.ui.Panel, {
 	buyItem: function(model, event, callback) {
 		this.game.updateCaches();
 		this.updateEnabled(model);
-		if ((this.hasResources(model)) || this.game.devMode){
-			if(!this.shouldBeBough(model, this.game)){
-				callback(false);
-				return;
-			}
-			this._buyItem_step2(model, event, callback);
-		}else{
-			callback(false);
+
+		if (!this.hasResources(model) && !this.game.devMode) {
+			callback({ itemBought: false, reason: "cannot-afford" });
+			return;
+		}
+		if(!this.shouldBeBough(model, this.game)){
+			callback({ itemBought: false, reason: "already-bought" /*No more pacts available*/ });
+			return;
 		}
+		this._buyItem_step2(model, event, callback);
 	},
 
 	build: function(model, maxBld){
diff --git a/js/science.js b/js/science.js
index cc626fb1b2..8aa4618107 100644
--- a/js/science.js
+++ b/js/science.js
@@ -1900,20 +1900,23 @@ dojo.declare("classes.ui.PolicyBtnController", com.nuclearunicorn.game.ui.Buildi
 		return confirmed;
 	},
 	buyItem: function(model, event, callback) {
-		if ((!model.metadata.researched && this.hasResources(model)) || this.game.devMode){
-			if(!this.shouldBeBough(model, this.game)){
-				callback(false);
-				return;
-			}
-			this.payPrice(model);
-
-			this.onPurchase(model);
-
-			callback(true);
-			this.game.render();
+		var isInDevMode = this.game.devMode;
+		if (!this.hasResources(model) && !isInDevMode) {
+			callback({ itemBought: false, reason: "cannot-afford" });
+			return;
+		}
+		if (model.metadata.researched && !isInDevMode) {
+			callback({ itemBought: false, reason: "already-bought" });
+			return;
+		}
+		if(!this.shouldBeBough(model, this.game)){
+			callback({ itemBought: false, reason: "*sigh* there are many reasons why you would be unable to purchase a policy & I cannot list them all here" });
 			return;
 		}
-		callback(false);
+		this.payPrice(model);
+		this.onPurchase(model);
+		callback({ itemBought: true, reason: (this.game.devMode ? "dev-mode" : "paid-for") });
+		this.game.render();
 	},
 	onPurchase: function(model){
 		this.inherited(arguments);
diff --git a/js/space.js b/js/space.js
index 49885f8e83..c280b820bb 100644
--- a/js/space.js
+++ b/js/space.js
@@ -1304,7 +1304,7 @@ dojo.declare("com.nuclearunicorn.game.ui.SpaceProgramBtnController", com.nuclear
 		if (model.metadata.val == 0) {
 			this.inherited(arguments);
 		} else {
-			callback(false);
+			callback({ itemBought: false, reason: "already-bought" });
 		}
 	},
 
diff --git a/js/time.js b/js/time.js
index d5d8db275d..52f730b068 100644
--- a/js/time.js
+++ b/js/time.js
@@ -984,19 +984,20 @@ dojo.declare("classes.ui.time.AccelerateTimeBtnController", com.nuclearunicorn.g
             tooltip: this.game.time.isAccelerated ? $I("time.AccelerateTimeBtn.tooltip.accelerated") : $I("time.AccelerateTimeBtn.tooltip.normal"),
             cssClass: this.game.time.isAccelerated ? "fugit-on" : "fugit-off",
             handler: function(btn, callback) {
-                if (self.game.resPool.get("temporalFlux").value <= 0) {
-                    self.game.time.isAccelerated = false;
-                    self.game.resPool.get("temporalFlux").value = 0;
-                } else {
-                    self.game.time.isAccelerated = !self.game.time.isAccelerated;
-                }
-                callback(true);
+                self.buyItem(null, null, callback);
             }
         };
         return model;
     },
 
-    buyItem: function() {
+    buyItem: function(model, event, callback) {
+        if (self.game.resPool.get("temporalFlux").value <= 0) {
+            self.game.time.isAccelerated = false;
+            self.game.resPool.get("temporalFlux").value = 0;
+        } else {
+            self.game.time.isAccelerated = !self.game.time.isAccelerated;
+        }
+        callback({ itemBought: true, reason: "item-is-free" /*It costs flux, but you can still toggle it freely*/ });
     }
 });
 
@@ -1199,15 +1200,20 @@ dojo.declare("classes.ui.time.ShatterTCBtnController", com.nuclearunicorn.game.u
 	},
 
     buyItem: function(model, event, callback){
-        if (model.enabled && this.hasResources(model)) {
-            var price = this.getPrices(model);
-            for (var i in price){
-                this.game.resPool.addResEvent(price[i].name, -price[i].val);
-            }
-            this.doShatter(model, 1);
-            callback(true);
+        if (!this.hasResources(model)) {
+			callback({ itemBought: false, reason: "cannot-afford" });
+			return true;
+		}
+		if (!model.enabled) {
+			callback({ itemBought: false, reason: "not-enabled" });
+			return true;
+		}
+        var price = this.getPrices(model);
+        for (var i in price){
+            this.game.resPool.addResEvent(price[i].name, -price[i].val);
         }
-        callback(false);
+        this.doShatter(model, 1);
+        callback({ itemBought: true, reason: "paid-for" });
         return true;
     },
 
@@ -1376,7 +1382,7 @@ dojo.declare("classes.ui.time.FixCryochamberBtnController", com.nuclearunicorn.g
 
 	buyItem: function(model, event, callback) {
 		if (!model.enabled) {
-			callback(false);
+			callback({ itemBought: false, reason: "not-enabled" });
 			return;
 		}
 
@@ -1395,8 +1401,10 @@ dojo.declare("classes.ui.time.FixCryochamberBtnController", com.nuclearunicorn.g
         if(fixHappened){
             var cry = this.game.time.getVSU("cryochambers");
             cry.calculateEffects(cry, this.game);
+            callback({ itemBought: true, reason: "paid-for" });
+        } else {
+			callback({ itemBought: false, reason: "cannot-afford" });
         }
-		callback(fixHappened);
 	},
 
     doFixCryochamber: function(model){
@@ -2257,8 +2265,8 @@ dojo.declare("classes.queue.manager", null,{
                     props.controller = new classes.ui.btn.BuildingBtnModernController(this.game);
                 }
                 var model = props.controller.fetchModel(props);
-                props.controller.build(model, 1);
-                buyItem = false;
+                //props.controller.build(model, 1);
+                //buyItem = false;
                 break;
 
             case "spaceMission":
@@ -2336,8 +2344,9 @@ dojo.declare("classes.queue.manager", null,{
             var deletedElement = this.queueItems.shift();
             this.game._publish("ui/update", this.game);
         }
+        var resultOfBuyingItem;
         if(buyItem){
-            props.controller.buyItem(model, 1,  function(result) {});
+            props.controller.buyItem(model, 1, function(args) { resultOfBuyingItem = args; });
         }
         var changed = false;
         if (Array.isArray(compare)){
diff --git a/js/workshop.js b/js/workshop.js
index 2ff298ae8d..9f8d04539e 100644
--- a/js/workshop.js
+++ b/js/workshop.js
@@ -2908,8 +2908,12 @@ dojo.declare("com.nuclearunicorn.game.ui.CraftButtonController", com.nuclearunic
 	},
 
 	buyItem: function(model, event, callback) {
-		this.game.workshop.craft(model.craft.name, 1);
-		callback(true);
+		var wasCraftSuccessful = this.game.workshop.craft(model.craft.name, 1);
+		if (wasCraftSuccessful) {
+			callback({ itemBought: true, reason: "paid-for" });
+		} else {
+			callback({ itemBought: false, reason: "cannot-afford" });
+		}
 	}
 });
 

From 3fe475625c286e3f57a455f22c74dff81e6b9a3f Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Mon, 13 Nov 2023 21:43:13 -0500
Subject: [PATCH 56/63] Add support for skipping items based on reason

---
 js/time.js | 191 +++++++++++------------------------------------------
 1 file changed, 40 insertions(+), 151 deletions(-)

diff --git a/js/time.js b/js/time.js
index 52f730b068..7a6464588f 100644
--- a/js/time.js
+++ b/js/time.js
@@ -2167,39 +2167,31 @@ dojo.declare("classes.queue.manager", null,{
 
             case "zigguratUpgrades":
                 props.controller = new com.nuclearunicorn.game.ui.ZigguratBtnController(this.game);
-                //var oldVal = itemMetaRaw.val;
                 var model = props.controller.fetchModel(props);
                 break;
 
             case "religion":
                 props.controller = new com.nuclearunicorn.game.ui.ReligionBtnController(this.game);
-                //var oldVal = itemMetaRaw.val;
                 var model = props.controller.fetchModel(props);
                 break;
 
             case "transcendenceUpgrades":
                 props.controller = new classes.ui.TranscendenceBtnController(this.game);
-                //var oldVal = itemMetaRaw.val;
                 var model = props.controller.fetchModel(props);
                 break;
 
             case "pacts":
                 props.controller = new com.nuclearunicorn.game.ui.PactsBtnController(this.game);
-                //var oldVal = itemMetaRaw.val;
                 var model = props.controller.fetchModel(props);
                 break;
 
             case "upgrades":
-                //compare = "researched";
                 props.controller = new com.nuclearunicorn.game.ui.UpgradeButtonController(this.game);
-                //var oldVal = itemMetaRaw.researched;
                 var model = props.controller.fetchModel(props);
                 break;
 
             case "zebraUpgrades":
-                //compare = "researched";
                 props.controller = new com.nuclearunicorn.game.ui.ZebraUpgradeButtonController(this.game);
-                //var oldVal = itemMetaRaw.researched;
                 var model = props.controller.fetchModel(props);
                 break;
         }
@@ -2211,7 +2203,6 @@ dojo.declare("classes.queue.manager", null,{
             return;
         }
         var el = this.queueItems[0];
-
         if (!el){
             console.warn("null queue item, skipping");
             this.queueItems.shift();
@@ -2219,163 +2210,61 @@ dojo.declare("classes.queue.manager", null,{
             return;
         }
 
-        var itemMetaRaw = this.game.getUnlockByName(el.name, el.type);
-        var compare = "val"; //we should do some sort of refractoring of the switch mechanism
-
-        if (!itemMetaRaw){
-            console.error("invalid queue item:", el);
+        var controllerAndModel = this.getQueueElementControllerAndModel(el);
+        if(!controllerAndModel || !controllerAndModel.controller || !controllerAndModel.model){
+            console.error(el.name + " of " + el.type + " queing is not supported!");
+            this.queueItems.shift();
+            this.game._publish("ui/update", this.game);
             return;
         }
 
-        var props = {
-            id: itemMetaRaw.name
-        };
-        var buyItem = true;
-
-        switch (el.type){
-            case "policies":
-                compare = ["researched", "blocked"];
-                props.controller = new classes.ui.PolicyBtnController(this.game);
-                var oldVal = {
-                    researched: itemMetaRaw.researched,
-                    blocked: itemMetaRaw.blocked
-                };
-                var model = props.controller.fetchModel(props);
-                break;
-                
-            case "tech":
-                compare = "researched";
-                props.controller = new com.nuclearunicorn.game.ui.TechButtonController(this.game);
-                var oldVal = itemMetaRaw.researched;
-                var model = props.controller.fetchModel(props);
-                break;
-
-            case "buildings":
-                var bld = new classes.BuildingMeta(itemMetaRaw).getMeta();
-                    oldVal = itemMetaRaw.val;
-                props = {
-                    key:            bld.name,
-                    name:           bld.label,
-                    description:    bld.description,
-                    building:       bld.name
-                };
-                if (typeof(bld.stages) == "object"){
-                    props.controller = new classes.ui.btn.StagingBldBtnController(this.game);
-                } else {
-                    props.controller = new classes.ui.btn.BuildingBtnModernController(this.game);
-                }
-                var model = props.controller.fetchModel(props);
-                //props.controller.build(model, 1);
-                //buyItem = false;
-                break;
-
-            case "spaceMission":
-                props.controller = new com.nuclearunicorn.game.ui.SpaceProgramBtnController(this.game);
-                var oldVal = itemMetaRaw.val;
-                var model = props.controller.fetchModel(props);
-                break;
-
-            case "spaceBuilding":
-                props.controller = new classes.ui.space.PlanetBuildingBtnController(this.game);
-                var oldVal = itemMetaRaw.val;
-                var model = props.controller.fetchModel(props);
-                break;
-
-            case "chronoforge":
-                props.controller = new classes.ui.time.ChronoforgeBtnController(this.game);
-                var oldVal = itemMetaRaw.val;
-                var model = props.controller.fetchModel(props);
-                break;
-
-            case "voidSpace":
-                props.controller = new classes.ui.time.VoidSpaceBtnController(this.game);
-                var oldVal = itemMetaRaw.val;
-                var model = props.controller.fetchModel(props);
-                if(el.name == "usedCryochambers"){ //a bunch of model black magic
-                    props.controller = new classes.ui.time.FixCryochamberBtnController(this.game);
-                    itemMetaRaw = this.game.getUnlockByName("cryochambers", el.type);
-                    model.prices = this.game.time.getVSU("usedCryochambers").fixPrices;
-                    model.enabled = this.game.resPool.hasRes(model.prices); //check we actually have enough to do one fix!
-                    //console.log(model);
-                }
-                break;
-
-            case "zigguratUpgrades":
-                props.controller = new com.nuclearunicorn.game.ui.ZigguratBtnController(this.game);
-                var oldVal = itemMetaRaw.val;
-                var model = props.controller.fetchModel(props);
-                break;
+        var resultOfBuyingItem = null;
+        //TODO: use null event instead of empty object
+        controllerAndModel.controller.buyItem(controllerAndModel.model, {}, function(args) { resultOfBuyingItem = args; });
 
-            case "religion":
-                props.controller = new com.nuclearunicorn.game.ui.ReligionBtnController(this.game);
-                var oldVal = itemMetaRaw.val;
-                var model = props.controller.fetchModel(props);
-                break;
-
-            case "transcendenceUpgrades":
-                props.controller = new classes.ui.TranscendenceBtnController(this.game);
-                var oldVal = itemMetaRaw.val;
-                var model = props.controller.fetchModel(props);
-                break;
-
-            case "pacts":
-                props.controller = new com.nuclearunicorn.game.ui.PactsBtnController(this.game);
-                var oldVal = itemMetaRaw.val;
-                var model = props.controller.fetchModel(props);
-                break;
+        if (typeof(resultOfBuyingItem) !== "object" || !resultOfBuyingItem) {
+            console.error("Invalid result after attempting to buy item via queue", resultOfBuyingItem);
+            return;
+        }
 
-            case "upgrades":
-                compare = "researched";
-                props.controller = new com.nuclearunicorn.game.ui.UpgradeButtonController(this.game);
-                var oldVal = itemMetaRaw.researched;
-                var model = props.controller.fetchModel(props);
-                break;
+        var reason = resultOfBuyingItem.reason; //String explaining *why* we failed to buy the item
 
-            case "zebraUpgrades":
-                compare = "researched";
-                props.controller = new com.nuclearunicorn.game.ui.ZebraUpgradeButtonController(this.game);
-                var oldVal = itemMetaRaw.researched;
-                var model = props.controller.fetchModel(props);
-                break;
-        }
-        
-        if(!props.controller){
-            console.error(el.name + " of " + el.type + " queing is not supported!");
-            var deletedElement = this.queueItems.shift();
-            this.game._publish("ui/update", this.game);
-        }
-        var resultOfBuyingItem;
-        if(buyItem){
-            props.controller.buyItem(model, 1, function(args) { resultOfBuyingItem = args; });
-        }
-        var changed = false;
-        if (Array.isArray(compare)){
-            for (var i in compare){
-                if (oldVal[compare[i]] != model.metadata[compare[i]]){
-                    changed = true;
-                }
-            }
-        }else{
-            changed = oldVal != model.metadata[compare];
-        }
-        if(changed){
+        //Depending on the result, do something different:
+        if (resultOfBuyingItem.itemBought){
+            //Item successfully purchased!  Remove it from the queue because we did it :D
             this.dropLastItem();
             this.game._publish("ui/update", this.game);
-            //console.log( "Successfully built " + el.name + " using the queue." );
+            console.log("Successfully built " + el.name + " using the queue because " + reason);
         } else {
-            //console.log( "Tried to build " + el.name + " using the queue, but failed." );
-            if( (compare == "researched" && model.metadata[compare] == true ) ||
-                (compare.includes("blocked") && model.metadata["blocked"] == true) ||
-                (compare.includes("researched") && model.metadata["researched"] == true) ||
-                (el.type === "spaceMission" && model.metadata[compare])
-            ){
+            if (this._isReasonToSkipItem(reason)) {
                 this.dropLastItem();
                 this.game._publish("ui/update", this.game);
-                //console.log( "Dropped " + el.name + " from the queue because it can't be built anymore." );
+                console.log("Dropped " + el.name + " from the queue because " + reason);
+            } else {
+                console.log("Tried to build " + el.name + " using the queue, but failed because " + reason);
             }
         }
     },
 
+    //Determines whether or not we should silently remove an item from the queue
+    //based on the reason WHY we can't buy it.
+    //@param reason     String containing a code passed to the callback function
+    //@return           Boolean.  If true, the item should be removed from the queue.
+    //                  If false, the queue should wait until we are able to purchase the item.
+    _isReasonToSkipItem: function(reason) {
+        if (reason == "paid-for" || reason == "item-is-free" || reason == "dev-mode") {
+            //These are used as reasons why we DID purchase the item.
+            //If we DID purchase the item, of course we want it removed from the queue!
+            return true;
+        }
+        if (reason == "already-bought" || reason == "player-denied") {
+            //These are good reasons the queue should skip over the item entirely.
+            return true;
+        }
+        //Else, most likely we just can't afford the item yet.
+        return false;
+    },
+
     //This function is to be called whenever a building is deltagraded.
     //This function iterates through all queue items with the same internal ID as the
     //deltagraded building & updates their labels to match the new version.

From 326cffec3e0b9f9baa59b083c1a0337286e15d36 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Tue, 14 Nov 2023 10:01:12 -0500
Subject: [PATCH 57/63] Add more detail to callback reasons

---
 core.js        | 11 ++++++++++-
 js/religion.js |  6 ++++++
 js/science.js  | 31 +++++++++++++++++++------------
 js/time.js     | 32 +++++++++++++++++++++++++-------
 4 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/core.js b/core.js
index 9e01c68e2e..1891bb75ca 100644
--- a/core.js
+++ b/core.js
@@ -1971,7 +1971,16 @@ dojo.declare("com.nuclearunicorn.game.ui.BuildingStackableBtnController", com.nu
 			return;
 		}
 		if (!model.enabled && !isInDevMode) {
-			callback({ itemBought: false, reason: "not-enabled" });
+			//Give a more detailed reason of why we can't buy it at this time:
+			var whyArentWeEnabled = "not-enabled"; //(default reason--unspecified)
+			var meta = model.metadata;
+			if (typeof(meta.limitBuild) == "number" && meta.limitBuild <= meta.val) {
+				whyArentWeEnabled = "already-bought";
+			} else if (meta.on && meta.noStackable){
+				whyArentWeEnabled = "already-bought";
+			}
+
+			callback({ itemBought: false, reason: whyArentWeEnabled });
 			return;
 		}
 		//Else, we meet all the requirements for being able to buy this item:
diff --git a/js/religion.js b/js/religion.js
index a84456719e..e8a8c396d7 100644
--- a/js/religion.js
+++ b/js/religion.js
@@ -1376,6 +1376,8 @@ dojo.declare("classes.ui.religion.TransformBtnController", com.nuclearunicorn.ga
 			return;
 		}
 		if (!model.enabled) {
+			//As far as I can tell, this shouldn't ever happen because being
+			//unable to afford it is the only reason for it to be disabled.
 			callback({ itemBought: false, reason: "not-enabled" });
 			return;
 		}
@@ -1401,6 +1403,8 @@ dojo.declare("classes.ui.religion.TransformBtnController", com.nuclearunicorn.ga
 			return;
 		}
 		if (!model.enabled) {
+			//As far as I can tell, this shouldn't ever happen because being
+			//unable to afford it is the only reason for it to be disabled.
 			callback({ itemBought: false, reason: "not-enabled" });
 			return;
 		}
@@ -1497,6 +1501,8 @@ dojo.declare("classes.ui.religion.RefineTearsBtnController", com.nuclearunicorn.
 			return;
 		}
 		if (!model.enabled) {
+			//As far as I can tell, this shouldn't ever happen because being
+			//unable to afford it is the only reason for it to be disabled.
 			callback({ itemBought: false, reason: "not-enabled" });
 			return;
 		}
diff --git a/js/science.js b/js/science.js
index 8aa4618107..01499e0206 100644
--- a/js/science.js
+++ b/js/science.js
@@ -1874,43 +1874,50 @@ dojo.declare("classes.ui.PolicyBtnController", com.nuclearunicorn.game.ui.Buildi
 		}
 	},
 
-	shouldBeBough: function(model, game){ //fail checks:
+	//Returns an object with two fields:
+	//	itemBought:	Boolean.  Are we able to buy this policy at this time?
+	//	reason:		String.  If we can't buy it, why not?  If we can buy it, returns
+	//				"paid-for" regardless of whether we can actually afford it or not.
+	shouldBeBought: function(model, game){ //fail checks:
 		if(this.game.village.leader && model.metadata.requiredLeaderJob && this.game.village.leader.job != model.metadata.requiredLeaderJob){
 			var jobTitle = this.game.village.getJob(model.metadata.requiredLeaderJob).title;
 			this.game.msg($I("msg.policy.wrongLeaderJobForResearch", [model.metadata.label, jobTitle]), "important");
-			return false;
+			return { itemBought: false, reason: "blocked" };
 		}else if(model.metadata.name == "transkittenism" && this.game.bld.getBuildingExt("aiCore").meta.effects["aiLevel"] >= 15){
 			this.game.msg($I("msg.policy.aiNotMerges"),"alert", "ai");
-			return false;
+			return { itemBought: false, reason: "blocked" };
 		}else if(model.metadata.blocked != true) {
              for(var i = 0; i < model.metadata.blocks.length; i++){
                 if(this.game.science.getPolicy(model.metadata.blocks[i]).researched){
                     model.metadata.blocked = true;
-                    return false;
+				return { itemBought: false, reason: "blocked" };
                 }
 			}
 			var confirmed = false; //confirmation:
 			if(game.opts.noConfirm){
-				return true;
+				return { itemBought: true, reason: "paid-for" };
 			}
 			game.ui.confirm($I("policy.confirmation.title"), $I("policy.confirmation.title"), function() {
 				confirmed = true;
 			});
+			return confirmed ? { itemBought: true, reason: "paid-for" } : { itemBought: false, reason: "player-denied" };
 		}
-		return confirmed;
+		//Else, the policy was blocked:
+		return { itemBought: false, reason: "blocked" };
 	},
 	buyItem: function(model, event, callback) {
 		var isInDevMode = this.game.devMode;
-		if (!this.hasResources(model) && !isInDevMode) {
-			callback({ itemBought: false, reason: "cannot-afford" });
-			return;
-		}
 		if (model.metadata.researched && !isInDevMode) {
 			callback({ itemBought: false, reason: "already-bought" });
 			return;
 		}
-		if(!this.shouldBeBough(model, this.game)){
-			callback({ itemBought: false, reason: "*sigh* there are many reasons why you would be unable to purchase a policy & I cannot list them all here" });
+		if (!this.hasResources(model) && !isInDevMode) {
+			callback({ itemBought: false, reason: "cannot-afford" });
+			return;
+		}
+		var result = this.shouldBeBought(model, this.game);
+		if(!result.itemBought){
+			callback(result); //Tell them *why* we failed to buy the item.
 			return;
 		}
 		this.payPrice(model);
diff --git a/js/time.js b/js/time.js
index 7a6464588f..01902f7f8d 100644
--- a/js/time.js
+++ b/js/time.js
@@ -1205,6 +1205,8 @@ dojo.declare("classes.ui.time.ShatterTCBtnController", com.nuclearunicorn.game.u
 			return true;
 		}
 		if (!model.enabled) {
+            //As far as I can tell, this shouldn't ever happen because being
+            //unable to afford it is the only reason for it to be disabled.
 			callback({ itemBought: false, reason: "not-enabled" });
 			return true;
 		}
@@ -1381,10 +1383,18 @@ dojo.declare("classes.ui.time.FixCryochamberBtnController", com.nuclearunicorn.g
     },
 
 	buyItem: function(model, event, callback) {
-		if (!model.enabled) {
-			callback({ itemBought: false, reason: "not-enabled" });
+        if (this.game.time.getVSU("usedCryochambers").val == 0) {
+			callback({ itemBought: false, reason: "already-bought" });
+			return;
+        }
+		if (!model.visible) {
+			callback({ itemBought: false, reason: "not-unlocked" });
 			return;
 		}
+        if (!this.hasResources(model)) {
+			callback({ itemBought: false, reason: "cannot-afford" });
+			return;
+        }
 
 		var fixCount = event.shiftKey
 			? 1000
@@ -1403,7 +1413,7 @@ dojo.declare("classes.ui.time.FixCryochamberBtnController", com.nuclearunicorn.g
             cry.calculateEffects(cry, this.game);
             callback({ itemBought: true, reason: "paid-for" });
         } else {
-			callback({ itemBought: false, reason: "cannot-afford" });
+			callback({ itemBought: false, reason: "not-enabled" });
         }
 	},
 
@@ -1430,6 +1440,14 @@ dojo.declare("classes.ui.time.FixCryochamberBtnController", com.nuclearunicorn.g
     //This is a bit of a hack to get the correct description to appear in the queue tooltips...
     getDescription: function(model) {
         return $I("time.fixCryochambers.desc");
+    },
+
+    getPrices: function(model) {
+        if (!model.prices) {
+            //Initialize model.prices if it hasn't been initialized already.
+            model.prices = this.game.time.getVSU("usedCryochambers").fixPrices;
+        }
+        return model.prices;
     }
 });
 
@@ -1439,7 +1457,7 @@ dojo.declare("classes.ui.VoidSpaceWgt", [mixin.IChildrenAware, mixin.IGameAware]
 		this.addChild(new com.nuclearunicorn.game.ui.ButtonModern({
             name: $I("time.fixCryochambers.label"),
             description: $I("time.fixCryochambers.desc"),
-            prices: game.time.getVSU("usedCryochambers").fixPrices,
+            //The prices field will be set when getPrices is called.
             /*prices: [
 				{name: "temporalFlux", val: 3000},
 				{name: "timeCrystal", val: 100},
@@ -2160,8 +2178,8 @@ dojo.declare("classes.queue.manager", null,{
                     props.controller = new classes.ui.time.FixCryochamberBtnController(this.game);
                     itemMetaRaw = this.game.getUnlockByName("cryochambers", el.type);
                     model.prices = this.game.time.getVSU("usedCryochambers").fixPrices;
-                    model.enabled = this.game.resPool.hasRes(model.prices); //check we actually have enough to do one fix!
-                    //console.log(model);
+                    props.controller.updateVisible(model);
+                    props.controller.updateEnabled(model);
                 }
                 break;
 
@@ -2257,7 +2275,7 @@ dojo.declare("classes.queue.manager", null,{
             //If we DID purchase the item, of course we want it removed from the queue!
             return true;
         }
-        if (reason == "already-bought" || reason == "player-denied") {
+        if (reason == "already-bought" || reason == "blocked" || reason == "player-denied") {
             //These are good reasons the queue should skip over the item entirely.
             return true;
         }

From 1fbf7845b87da00433d7b313b8b79809c46aa4da Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Tue, 14 Nov 2023 11:00:08 -0500
Subject: [PATCH 58/63] Add some documentation

---
 core.js    | 32 ++++++++++++++++++++++++++++++++
 js/time.js |  6 +++---
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/core.js b/core.js
index 1891bb75ca..004bbfb5a7 100644
--- a/core.js
+++ b/core.js
@@ -707,6 +707,38 @@ dojo.declare("com.nuclearunicorn.game.ui.ButtonController", null, {
 		model.handler.apply(this, [model, event]);
 	},
 
+	/* This is probably the most important function in the button's code--when you click the button, it does the thing.
+	 * This function also handles logic such as "what if you click the button but can't afford it right now."
+	 * The name "buy item" is somewhat misleading, as ALL buttons in the UI (at least, all that inherit from this class)
+	 * use this function.  Buttons like the "send hunters" button or the "reset game" button use their clickHandler to do the thing.
+	 * Other buttons such as those for buildings or techs override the buyItem function to put their own custom logic in, but
+	 * all implementations of buyItem follow the same principles.
+	 * @param model	Object.  The model of this item.  For those unfamiliar with the Kittens Game game engine, the model
+	 * 				specifies data such as the name of the item, whether it's visible, whether it's enabled, its prices,
+	 * 				its effects, the metadata associated with this building, etc.
+	 * @param event	(OPTIONAL) Object.  If given, contains information such as whether the shift key was pressed.  This is
+	 * 				used by buildings to determine if we're buying 1, buying 10, buying all, etc.  If null, uses default behavior.
+	 * @param callback	Function.  This is how we communicate the results of trying to buy the item.  The callback function is called
+	 * 				with a single parameter, an object containing two fields:
+	 * 					itemBought	Boolean.  True if one or more items were bought, false if nothing happened.
+	 * 					reason		String.  Used as an enumeration encoding *why* the result happened the way it did.
+	 * 								If itemBought is true, can be one of the following values:
+	 * 									"paid-for"		We met the requirements & bought the item legitimately.
+	 * 									"dev-mode"		We bought this item in dev mode ignoring the cost & requirements.
+	 * 									"item-is-free"		The item has no cost or requirements.
+	 * 								If itemBought is false, can be one of the following values:
+	 * 									"not-unlocked"		The item is not unlocked yet.
+	 * 									"already-bought"	For one-time purchases, the item is already bought.
+	 * 													For purchases with a limit, we are at that limit.
+	 * 									"blocked"			A conflicting item has already been bought.
+	 * 													Also used by some policies to indicate additional unmet requirements.
+	 * 									"player-denied"	This item requires the player to confirm their choice, but
+	 * 													the player decided not to confirm the purchase.
+	 * 									"cannot-afford"	The player can't afford the price of this item right now.
+	 * 									"not-enabled"		For some unspecified reason, this item is not available.
+	 * 				If the callback function returns anything, the return value from that function is ignored.
+	 * @return		No return value.  We communicate with the rest of the program using the callback function.
+	 */
 	buyItem: function(model, event, callback){
 		if (!this.hasResources(model)) {
 			callback({ itemBought: false, reason: "cannot-afford" });
diff --git a/js/time.js b/js/time.js
index 01902f7f8d..4ef11aba37 100644
--- a/js/time.js
+++ b/js/time.js
@@ -2252,14 +2252,14 @@ dojo.declare("classes.queue.manager", null,{
             //Item successfully purchased!  Remove it from the queue because we did it :D
             this.dropLastItem();
             this.game._publish("ui/update", this.game);
-            console.log("Successfully built " + el.name + " using the queue because " + reason);
+            //console.log("Successfully built " + el.name + " using the queue because " + reason);
         } else {
             if (this._isReasonToSkipItem(reason)) {
                 this.dropLastItem();
                 this.game._publish("ui/update", this.game);
-                console.log("Dropped " + el.name + " from the queue because " + reason);
+                //console.log("Dropped " + el.name + " from the queue because " + reason);
             } else {
-                console.log("Tried to build " + el.name + " using the queue, but failed because " + reason);
+                //console.log("Tried to build " + el.name + " using the queue, but failed because " + reason);
             }
         }
     },

From bfd96663bfb3ac4d0f687e1d5bc77832cd81f62a Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Tue, 14 Nov 2023 11:16:57 -0500
Subject: [PATCH 59/63] Make the "event" parameter optional

---
 core.js        | 2 ++
 js/religion.js | 4 +++-
 js/time.js     | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/core.js b/core.js
index 004bbfb5a7..8d8a9fdcf2 100644
--- a/core.js
+++ b/core.js
@@ -749,6 +749,7 @@ dojo.declare("com.nuclearunicorn.game.ui.ButtonController", null, {
 			return;
 		}
 		//Else, we meet all requirements to buy this item:
+		if (!event) { event = {}; /*event is an optional parameter*/ }
 		this.clickHandler(model, event);
 		this.payPrice(model);
 
@@ -2031,6 +2032,7 @@ dojo.declare("com.nuclearunicorn.game.ui.BuildingStackableBtnController", com.nu
 	},
 
 	_buyItem_step2: function(model, event, callback) {
+		if (!event) { event = {}; /*event is an optional parameter*/ }
 		//This is what we pass to the callback function if we succeed:
 		var resultIfBuySuccessful = { itemBought: true, reason: (this.game.devMode ? "dev-mode" : "paid-for") };
 
diff --git a/js/religion.js b/js/religion.js
index e8a8c396d7..ff61f75be9 100644
--- a/js/religion.js
+++ b/js/religion.js
@@ -1381,6 +1381,7 @@ dojo.declare("classes.ui.religion.TransformBtnController", com.nuclearunicorn.ga
 			callback({ itemBought: false, reason: "not-enabled" });
 			return;
 		}
+		if (!event) { event = {}; /*event is an optional parameter*/ }
 		var batchSize = event.shiftKey ? 10000 :
 			event.ctrlKey || event.metaKey ? this.game.opts.batchSize : 1;
 		var didWeSucceed = this._transform(model, batchSize);
@@ -1486,7 +1487,7 @@ dojo.declare("classes.ui.religion.RefineTearsBtnController", com.nuclearunicorn.
 				&& self._canAfford(model, count) >= count,
 			title: "x" + count,
 			handler: function (event) {
-				self.buyItem(model, {}, this.update.bind(this), count);
+				self.buyItem(model, null, this.update.bind(this), count);
 			}
 		};
 	},
@@ -1512,6 +1513,7 @@ dojo.declare("classes.ui.religion.RefineTearsBtnController", com.nuclearunicorn.
 			callback({ itemBought: false, reason: "already-bought" });
 			return;
 		}
+		if (!event) { event = {}; /*event is an optional parameter*/ }
 		for (var batchSize = count || (event.ctrlKey ? this.game.opts.batchSize : 1);
 			 batchSize > 0
 			 && this.hasResources(model)
diff --git a/js/time.js b/js/time.js
index 4ef11aba37..631a0ba952 100644
--- a/js/time.js
+++ b/js/time.js
@@ -1396,6 +1396,7 @@ dojo.declare("classes.ui.time.FixCryochamberBtnController", com.nuclearunicorn.g
 			return;
         }
 
+		if (!event) { event = {}; /*event is an optional parameter*/ }
 		var fixCount = event.shiftKey
 			? 1000
 			: event.ctrlKey || event.metaKey /*osx tears*/
@@ -2237,8 +2238,7 @@ dojo.declare("classes.queue.manager", null,{
         }
 
         var resultOfBuyingItem = null;
-        //TODO: use null event instead of empty object
-        controllerAndModel.controller.buyItem(controllerAndModel.model, {}, function(args) { resultOfBuyingItem = args; });
+        controllerAndModel.controller.buyItem(controllerAndModel.model, null, function(args) { resultOfBuyingItem = args; });
 
         if (typeof(resultOfBuyingItem) !== "object" || !resultOfBuyingItem) {
             console.error("Invalid result after attempting to buy item via queue", resultOfBuyingItem);

From 9b7aaa8e6351405c5f382ac5b6d7a8d01f9fc65b Mon Sep 17 00:00:00 2001
From: SilenceFactor <149717374+SilenceFactor@users.noreply.github.com>
Date: Thu, 16 Nov 2023 12:23:56 +0100
Subject: [PATCH 60/63] Hydroponics display bug solution

---
 core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core.js b/core.js
index 60f6fe844c..81ef12423b 100644
--- a/core.js
+++ b/core.js
@@ -1560,7 +1560,7 @@ dojo.declare("com.nuclearunicorn.game.ui.BuildingBtnController", com.nuclearunic
 		var nextEffectValue = underlying.effects[effectName];
 		underlying.on--;
 		underlying.updateEffects(underlying, this.game);
-		//(cycleEffectsBasics is only relevant for space buildings & it will be applied at a later time so we skip it for now)
+		this.game.calendar.cycleEffectsBasics(underlying.effects, underlying.name);
 		return nextEffectValue;
 	},
 

From 7d00fb8579a8b7394c7d3c127f3239f9343a796a Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Thu, 16 Nov 2023 22:22:05 -0500
Subject: [PATCH 61/63] Properly reset the state of the queue in between tests

---
 js/time.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/js/time.js b/js/time.js
index 631a0ba952..73a8738835 100644
--- a/js/time.js
+++ b/js/time.js
@@ -137,6 +137,8 @@ dojo.declare("classes.managers.TimeManager", com.nuclearunicorn.core.TabManager,
 			var bld = this.voidspaceUpgrades[i];
 			this.resetStateStackable(bld);
 		}
+
+        this.queue.resetState();
     },
 
     update: function(){
@@ -1740,6 +1742,14 @@ dojo.declare("classes.queue.manager", null,{
         
     },
 
+    resetState: function() {
+        this.cap = this.baseCap;
+        this.alphabeticalSort = true;
+        this.queueItems = [];
+        this.queueSources = dojo.clone(this.queueSourcesDefault);
+        this.queueSourcesArr = [{name: "buildings", label: $I("buildings.tabName")}];
+    },
+
     /**
      * Get maximum amount if individual (not grouped) items in the queue (see #queueLength)
      */

From 700b0c17890e477b41c73cc69b3ae69d95afc8ac Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Fri, 17 Nov 2023 12:47:25 -0500
Subject: [PATCH 62/63] Add unit tests

---
 test/game.test.js | 389 ++++++++++++++++++++++++++++++++++++++++++++++
 test/setup.js     |  13 +-
 2 files changed, 398 insertions(+), 4 deletions(-)

diff --git a/test/game.test.js b/test/game.test.js
index 834a9b05e6..3747612e36 100644
--- a/test/game.test.js
+++ b/test/game.test.js
@@ -419,6 +419,32 @@ test("Queue should correctly add and remove items", () => {
     expect(queue.queueItems[1].value).toBe(11);
 });
 
+test("Queue should correctly skip one-time purchases if already bought", () => {
+    let queue = game.time.queue;
+
+    //The queue should skip techs that are already researched:
+    game.science.get("calendar").researched = true;
+    game.resPool.get("science").value = 30; //Enough to purchase the Calendar tech.
+    queue.addToQueue("calendar", "tech", "N/A");
+    expect(queue.queueLength()).toBe(1);
+    queue.update();
+    expect(queue.queueLength()).toBe(0);
+    expect(game.resPool.get("science").value).toBe(30); //We didn't spend any science because we skipped the item
+
+    //The queue should skip both researched & blocked policies:
+    game.science.getPolicy("liberty").researched = true;
+    game.science.getPolicy("tradition").blocked = true;
+    game.resPool.get("culture").value = 150; //Enough to purchase either policy.
+    queue.addToQueue("liberty", "policies", "N/A");
+    queue.addToQueue("tradition", "policies", "N/A");
+    expect(queue.queueLength()).toBe(2);
+    queue.update();
+    expect(queue.queueLength()).toBe(1);
+    queue.update();
+    expect(queue.queueLength()).toBe(0);
+    expect(game.resPool.get("culture").value).toBe(150);
+});
+
 //--------------------------------
 //      Spaceport test
 //--------------------------------
@@ -447,4 +473,367 @@ test("Spaceports should be unlocked correctly and have a custom price logic appl
     expect(Math.round(_get("warehouse").prices.find(price => price.name == "titanium").val)).toBe(40456);
     //starchart price should skyroket due to the custom price ratio
     expect(Math.round(_get("warehouse").prices.find(price => price.name == "starchart").val)).toBe(8134223);
+});
+
+//--------------------------------
+//      buyItem internals
+//--------------------------------
+test("buyItem internals should work properly for Resource Retrieval", () => {
+    const controller = new classes.ui.time.ChronoforgeBtnController(game);
+    const model = controller.fetchModel({ id: "ressourceRetrieval" });
+    let callbackResult = null;
+    const callbackFunction = function(result) { callbackResult = result; };
+
+    //Before we get started, this test assumes certain things about Resource Retrievals:
+    //We assume there is a limit of 100.
+    //We assume the first one costs 1000 time crystals (TCs).
+    //We assume the price ratio is 1.3.
+    //Resource Retrievals should be representative of most buildings in the game, plus it has the unique limitBuild feature.
+
+    //Try buying an item, but we have 0 TCs so it should fail:
+    controller.updateEnabled(model);
+    controller.buyItem(model, null, callbackFunction);
+    expect(model.metadata.on).toBe(0);
+    expect(model.metadata.val).toBe(0);
+    expect(callbackResult).toHaveProperty("itemBought", false);
+    expect(callbackResult).toHaveProperty("reason", "cannot-afford");
+
+    //Enter dev mode:
+    game.devMode = true;
+    controller.updateEnabled(model);
+    controller.buyItem(model, null, callbackFunction);
+    expect(model.metadata.on).toBe(1);
+    expect(model.metadata.val).toBe(1);
+    expect(callbackResult).toHaveProperty("itemBought", true);
+    expect(callbackResult).toHaveProperty("reason", "dev-mode");
+
+    //Now exit dev mode & try to buy the next building legitimately.
+    game.devMode = false;
+    game.resPool.get("timeCrystal").value = 1350; //Enough for 1, with some spare change
+    controller.updateEnabled(model); //After we gain the resources, there'd usually be a UI update that calls this
+    controller.buyItem(model, null, callbackFunction);
+    expect(game.resPool.get("timeCrystal").value).toBe(50);
+    expect(model.metadata.on).toBe(2);
+    expect(model.metadata.val).toBe(2);
+    expect(callbackResult).toHaveProperty("itemBought", true);
+    expect(callbackResult).toHaveProperty("reason", "paid-for");
+
+    //Test that holding the CTRL key builds batchSize of the item.
+    //Along the way, we'll test that the price updated properly.
+    game.opts.batchSize = 6;
+    game.resPool.get("timeCrystal").value = 100000; //Way more than needed
+    controller.updateEnabled(model);
+    controller.buyItem(model, { ctrlKey: true, shiftKey: false }, callbackFunction);
+    expect(game.resPool.get("timeCrystal").value).toBeCloseTo(78442.3093, 4);
+    expect(model.metadata.on).toBe(8);
+    expect(model.metadata.val).toBe(8);
+    expect(callbackResult).toHaveProperty("itemBought", true);
+    expect(callbackResult).toHaveProperty("reason", "paid-for");
+
+    //Test that holding the SHIFT key builds as many of the item as you can afford & overrides CTRL key.
+    game.opts.noConfirm = true;
+    game.resPool.get("timeCrystal").value = 1000000; //Enough to go from 8 to 21 buildings.
+    controller.updateEnabled(model);
+    controller.buyItem(model, { ctrlKey: true, shiftKey: true }, callbackFunction);
+    expect(model.metadata.on).toBe(21);
+    expect(model.metadata.val).toBe(21);
+    expect(game.resPool.get("timeCrystal").value).toBeCloseTo(203642.5938, 4);
+    expect(callbackResult).toHaveProperty("itemBought", true);
+    expect(callbackResult).toHaveProperty("reason", "paid-for");
+
+    //Test that we get the same result no matter the event parameters if we can't afford any.
+    //We'll test each combination of 2 Boolean parameters for a total of 2^2 = 4 combinations
+    controller.updateEnabled(model);
+    controller.buyItem(model, { ctrlKey: true, shiftKey: true }, callbackFunction);     //11
+    expect(callbackResult).toHaveProperty("itemBought", false);
+    expect(callbackResult).toHaveProperty("reason", "cannot-afford");
+    controller.updateEnabled(model);
+    controller.buyItem(model, { ctrlKey: false, shiftKey: true }, callbackFunction);    //01
+    expect(callbackResult).toHaveProperty("itemBought", false);
+    expect(callbackResult).toHaveProperty("reason", "cannot-afford");
+    controller.updateEnabled(model);
+    controller.buyItem(model, { ctrlKey: true, shiftKey: false }, callbackFunction);    //10
+    expect(callbackResult).toHaveProperty("itemBought", false);
+    expect(callbackResult).toHaveProperty("reason", "cannot-afford");
+    controller.updateEnabled(model);
+    controller.buyItem(model, { ctrlKey: false, shiftKey: false }, callbackFunction);   //00
+    expect(callbackResult).toHaveProperty("itemBought", false);
+    expect(callbackResult).toHaveProperty("reason", "cannot-afford");
+
+    //Double-check that nothing was built in any of those 4 tests:
+    expect(model.metadata.on).toBe(21);
+    expect(model.metadata.val).toBe(21);
+
+    //Test that if we have unlimited resources, we only build up to the limit.
+    game.resPool.get("timeCrystal").value = Infinity;
+    controller.updateEnabled(model);
+    controller.buyItem(model, { ctrlKey: false, shiftKey: true }, callbackFunction);
+    expect(model.metadata.on).toBe(100);
+    expect(model.metadata.val).toBe(100);
+    expect(callbackResult).toHaveProperty("itemBought", true);
+    expect(callbackResult).toHaveProperty("reason", "paid-for");
+
+    //Test that we can't buy any more even if we have unlimited resources.
+    controller.updateEnabled(model);
+    controller.buyItem(model, null, callbackFunction);
+    expect(model.metadata.on).toBe(100);
+    expect(model.metadata.val).toBe(100);
+    expect(callbackResult).toHaveProperty("itemBought", false);
+    expect(callbackResult).toHaveProperty("reason", "already-bought");
+});
+
+test("buyItem internals should work properly for Calendar", () => {
+    const controller = new com.nuclearunicorn.game.ui.TechButtonController(game);
+    const model = controller.fetchModel({ id: "calendar" });
+    let callbackResult = null;
+    const callbackFunction = function(result) { callbackResult = result; };
+
+    //Before we get started, this test assumes certain things about Calendar:
+    //We assume it costs 30 science.
+    //Calendar should be representative of most techs & upgrades in the game.
+
+    //Try buying an item, but we have 0 science so it should fail:
+    controller.updateEnabled(model);
+    controller.buyItem(model, null, callbackFunction);
+    expect(model.metadata.researched).toBe(false);
+    expect(callbackResult).toHaveProperty("itemBought", false);
+    expect(callbackResult).toHaveProperty("reason", "cannot-afford");
+
+    //Give ourselves plenty of science & try again; this time it should succeed:
+    game.resPool.get("science").value = 100;
+    controller.updateEnabled(model);
+    controller.buyItem(model, null, callbackFunction);
+    expect(model.metadata.researched).toBe(true);
+    expect(callbackResult).toHaveProperty("itemBought", true);
+    expect(callbackResult).toHaveProperty("reason", "paid-for");
+    expect(game.resPool.get("science").value).toBe(70);
+
+    //Try again; this time it should fail because already bought:
+    controller.updateEnabled(model);
+    controller.buyItem(model, null, callbackFunction);
+    expect(model.metadata.researched).toBe(true);
+    expect(callbackResult).toHaveProperty("itemBought", false);
+    expect(callbackResult).toHaveProperty("reason", "already-bought");
+    expect(game.resPool.get("science").value).toBe(70);
+});
+
+test("buyItem internals should work properly for Liberty & Tradition", () => {
+    const controller = new classes.ui.PolicyBtnController(game);
+    let model = controller.fetchModel({ id: "liberty" });
+    let callbackResult = null;
+    const callbackFunction = function(result) { callbackResult = result; };
+    
+    //Before we get started, this test assumes certain things about Liberty:
+    //We assume it costs 150 culture.
+    //Liberty should be representative of most policies in the game.
+    //Some policies have special conditions under which they're blocked; I won't test those here.
+
+    game.opts.noConfirm = true;
+    
+    //Try buying an item, but we have 0 culture so it should fail:
+    controller.updateEnabled(model);
+    controller.buyItem(model, null, callbackFunction);
+    expect(model.metadata.researched).toBe(false);
+    expect(callbackResult).toHaveProperty("itemBought", false);
+    expect(callbackResult).toHaveProperty("reason", "cannot-afford");
+
+    //Give ourselves plenty of culture & try again; this time it should succeed:
+    game.resPool.get("culture").value = 500;
+    controller.updateEnabled(model);
+    controller.buyItem(model, null, callbackFunction);
+    expect(model.metadata.researched).toBe(true);
+    expect(callbackResult).toHaveProperty("itemBought", true);
+    expect(callbackResult).toHaveProperty("reason", "paid-for");
+    expect(game.resPool.get("culture").value).toBe(350);
+
+    //Try again; this time it should fail because already bought:
+    controller.updateEnabled(model);
+    controller.buyItem(model, null, callbackFunction);
+    expect(model.metadata.researched).toBe(true);
+    expect(callbackResult).toHaveProperty("itemBought", false);
+    expect(callbackResult).toHaveProperty("reason", "already-bought");
+    expect(game.resPool.get("culture").value).toBe(350);
+
+    //Now test that Tradition is correctly blocked.
+    model = controller.fetchModel({ id: "tradition" });
+    expect(model.metadata.blocked).toBe(true);
+    controller.updateEnabled(model);
+    controller.buyItem(model, null, callbackFunction);
+    expect(model.metadata.researched).toBe(false);
+    expect(callbackResult).toHaveProperty("itemBought", false);
+    expect(callbackResult).toHaveProperty("reason", "blocked");
+    expect(game.resPool.get("culture").value).toBe(350);
+});
+
+test("buyItem internals should work properly for Fix Cryochamber", () => {
+    const controller = new classes.ui.time.FixCryochamberBtnController(game);
+    let model = controller.fetchModel({});
+    let callbackResult = null;
+    const callbackFunction = function(result) { callbackResult = result; };
+    const cryochambers = game.time.getVSU("cryochambers");
+    const usedCryochambers = game.time.getVSU("usedCryochambers");
+
+    //Fixing a Cryochamber should fail when we don't have any Used Cryochambers.
+    controller.updateEnabled(model);
+    controller.updateVisible(model);
+    controller.buyItem(model, null, callbackFunction);
+    expect(callbackResult).toHaveProperty("itemBought", false);
+    expect(callbackResult).toHaveProperty("reason", "already-bought");
+    expect(cryochambers.val).toBe(0);
+    expect(usedCryochambers.val).toBe(0);
+
+    usedCryochambers.val = 5;
+    usedCryochambers.on = 5;
+
+    //Fixing a Cryochamber should fail when it's not unlocked yet.
+    controller.updateEnabled(model);
+    controller.updateVisible(model);
+    controller.buyItem(model, null, callbackFunction);
+    expect(callbackResult).toHaveProperty("itemBought", false);
+    expect(callbackResult).toHaveProperty("reason", "not-unlocked");
+    expect(cryochambers.val).toBe(0);
+    expect(usedCryochambers.val).toBe(5);
+
+    game.workshop.get("chronoforge").researched = true;
+
+    //Fixing a Cryochamber should fail when we can't afford it.
+    controller.updateEnabled(model);
+    controller.updateVisible(model);
+    controller.buyItem(model, null, callbackFunction);
+    expect(callbackResult).toHaveProperty("itemBought", false);
+    expect(callbackResult).toHaveProperty("reason", "cannot-afford");
+    expect(cryochambers.val).toBe(0);
+    expect(usedCryochambers.val).toBe(5);
+
+    for(const res of usedCryochambers.fixPrices) {
+        game.resPool.addResEvent(res.name, res.val + 1 /*Give us a little extra to check the price is correct*/);
+    }
+
+    //Fixing a Cryochamber should succeed this time.
+    controller.updateEnabled(model);
+    controller.updateVisible(model);
+    controller.buyItem(model, null, callbackFunction);
+    expect(callbackResult).toHaveProperty("itemBought", true);
+    expect(callbackResult).toHaveProperty("reason", "paid-for");
+    expect(cryochambers.val).toBe(1);
+    expect(usedCryochambers.val).toBe(4);
+
+    //Now check that it should have cost us the correct amount of resources:
+    for(const res of usedCryochambers.fixPrices) {
+        expect(game.resPool.get(res.name).value).toBe(1);
+    }
+});
+
+test("buyItem internals should work properly for crafting steel", () => {
+    const controller = new com.nuclearunicorn.game.ui.CraftButtonController(game);
+    const model = controller.fetchModel({ craft: "steel" });
+    let callbackResult = null;
+    const callbackFunction = function(result) { callbackResult = result; };
+    
+    //Before we get started, this test assumes certain things about crafting steel:
+    //We assume it costs 100 iron, 100 coal per craft.
+
+    //We should start out with no resources:
+    expect(game.resPool.get("steel").value).toBe(0);
+    expect(game.resPool.get("iron").value).toBe(0);
+    expect(game.resPool.get("coal").value).toBe(0);
+
+    //Crafting should fail when we can't afford it:
+    controller.buyItem(model, null, callbackFunction);
+    expect(callbackResult).toHaveProperty("itemBought", false);
+    expect(game.resPool.get("steel").value).toBe(0);
+    expect(callbackResult).toHaveProperty("itemBought", false);
+    expect(callbackResult).toHaveProperty("reason", "cannot-afford");
+
+    //Crafting should succeed when we can afford it:
+    game.resPool.addResEvent("iron", 199);
+    game.resPool.addResEvent("coal", 199);
+    controller.buyItem(model, null, callbackFunction);
+    expect(game.resPool.get("steel").value).toBe(1);
+    expect(callbackResult).toHaveProperty("itemBought", true);
+    expect(callbackResult).toHaveProperty("reason", "paid-for");
+
+    //Crafting should fail again because we consumed resources & don't have enough anymore:
+    controller.buyItem(model, null, callbackFunction);
+    expect(game.resPool.get("steel").value).toBe(1);
+    expect(game.resPool.get("iron").value).toBe(99);
+    expect(game.resPool.get("coal").value).toBe(99);
+    expect(callbackResult).toHaveProperty("itemBought", false);
+    expect(callbackResult).toHaveProperty("reason", "cannot-afford");
+});
+
+test("buyItem internals should work properly for shattering time crystals", () => {
+    const controller = new classes.ui.time.ShatterTCBtnController(game);
+    const model = controller.fetchModel({ prices: [{name: "timeCrystal", val: 1}] });
+    let callbackResult = null;
+    const callbackFunction = function(result) { callbackResult = result; };
+
+    //For shattering TCs, we'll watch what happens with the calendar year:
+    expect(game.calendar.year).toBe(0);
+
+    //Shattering should fail when we can't afford it:
+    controller.updateEnabled(model);
+    controller.buyItem(model, null, callbackFunction);
+    expect(game.calendar.year).toBe(0);
+    expect(callbackResult).toHaveProperty("itemBought", false);
+    expect(callbackResult).toHaveProperty("reason", "cannot-afford");
+
+    game.resPool.addResEvent("timeCrystal", 3);
+
+    //Shattering should succeed when we can afford it:
+    controller.updateEnabled(model);
+    controller.buyItem(model, null, callbackFunction);
+    expect(game.calendar.year).toBe(1);
+    expect(callbackResult).toHaveProperty("itemBought", true);
+    expect(callbackResult).toHaveProperty("reason", "paid-for");
+
+    //Shattering should have cost us the correct amount of time crystals.
+    expect(game.resPool.get("timeCrystal").value).toBe(2);
+});
+
+test("buyItem internals should work properly for items with no cost", () => {
+    let callbackResult = null;
+    const callbackFunction = function(result) { callbackResult = result; };
+    let handlerResult = null;
+    const handlerFunction = function(model) { handlerResult = model.name; };
+    let controller = new com.nuclearunicorn.game.ui.ButtonModernController(game);
+    let model = controller.fetchModel({ name: "A", prices: [], handler: handlerFunction });
+
+    //If we force-disable the model, we shouldn't be able to buy it:
+    model.enabled = false;
+    controller.buyItem(model, null, callbackFunction);
+    expect(callbackResult).toHaveProperty("itemBought", false);
+    expect(callbackResult).toHaveProperty("reason", "not-enabled");
+    expect(handlerResult).toBe(null); //Proof that the handler wasn't called
+
+    //Buying a free item should be free & call the handler:
+    model.enabled = true;
+    controller.buyItem(model, null, callbackFunction);
+    expect(callbackResult).toHaveProperty("itemBought", true);
+    expect(callbackResult).toHaveProperty("reason", "item-is-free");
+    expect(handlerResult).toBe("A");
+
+    controller = new classes.game.ui.GatherCatnipButtonController(game);
+    model = controller.fetchModel({}); //We don't really need any properties in the model for this one
+
+    //Gathering catnip should be free & always succeed:
+    expect(game.resPool.get("catnip").value).toBe(0);
+    controller.buyItem(model, null, callbackFunction);
+    expect(callbackResult).toHaveProperty("itemBought", true);
+    expect(callbackResult).toHaveProperty("reason", "item-is-free");
+    expect(game.resPool.get("catnip").value).toBe(1);
+
+    controller = new classes.ui.ChallengeBtnController(game);
+    model = controller.fetchModel({ id: "pacifism" });
+
+    //Toggle pending challenge should be free & always succeed:
+    expect(model.metadata.pending).toBe(false);
+    controller.buyItem(model, null, callbackFunction);
+    expect(callbackResult).toHaveProperty("itemBought", true);
+    expect(callbackResult).toHaveProperty("reason", "item-is-free");
+    expect(model.metadata.pending).toBe(true);
+    controller.buyItem(model, null, callbackFunction);
+    expect(callbackResult).toHaveProperty("itemBought", true);
+    expect(callbackResult).toHaveProperty("reason", "item-is-free");
+    expect(model.metadata.pending).toBe(false);
 });
\ No newline at end of file
diff --git a/test/setup.js b/test/setup.js
index 044d5db2dd..62091e1004 100644
--- a/test/setup.js
+++ b/test/setup.js
@@ -22,7 +22,7 @@ console.log("==== starting jest bootloader ====");
 */
 try {
     global.React = require("../lib/react.min.js");
-    require("../lib/jQuery");
+    global.$ = require("../lib/jQuery");
 
     //todo: make portable dojo for jest bootloader
     var createNamespace = require("./declare");
@@ -47,7 +47,11 @@ try {
                 predicate(array[i]);
             }
         },
-        clone: function(mixin){return Object.assign({}, mixin);},
+        clone: function(mixin){
+            if(mixin instanceof Array) { //Recursively deep-copying arrays?  What could go wrong?
+                return mixin.map(function(elem) { return global.dojo.clone(elem); });
+            }
+            return Object.assign({}, mixin);},
         hitch: function(ctx, method){ return method.bind(ctx, arguments);},
         connect: function(){},
         publish: function(){},
@@ -59,9 +63,10 @@ try {
         done: function(){return this},
         fail: function(){return this},
     }
-    global.$ = {
+    /*global.$ = {
         ajax: function(){ return xhrMock; }
-    }
+    }*/
+    global.$.ajax = function(){ return xhrMock; };
 
     global.LZString = require("../lib/lz-string.js");
     require("../lib/dropbox_v2.js");

From 4f7355e1c0ccb7bea36f740c983561af76d380f8 Mon Sep 17 00:00:00 2001
From: Brent-Call <tnerbcall@comcast.net>
Date: Fri, 17 Nov 2023 13:01:49 -0500
Subject: [PATCH 63/63] Allow queueing Fix Cryochamber only when it could also
 be done manually.

---
 js/time.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/js/time.js b/js/time.js
index 73a8738835..840cd962c6 100644
--- a/js/time.js
+++ b/js/time.js
@@ -2010,10 +2010,14 @@ dojo.declare("classes.queue.manager", null,{
                 for (var i in voidSpaceUpgrades){
                     var building = voidSpaceUpgrades[i];
                     if(building.name == "usedCryochambers"){
-                        options.push({
-                            name: building.name,
-                            label: $I("time.fixCryochambers.label")
-                        });
+                        //ONLY allow queueing of Fix Cryochamber if we have unlocked that feature normally.
+                        if (this.game.workshop.get("chronoforge").researched && building.val != 0)
+                        {
+                            options.push({
+                                name: building.name,
+                                label: $I("time.fixCryochambers.label")
+                            });
+                        }
                         continue;
                     }
                     if (building.unlocked){