Merge remote-tracking branch 'origin/1.20.1' into 1.20.1

CHANGELOG.md

@@ -1,7 +1,6 @@
 ### ADDITIONS:
 
 ### FIXES:
-- updated the mod to work with GTCEuM 1.2.0
-    - new recipes coming soon:tm:
+- fixed space crashing when using upgraded non-spacesuit armor
 
-### CHANGES:
+### CHANGES:

build.gradle

@@ -184,11 +184,19 @@ dependencies {
 }
 
 processResources {
-    inputs.property "version", project.version
-    inputs.property "mod_id", project.mod_id
+    // set up properties for filling into metadata
+    var properties = [
+            "version": version,
+            "mod_id": project.mod_id,
+            "forge_version": forge.versions.forgeShortVersion.get().split("\\.")[0], // only specify major version of forge
+            "minecraft_version": libs.versions.minecraft.get(),
+            "gtceu_version": forge.versions.gtceu.get(),
+            "mod_name": mod_name,
+    ]
+    inputs.properties(properties)
 
     filesMatching("META-INF/mods.toml") {
-        expand "version": project.version
+        expand properties
     }
 }
 

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx4G -Xss4M
 
 mod_id=gcyr
 mod_name=Gregicality Rocketry
-mod_version=0.1.5
+mod_version=0.1.7-a
 maven_group=argent_matter
 
 loom.platform=forge

settings.gradle

