Merge pull request #291 from skiprocks999/1.21

patch found issues
aurilisdev · Jan 4, 2025 · ad12d4e · ad12d4e
2 parents b89f15c + d4e2d0e
commit ad12d4e
Show file tree

Hide file tree

Showing 47 changed files with 664 additions and 603 deletions.
diff --git a/runs/client/usercache.json b/runs/client/usercache.json
@@ -1 +1 @@
-[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2025-02-03 11:49:34 -0600"}]
+[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2025-02-04 13:58:10 -0600"}]
diff --git a/...urces/data/electrodynamics/recipe/chemicalreactor/crude_aluminum_from_royal_aluminum.json b/...urces/data/electrodynamics/recipe/chemicalreactor/crude_aluminum_from_royal_aluminum.json
@@ -2,7 +2,7 @@
   "type": "electrodynamics:chemical_reactor_recipe",
   "fluidbi": [
     {
-      "amount": 200,
+      "amount": 50,
       "chance": 1.0,
       "fluid": "electrodynamics:fluidaquaregia"
     }

diff --git a/...urces/data/electrodynamics/recipe/chemicalreactor/crude_chromium_from_royal_chromium.json b/...urces/data/electrodynamics/recipe/chemicalreactor/crude_chromium_from_royal_chromium.json
@@ -2,7 +2,7 @@
   "type": "electrodynamics:chemical_reactor_recipe",
   "fluidbi": [
     {
-      "amount": 200,
+      "amount": 50,
       "chance": 1.0,
       "fluid": "electrodynamics:fluidaquaregia"
     }

diff --git a/...resources/data/electrodynamics/recipe/chemicalreactor/crude_copper_from_royal_copper.json b/...resources/data/electrodynamics/recipe/chemicalreactor/crude_copper_from_royal_copper.json
@@ -2,7 +2,7 @@
   "type": "electrodynamics:chemical_reactor_recipe",
   "fluidbi": [
     {
-      "amount": 200,
+      "amount": 50,
       "chance": 1.0,
       "fluid": "electrodynamics:fluidaquaregia"
     }

diff --git a/...ted/resources/data/electrodynamics/recipe/chemicalreactor/crude_gold_from_royal_gold.json b/...ted/resources/data/electrodynamics/recipe/chemicalreactor/crude_gold_from_royal_gold.json
@@ -2,7 +2,7 @@
   "type": "electrodynamics:chemical_reactor_recipe",
   "fluidbi": [
     {
-      "amount": 200,
+      "amount": 50,
       "chance": 1.0,
       "fluid": "electrodynamics:fluidaquaregia"
     }

diff --git a/...ted/resources/data/electrodynamics/recipe/chemicalreactor/crude_iron_from_royal_iron.json b/...ted/resources/data/electrodynamics/recipe/chemicalreactor/crude_iron_from_royal_iron.json
@@ -2,7 +2,7 @@
   "type": "electrodynamics:chemical_reactor_recipe",
   "fluidbi": [
     {
-      "amount": 200,
+      "amount": 50,
       "chance": 1.0,
       "fluid": "electrodynamics:fluidaquaregia"
     }

diff --git a/...ted/resources/data/electrodynamics/recipe/chemicalreactor/crude_lead_from_royal_lead.json b/...ted/resources/data/electrodynamics/recipe/chemicalreactor/crude_lead_from_royal_lead.json
@@ -2,7 +2,7 @@
   "type": "electrodynamics:chemical_reactor_recipe",
   "fluidbi": [
     {
-      "amount": 200,
+      "amount": 50,
       "chance": 1.0,
       "fluid": "electrodynamics:fluidaquaregia"
     }

diff --git a/...sources/data/electrodynamics/recipe/chemicalreactor/crude_lithium_from_royal_lithium.json b/...sources/data/electrodynamics/recipe/chemicalreactor/crude_lithium_from_royal_lithium.json
@@ -2,7 +2,7 @@
   "type": "electrodynamics:chemical_reactor_recipe",
   "fluidbi": [
     {
-      "amount": 200,
+      "amount": 50,
       "chance": 1.0,
       "fluid": "electrodynamics:fluidaquaregia"
     }

diff --git a/...s/data/electrodynamics/recipe/chemicalreactor/crude_molybdenum_from_royal_molybdenum.json b/...s/data/electrodynamics/recipe/chemicalreactor/crude_molybdenum_from_royal_molybdenum.json
@@ -2,7 +2,7 @@
   "type": "electrodynamics:chemical_reactor_recipe",
   "fluidbi": [
     {
-      "amount": 200,
+      "amount": 50,
       "chance": 1.0,
       "fluid": "electrodynamics:fluidaquaregia"
     }

diff --git a/...ces/data/electrodynamics/recipe/chemicalreactor/crude_netherite_from_royal_netherite.json b/...ces/data/electrodynamics/recipe/chemicalreactor/crude_netherite_from_royal_netherite.json
@@ -2,7 +2,7 @@
   "type": "electrodynamics:chemical_reactor_recipe",
   "fluidbi": [
     {
-      "amount": 200,
+      "amount": 50,
       "chance": 1.0,
       "fluid": "electrodynamics:fluidaquaregia"
     }

diff --git a/...resources/data/electrodynamics/recipe/chemicalreactor/crude_silver_from_royal_silver.json b/...resources/data/electrodynamics/recipe/chemicalreactor/crude_silver_from_royal_silver.json
@@ -2,7 +2,7 @@
   "type": "electrodynamics:chemical_reactor_recipe",
   "fluidbi": [
     {
-      "amount": 200,
+      "amount": 50,
       "chance": 1.0,
       "fluid": "electrodynamics:fluidaquaregia"
     }

diff --git a/...rated/resources/data/electrodynamics/recipe/chemicalreactor/crude_tin_from_royal_tin.json b/...rated/resources/data/electrodynamics/recipe/chemicalreactor/crude_tin_from_royal_tin.json
@@ -2,7 +2,7 @@
   "type": "electrodynamics:chemical_reactor_recipe",
   "fluidbi": [
     {
-      "amount": 200,
+      "amount": 50,
       "chance": 1.0,
       "fluid": "electrodynamics:fluidaquaregia"
     }

diff --git a/...urces/data/electrodynamics/recipe/chemicalreactor/crude_titanium_from_royal_titanium.json b/...urces/data/electrodynamics/recipe/chemicalreactor/crude_titanium_from_royal_titanium.json
@@ -2,7 +2,7 @@
   "type": "electrodynamics:chemical_reactor_recipe",
   "fluidbi": [
     {
-      "amount": 200,
+      "amount": 50,
       "chance": 1.0,
       "fluid": "electrodynamics:fluidaquaregia"
     }

diff --git a/...urces/data/electrodynamics/recipe/chemicalreactor/crude_vanadium_from_royal_vanadium.json b/...urces/data/electrodynamics/recipe/chemicalreactor/crude_vanadium_from_royal_vanadium.json
@@ -2,7 +2,7 @@
   "type": "electrodynamics:chemical_reactor_recipe",
   "fluidbi": [
     {
-      "amount": 200,
+      "amount": 50,
       "chance": 1.0,
       "fluid": "electrodynamics:fluidaquaregia"
     }

diff --git a/...ces/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_aluminum.json b/...ces/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_aluminum.json
@@ -16,7 +16,7 @@
     }
   ],
   "output": {
-    "amount": 3000,
+    "amount": 4000,
     "id": "electrodynamics:fluidroyalmineralaluminum"
   },
   "ticks": 200,

diff --git a/...ces/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_chromium.json b/...ces/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_chromium.json
@@ -16,7 +16,7 @@
     }
   ],
   "output": {
-    "amount": 3000,
+    "amount": 4000,
     "id": "electrodynamics:fluidroyalmineralchromium"
   },
   "ticks": 200,

diff --git a/...urces/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_copper.json b/...urces/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_copper.json
@@ -16,7 +16,7 @@
     }
   ],
   "output": {
-    "amount": 3000,
+    "amount": 4000,
     "id": "electrodynamics:fluidroyalmineralcopper"
   },
   "ticks": 200,

diff --git a/...sources/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_gold.json b/...sources/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_gold.json
@@ -16,7 +16,7 @@
     }
   ],
   "output": {
-    "amount": 3000,
+    "amount": 4000,
     "id": "electrodynamics:fluidroyalmineralgold"
   },
   "ticks": 200,

diff --git a/...sources/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_iron.json b/...sources/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_iron.json
@@ -16,7 +16,7 @@
     }
   ],
   "output": {
-    "amount": 3000,
+    "amount": 4000,
     "id": "electrodynamics:fluidroyalmineraliron"
   },
   "ticks": 200,

diff --git a/...sources/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_lead.json b/...sources/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_lead.json
@@ -16,7 +16,7 @@
     }
   ],
   "output": {
-    "amount": 3000,
+    "amount": 4000,
     "id": "electrodynamics:fluidroyalminerallead"
   },
   "ticks": 200,

diff --git a/...rces/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_lithium.json b/...rces/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_lithium.json
@@ -16,7 +16,7 @@
     }
   ],
   "output": {
-    "amount": 3000,
+    "amount": 4000,
     "id": "electrodynamics:fluidroyalminerallithium"
   },
   "ticks": 200,

diff --git a/...s/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_molybdenum.json b/...s/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_molybdenum.json
@@ -16,7 +16,7 @@
     }
   ],
   "output": {
-    "amount": 3000,
+    "amount": 4000,
     "id": "electrodynamics:fluidroyalmineralmolybdenum"
   },
   "ticks": 200,

diff --git a/...es/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_netherite.json b/...es/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_netherite.json
@@ -16,7 +16,7 @@
     }
   ],
   "output": {
-    "amount": 3000,
+    "amount": 4000,
     "id": "electrodynamics:fluidroyalmineralnetherite"
   },
   "ticks": 200,

diff --git a/...urces/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_silver.json b/...urces/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_silver.json
@@ -16,7 +16,7 @@
     }
   ],
   "output": {
-    "amount": 3000,
+    "amount": 4000,
     "id": "electrodynamics:fluidroyalmineralsilver"
   },
   "ticks": 200,

diff --git a/...esources/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_tin.json b/...esources/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_tin.json
@@ -16,7 +16,7 @@
     }
   ],
   "output": {
-    "amount": 3000,
+    "amount": 4000,
     "id": "electrodynamics:fluidroyalmineraltin"
   },
   "ticks": 200,

diff --git a/...ces/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_titanium.json b/...ces/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_titanium.json
@@ -16,7 +16,7 @@
     }
   ],
   "output": {
-    "amount": 3000,
+    "amount": 4000,
     "id": "electrodynamics:fluidroyalmineraltitanium"
   },
   "ticks": 200,

diff --git a/...ces/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_vanadium.json b/...ces/data/electrodynamics/recipe/fluiditem2fluid/mineral_washer/royalmineral_vanadium.json
@@ -16,7 +16,7 @@
     }
   ],
   "output": {
-    "amount": 3000,
+    "amount": 4000,
     "id": "electrodynamics:fluidroyalmineralvanadium"
   },
   "ticks": 200,
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2025-02-03 11:49:34 -0600"}]
		[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2025-02-04 13:58:10 -0600"}]