@@ -36,8 +36,8 @@ dependencyResolutionManagement {
         def vineFlowerVersion = "1.+"
         def macheteVersion = "1.+"
         def configurationVersion = "2.2.0"
-        def gtCeuVersion = "1.2.0"
-        def ldLibVersion = "1.0.25.c"
+        def gtCeuVersion = "1.2.1"
+        def ldLibVersion = "1.0.25.f"
         def mixinExtrasVersion = "0.2.0"
         def mixinVersion = "0.8.6-SNAPSHOT"
 

src/generated/resources/assets/gcyr/lang/en_ud.json

@@ -14,33 +14,44 @@
   "block.gcyr.dyson_system_controller": "ɹǝןןoɹʇuoƆ ɯǝʇsʎS uosʎᗡ",
   "block.gcyr.elite_fuel_tank": "ʞuɐ⟘ ןǝnℲ ǝʇıןƎ",
   "block.gcyr.elite_rocket_motor": "ɹoʇoW ʇǝʞɔoᴚ ǝʇıןƎ",
-  "block.gcyr.ev_fluid_loader": "ɹǝpɐoꞀ pınןℲ ΛƎϛ§",
-  "block.gcyr.hv_fluid_loader": "ɹǝpɐoꞀ pınןℲ ΛH9§",
+  "block.gcyr.ev_heat_exchanger": "ɹ§III ɹǝbuɐɥɔxƎ ʇɐǝH pǝɔuɐʌpⱯϛ§",
+  "block.gcyr.evaporation_plant": "ɹǝʍo⟘ uoıʇɐɹodɐʌƎ",
+  "block.gcyr.hv_heat_exchanger": "ɹ§II ɹǝbuɐɥɔxƎ ʇɐǝH pǝɔuɐʌpⱯ9§",
+  "block.gcyr.iv_heat_exchanger": "ɹ§ ɹǝbuɐɥɔxƎ ʇɐǝH ǝʇıןƎ6§",
   "block.gcyr.iv_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO ΛI6§",
   "block.gcyr.launch_pad": "pɐԀ ɥɔunɐꞀ",
+  "block.gcyr.luv_heat_exchanger": "ɹ§II ɹǝbuɐɥɔxƎ ʇɐǝH ǝʇıןƎp§",
   "block.gcyr.luv_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO ΛnꞀp§",
-  "block.gcyr.lv_fluid_loader": "ɹǝpɐoꞀ pınןℲ ΛꞀㄥ§",
+  "block.gcyr.lv_heat_exchanger": "ɹ§ ɹǝbuɐɥɔxƎ ʇɐǝH ɔısɐᗺ",
   "block.gcyr.mars_regolith": "ɥʇıןobǝᴚ sɹɐW",
   "block.gcyr.martian_rock": "ʞɔoᴚ uɐıʇɹɐW",
   "block.gcyr.mercury_rock": "ʞɔoᴚ ʎɹnɔɹǝW",
   "block.gcyr.moon_sand": "puɐS uooW",
   "block.gcyr.moon_stone": "ǝuoʇS uooW",
-  "block.gcyr.mv_fluid_loader": "ɹǝpɐoꞀ pınןℲ ΛWq§",
+  "block.gcyr.mv_heat_exchanger": "ɹ§ ɹǝbuɐɥɔxƎ ʇɐǝH pǝɔuɐʌpⱯq§",
+  "block.gcyr.opv_heat_exchanger": "ɹ§ ɹǝbuɐɥɔxƎ ʇɐǝH ʎɹɐpuǝbǝꞀן§6§",
   "block.gcyr.opv_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO ΛdOן§6§",
   "block.gcyr.prb_underground_mushroom": "ɯooɹɥsnW punoɹbɹǝpu∩ qɹԀ",
   "block.gcyr.rocket_scanner": "ɹǝuuɐɔS ʇǝʞɔoᴚ",
   "block.gcyr.seat": "ʇɐǝS",
   "block.gcyr.space_elevator": "ɹoʇɐʌǝןƎ ǝɔɐdS",
   "block.gcyr.space_elevator_support": "ʇɹoddnS ɹoʇɐʌǝןƎ ǝɔɐdS",
   "block.gcyr.space_station_packager": "ɹǝbɐʞɔɐԀ uoıʇɐʇS ǝɔɐdS",
+  "block.gcyr.stainless_evaporation_casing": "buısɐƆ uoıʇɐɹodɐʌƎ ssǝןuıɐʇS",
+  "block.gcyr.uev_heat_exchanger": "ɹ§II ɹǝbuɐɥɔxƎ ʇɐǝH ɔıdƎɐ§",
   "block.gcyr.uev_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO ΛƎ∩ɐ§",
+  "block.gcyr.uhv_heat_exchanger": "ɹ§ ɹǝbuɐɥɔxƎ ʇɐǝH ɔıdƎㄣ§",
   "block.gcyr.uhv_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO ΛH∩ㄣ§",
+  "block.gcyr.uiv_heat_exchanger": "ɹ§III ɹǝbuɐɥɔxƎ ʇɐǝH ɔıdƎᄅ§",
   "block.gcyr.uiv_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO ΛI∩ᄅ§",
+  "block.gcyr.uv_heat_exchanger": "ɹ§ ɹǝbuɐɥɔxƎ ʇɐǝH ǝʇɐɯıʇן∩Ɛ§",
   "block.gcyr.uv_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO Λ∩Ɛ§",
+  "block.gcyr.uxv_heat_exchanger": "ɹ§ΛI ɹǝbuɐɥɔxƎ ʇɐǝH ɔıdƎǝ§",
   "block.gcyr.uxv_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO ΛX∩ǝ§",
   "block.gcyr.venus_rock": "ʞɔoᴚ snuǝΛ",
   "block.gcyr.venus_sand": "puɐS snuǝΛ",
   "block.gcyr.venusian_regolith": "ɥʇıןobǝᴚ uɐısnuǝΛ",
+  "block.gcyr.zpm_heat_exchanger": "ɹ§III ɹǝbuɐɥɔxƎ ʇɐǝH ǝʇıןƎɔ§",
   "block.gcyr.zpm_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO WԀZɔ§",
   "entity.gcyr.rocket": "ʇǝʞɔoᴚ",
   "gcyr.alpha_centauri": "ıɹnɐʇuǝƆ ɐɥdןⱯ",
@@ -84,16 +95,25 @@
   "level.gcyr.moon": "uooW",
   "level.gcyr.venus": "snuǝΛ",
   "level.overworld": "ɥʇɹɐƎ",
+  "material.gcyr.acidic_bromine_exhaust": "ʇsnɐɥxƎ ǝuıɯoɹᗺ ɔıpıɔⱯ",
+  "material.gcyr.acidic_bromine_solution": "uoıʇnןoS ǝuıɯoɹᗺ ɔıpıɔⱯ",
   "material.gcyr.aminophenol": "ןouǝɥdouıɯⱯ",
   "material.gcyr.bis_trichloromethyl_benzene": "ǝuǝzuǝq)ןʎɥʇǝɯoɹoןɥɔıɹʇ(sıᗺ",
   "material.gcyr.bisalloy_400": "00ㄣ-ʎoןןɐsıᗺ",
+  "material.gcyr.brominated_chlorine_vapor": "ɹodɐΛ ǝuıɹoןɥƆ pǝʇɐuıɯoɹᗺ",
   "material.gcyr.chromic_acid": "pıɔⱯ ɔıɯoɹɥƆ",
   "material.gcyr.co_mn_br_catalyst": "ʇsʎןɐʇɐƆ ɹᗺ-uW-oƆ",
   "material.gcyr.cobalt_bromide": "ǝpıɯoɹᗺ ʇןɐqoƆ",
+  "material.gcyr.concentrated_bromine_solution": "uoıʇnןoS ǝuıɯoɹᗺ pǝʇɐɹʇuǝɔuoƆ",
+  "material.gcyr.debrominated_brine": "ǝuıɹᗺ pǝʇɐuıɯoɹqǝᗡ",
   "material.gcyr.dimethylformamide": "ǝpıɯɐɯɹoɟןʎɥʇǝɯıᗡ",
   "material.gcyr.durene": "ǝuǝɹnᗡ",
   "material.gcyr.fiberglass": "ssɐןbɹǝqıℲ",
   "material.gcyr.fluorite": "ǝʇıɹonןℲ",
+  "material.gcyr.hot_alkaline_debrominated_brine": "ǝuıɹᗺ pǝʇɐuıɯoɹqǝᗡ ǝuıןɐʞןⱯ ʇoH",
+  "material.gcyr.hot_brine": "ǝuıɹᗺ ʇoH",
+  "material.gcyr.hot_chlorinated_brominated_brine": "ǝuıɹᗺ pǝʇɐuıɯoɹᗺ pǝʇɐuıɹoןɥƆ ʇoH",
+  "material.gcyr.hot_debrominated_brine": "ǝuıɹᗺ pǝʇɐuıɯoɹqǝᗡ ʇoH",
   "material.gcyr.hydrobromic_acid": "pıɔⱯ ɔıɯoɹqoɹpʎH",
   "material.gcyr.iron_oxide": "ǝpıxO uoɹI",
   "material.gcyr.kapton_k": "ʞ uoʇdɐʞ",
@@ -110,6 +130,7 @@
   "material.gcyr.potassium_chloride": "ǝpıɹoןɥƆ ɯnıssɐʇoԀ",
   "material.gcyr.potassium_hydroxide": "ǝpıxoɹpʎH ɯnıssɐʇoԀ",
   "material.gcyr.pyrometillic_dianhydride": "ǝpıɹpʎɥuɐıᗡ ɔıןןıʇǝɯoɹʎԀ",
+  "material.gcyr.raw_brine": "ǝuıɹᗺ ʍɐᴚ",
   "material.gcyr.terephthaloyl_chloride": "ǝpıɹoןɥƆ ןʎoןɐɥʇɥdǝɹǝ⟘",
   "material.gcyr.therephthalic_acid": "pıɔⱯ ɔıןɐɥʇɥdǝɹǝɥ⟘",
   "material.gcyr.trinaquadalloy": "ʎoןןɐpɐnbɐuıɹ⟘",
@@ -139,7 +160,7 @@
   "menu.gcyr.temperature": "ǝɹnʇɐɹǝdɯǝ⟘",
   "menu.gcyr.type": "ǝdʎ⟘",
   "message.gcyr.invalid_id": "˙dıɥƆ ᗡI ʇǝuɐןԀ pıןɐʌ ɐ ǝʌɐɥ ʇsnɯ ʇǝʞɔoɹ ǝɥ⟘",
-  "message.gcyr.no_fuel": "˙ʎןןnɟ pǝןǝnɟ ǝq ʇsnɯ ʇǝʞɔoɹ ǝɥ⟘",
+  "message.gcyr.no_fuel": "˙ᗺɯ %s sǝɹınbǝɹ uoıʇɐuıʇsǝp 'ןǝnɟ ᗺɯ %s sɐH ˙ʎןןnɟ pǝןǝnɟ ǝq ʇsnɯ ʇǝʞɔoɹ ǝɥ⟘",
   "message.gcyr.notice_id_changed": "¡ʇǝbɹɐʇ ʍǝu ɐ buıʇʇǝs ǝɹoɟǝq ɐʇɐp ʍǝu ǝɥʇ ɥʇıʍ dıɥɔ uoıʇɐuıʇsǝp ןɐuosɹǝd ǝɥʇ ǝʇıɹʍǝɹ oʇ ɹǝqɯǝɯǝᴚ ˙pǝbuɐɥɔ ǝʌɐɥ ʇɥbıɯ dıɥɔ ᗡI uoıʇɐʇS ǝɔɐdS ɹnoʎ ɟo uoıʇɐuıʇsǝp ǝɥ⟘",
   "message.gcyr.rocket_not_good_enough": "˙ʇǝuɐןd pǝʇɔǝןǝs ǝɥʇ oʇ ןǝʌɐɹʇ oʇ sʇuǝuodɯoɔ %s ɹǝıʇ ɥbnouǝ ǝʌɐɥ ʇ,usǝop ʇǝʞɔoɹ ǝɥ⟘",
   "metaitem.gcyr.satellite_package.has_satellite": "uoıʇɐʇs ǝɔɐds ɹo ǝʇıןןǝʇɐs sɐH",

src/generated/resources/assets/gcyr/lang/en_us.json

@@ -14,33 +14,44 @@
   "block.gcyr.dyson_system_controller": "Dyson System Controller",
   "block.gcyr.elite_fuel_tank": "Elite Fuel Tank",
   "block.gcyr.elite_rocket_motor": "Elite Rocket Motor",
-  "block.gcyr.ev_fluid_loader": "§5EV Fluid Loader",
-  "block.gcyr.hv_fluid_loader": "§6HV Fluid Loader",
+  "block.gcyr.ev_heat_exchanger": "§5Advanced Heat Exchanger III§r",
+  "block.gcyr.evaporation_plant": "Evaporation Tower",
+  "block.gcyr.hv_heat_exchanger": "§6Advanced Heat Exchanger II§r",
+  "block.gcyr.iv_heat_exchanger": "§9Elite Heat Exchanger §r",
   "block.gcyr.iv_oxygen_spreader": "§9IV Oxygen Spreader",
   "block.gcyr.launch_pad": "Launch Pad",
+  "block.gcyr.luv_heat_exchanger": "§dElite Heat Exchanger II§r",
   "block.gcyr.luv_oxygen_spreader": "§dLuV Oxygen Spreader",
-  "block.gcyr.lv_fluid_loader": "§7LV Fluid Loader",
+  "block.gcyr.lv_heat_exchanger": "Basic Heat Exchanger §r",
   "block.gcyr.mars_regolith": "Mars Regolith",
   "block.gcyr.martian_rock": "Martian Rock",
   "block.gcyr.mercury_rock": "Mercury Rock",
   "block.gcyr.moon_sand": "Moon Sand",
   "block.gcyr.moon_stone": "Moon Stone",
-  "block.gcyr.mv_fluid_loader": "§bMV Fluid Loader",
+  "block.gcyr.mv_heat_exchanger": "§bAdvanced Heat Exchanger §r",
+  "block.gcyr.opv_heat_exchanger": "§9§lLegendary Heat Exchanger §r",
   "block.gcyr.opv_oxygen_spreader": "§9§lOpV Oxygen Spreader",
   "block.gcyr.prb_underground_mushroom": "Prb Underground Mushroom",
   "block.gcyr.rocket_scanner": "Rocket Scanner",
   "block.gcyr.seat": "Seat",
   "block.gcyr.space_elevator": "Space Elevator",
   "block.gcyr.space_elevator_support": "Space Elevator Support",
   "block.gcyr.space_station_packager": "Space Station Packager",
+  "block.gcyr.stainless_evaporation_casing": "Stainless Evaporation Casing",
+  "block.gcyr.uev_heat_exchanger": "§aEpic Heat Exchanger II§r",
   "block.gcyr.uev_oxygen_spreader": "§aUEV Oxygen Spreader",
+  "block.gcyr.uhv_heat_exchanger": "§4Epic Heat Exchanger §r",
   "block.gcyr.uhv_oxygen_spreader": "§4UHV Oxygen Spreader",
+  "block.gcyr.uiv_heat_exchanger": "§2Epic Heat Exchanger III§r",
   "block.gcyr.uiv_oxygen_spreader": "§2UIV Oxygen Spreader",
+  "block.gcyr.uv_heat_exchanger": "§3Ultimate Heat Exchanger §r",
   "block.gcyr.uv_oxygen_spreader": "§3UV Oxygen Spreader",
+  "block.gcyr.uxv_heat_exchanger": "§eEpic Heat Exchanger IV§r",
   "block.gcyr.uxv_oxygen_spreader": "§eUXV Oxygen Spreader",
   "block.gcyr.venus_rock": "Venus Rock",
   "block.gcyr.venus_sand": "Venus Sand",
   "block.gcyr.venusian_regolith": "Venusian Regolith",
+  "block.gcyr.zpm_heat_exchanger": "§cElite Heat Exchanger III§r",
   "block.gcyr.zpm_oxygen_spreader": "§cZPM Oxygen Spreader",
   "entity.gcyr.rocket": "Rocket",
   "gcyr.alpha_centauri": "Alpha Centauri",
@@ -84,16 +95,25 @@
   "level.gcyr.moon": "Moon",
   "level.gcyr.venus": "Venus",
   "level.overworld": "Earth",
+  "material.gcyr.acidic_bromine_exhaust": "Acidic Bromine Exhaust",
+  "material.gcyr.acidic_bromine_solution": "Acidic Bromine Solution",
   "material.gcyr.aminophenol": "Aminophenol",
   "material.gcyr.bis_trichloromethyl_benzene": "Bis(trichloromethyl)benzene",
   "material.gcyr.bisalloy_400": "Bisalloy-400",
+  "material.gcyr.brominated_chlorine_vapor": "Brominated Chlorine Vapor",
   "material.gcyr.chromic_acid": "Chromic Acid",
   "material.gcyr.co_mn_br_catalyst": "Co-Mn-Br Catalyst",
   "material.gcyr.cobalt_bromide": "Cobalt Bromide",
+  "material.gcyr.concentrated_bromine_solution": "Concentrated Bromine Solution",
+  "material.gcyr.debrominated_brine": "Debrominated Brine",
   "material.gcyr.dimethylformamide": "Dimethylformamide",
   "material.gcyr.durene": "Durene",
   "material.gcyr.fiberglass": "Fiberglass",
   "material.gcyr.fluorite": "Fluorite",
+  "material.gcyr.hot_alkaline_debrominated_brine": "Hot Alkaline Debrominated Brine",
+  "material.gcyr.hot_brine": "Hot Brine",
+  "material.gcyr.hot_chlorinated_brominated_brine": "Hot Chlorinated Brominated Brine",
+  "material.gcyr.hot_debrominated_brine": "Hot Debrominated Brine",
   "material.gcyr.hydrobromic_acid": "Hydrobromic Acid",
   "material.gcyr.iron_oxide": "Iron Oxide",
   "material.gcyr.kapton_k": "Kapton K",
@@ -110,6 +130,7 @@
   "material.gcyr.potassium_chloride": "Potassium Chloride",
   "material.gcyr.potassium_hydroxide": "Potassium Hydroxide",
   "material.gcyr.pyrometillic_dianhydride": "Pyrometillic Dianhydride",
+  "material.gcyr.raw_brine": "Raw Brine",
   "material.gcyr.terephthaloyl_chloride": "Terephthaloyl Chloride",
   "material.gcyr.therephthalic_acid": "Therephthalic Acid",
   "material.gcyr.trinaquadalloy": "Trinaquadalloy",
@@ -139,7 +160,7 @@
   "menu.gcyr.temperature": "Temperature",
   "menu.gcyr.type": "Type",
   "message.gcyr.invalid_id": "The rocket must have a valid Planet ID Chip.",
-  "message.gcyr.no_fuel": "The rocket must be fueled fully.",
+  "message.gcyr.no_fuel": "The rocket must be fueled fully. Has %s mB fuel, destination requires %s mB.",
   "message.gcyr.notice_id_changed": "The destination of your Space Station ID chip might have changed. Remember to rewrite the personal destination chip with the new data before setting a new target!",
   "message.gcyr.rocket_not_good_enough": "The rocket doesn't have enough tier %s components to travel to the selected planet.",
   "metaitem.gcyr.satellite_package.has_satellite": "Has satellite or space station",

src/generated/resources/data/forge/tags/blocks/mineable/wrench.json

@@ -6,6 +6,7 @@
     "gcyr:dyson_sphere_casing",
     "gcyr:dyson_solar_cell",
     "gcyr:dyson_sphere_maintenance_port",
+    "gcyr:stainless_evaporation_casing",
     "gcyr:basic_rocket_motor",
     "gcyr:advanced_rocket_motor",
     "gcyr:elite_rocket_motor",

src/generated/resources/data/gcyr/loot_tables/blocks/stainless_evaporation_casing.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "gcyr:stainless_evaporation_casing"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "gcyr:blocks/stainless_evaporation_casing"
+}

src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -6,6 +6,7 @@
     "gcyr:dyson_sphere_casing",
     "gcyr:dyson_solar_cell",
     "gcyr:dyson_sphere_maintenance_port",
+    "gcyr:stainless_evaporation_casing",
     "gcyr:airlock_door",
     "gcyr:launch_pad",
     "gcyr:seat"