From ffc635a8809699bb6bc55a6af81427a9b4414e96 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 11 Aug 2025 02:10:17 +0100 Subject: [PATCH 001/158] I think that one guy's install was fucked but I already wrote these, so why not --- kubejs/data/species/forge/biome_modifier/add_bewereager.json | 3 +++ .../species/forge/biome_modifier/add_birted_birch_trees.json | 3 +++ kubejs/data/species/forge/biome_modifier/add_cliff_hanger.json | 3 +++ kubejs/data/species/forge/biome_modifier/add_deepfish.json | 3 +++ kubejs/data/species/forge/biome_modifier/add_ghoul.json | 3 +++ kubejs/data/species/forge/biome_modifier/add_leaf_hanger.json | 3 +++ kubejs/data/species/forge/biome_modifier/add_limpet.json | 3 +++ .../forge/biome_modifier/add_mammutilation_remnant.json | 3 +++ kubejs/data/species/forge/biome_modifier/add_quake.json | 3 +++ kubejs/data/species/forge/biome_modifier/add_stackatick.json | 3 +++ kubejs/data/species/forge/biome_modifier/add_treeper.json | 3 +++ kubejs/data/species/forge/biome_modifier/add_wicked.json | 3 +++ kubejs/data/species/forge/biome_modifier/add_wraptor.json | 3 +++ 13 files changed, 39 insertions(+) create mode 100644 kubejs/data/species/forge/biome_modifier/add_bewereager.json create mode 100644 kubejs/data/species/forge/biome_modifier/add_birted_birch_trees.json create mode 100644 kubejs/data/species/forge/biome_modifier/add_cliff_hanger.json create mode 100644 kubejs/data/species/forge/biome_modifier/add_deepfish.json create mode 100644 kubejs/data/species/forge/biome_modifier/add_ghoul.json create mode 100644 kubejs/data/species/forge/biome_modifier/add_leaf_hanger.json create mode 100644 kubejs/data/species/forge/biome_modifier/add_limpet.json create mode 100644 kubejs/data/species/forge/biome_modifier/add_mammutilation_remnant.json create mode 100644 kubejs/data/species/forge/biome_modifier/add_quake.json create mode 100644 kubejs/data/species/forge/biome_modifier/add_stackatick.json create mode 100644 kubejs/data/species/forge/biome_modifier/add_treeper.json create mode 100644 kubejs/data/species/forge/biome_modifier/add_wicked.json create mode 100644 kubejs/data/species/forge/biome_modifier/add_wraptor.json diff --git a/kubejs/data/species/forge/biome_modifier/add_bewereager.json b/kubejs/data/species/forge/biome_modifier/add_bewereager.json new file mode 100644 index 000000000..2d96022cf --- /dev/null +++ b/kubejs/data/species/forge/biome_modifier/add_bewereager.json @@ -0,0 +1,3 @@ +{ + "type": "forge:none" +} \ No newline at end of file diff --git a/kubejs/data/species/forge/biome_modifier/add_birted_birch_trees.json b/kubejs/data/species/forge/biome_modifier/add_birted_birch_trees.json new file mode 100644 index 000000000..2d96022cf --- /dev/null +++ b/kubejs/data/species/forge/biome_modifier/add_birted_birch_trees.json @@ -0,0 +1,3 @@ +{ + "type": "forge:none" +} \ No newline at end of file diff --git a/kubejs/data/species/forge/biome_modifier/add_cliff_hanger.json b/kubejs/data/species/forge/biome_modifier/add_cliff_hanger.json new file mode 100644 index 000000000..2d96022cf --- /dev/null +++ b/kubejs/data/species/forge/biome_modifier/add_cliff_hanger.json @@ -0,0 +1,3 @@ +{ + "type": "forge:none" +} \ No newline at end of file diff --git a/kubejs/data/species/forge/biome_modifier/add_deepfish.json b/kubejs/data/species/forge/biome_modifier/add_deepfish.json new file mode 100644 index 000000000..2d96022cf --- /dev/null +++ b/kubejs/data/species/forge/biome_modifier/add_deepfish.json @@ -0,0 +1,3 @@ +{ + "type": "forge:none" +} \ No newline at end of file diff --git a/kubejs/data/species/forge/biome_modifier/add_ghoul.json b/kubejs/data/species/forge/biome_modifier/add_ghoul.json new file mode 100644 index 000000000..2d96022cf --- /dev/null +++ b/kubejs/data/species/forge/biome_modifier/add_ghoul.json @@ -0,0 +1,3 @@ +{ + "type": "forge:none" +} \ No newline at end of file diff --git a/kubejs/data/species/forge/biome_modifier/add_leaf_hanger.json b/kubejs/data/species/forge/biome_modifier/add_leaf_hanger.json new file mode 100644 index 000000000..2d96022cf --- /dev/null +++ b/kubejs/data/species/forge/biome_modifier/add_leaf_hanger.json @@ -0,0 +1,3 @@ +{ + "type": "forge:none" +} \ No newline at end of file diff --git a/kubejs/data/species/forge/biome_modifier/add_limpet.json b/kubejs/data/species/forge/biome_modifier/add_limpet.json new file mode 100644 index 000000000..2d96022cf --- /dev/null +++ b/kubejs/data/species/forge/biome_modifier/add_limpet.json @@ -0,0 +1,3 @@ +{ + "type": "forge:none" +} \ No newline at end of file diff --git a/kubejs/data/species/forge/biome_modifier/add_mammutilation_remnant.json b/kubejs/data/species/forge/biome_modifier/add_mammutilation_remnant.json new file mode 100644 index 000000000..2d96022cf --- /dev/null +++ b/kubejs/data/species/forge/biome_modifier/add_mammutilation_remnant.json @@ -0,0 +1,3 @@ +{ + "type": "forge:none" +} \ No newline at end of file diff --git a/kubejs/data/species/forge/biome_modifier/add_quake.json b/kubejs/data/species/forge/biome_modifier/add_quake.json new file mode 100644 index 000000000..2d96022cf --- /dev/null +++ b/kubejs/data/species/forge/biome_modifier/add_quake.json @@ -0,0 +1,3 @@ +{ + "type": "forge:none" +} \ No newline at end of file diff --git a/kubejs/data/species/forge/biome_modifier/add_stackatick.json b/kubejs/data/species/forge/biome_modifier/add_stackatick.json new file mode 100644 index 000000000..2d96022cf --- /dev/null +++ b/kubejs/data/species/forge/biome_modifier/add_stackatick.json @@ -0,0 +1,3 @@ +{ + "type": "forge:none" +} \ No newline at end of file diff --git a/kubejs/data/species/forge/biome_modifier/add_treeper.json b/kubejs/data/species/forge/biome_modifier/add_treeper.json new file mode 100644 index 000000000..2d96022cf --- /dev/null +++ b/kubejs/data/species/forge/biome_modifier/add_treeper.json @@ -0,0 +1,3 @@ +{ + "type": "forge:none" +} \ No newline at end of file diff --git a/kubejs/data/species/forge/biome_modifier/add_wicked.json b/kubejs/data/species/forge/biome_modifier/add_wicked.json new file mode 100644 index 000000000..2d96022cf --- /dev/null +++ b/kubejs/data/species/forge/biome_modifier/add_wicked.json @@ -0,0 +1,3 @@ +{ + "type": "forge:none" +} \ No newline at end of file diff --git a/kubejs/data/species/forge/biome_modifier/add_wraptor.json b/kubejs/data/species/forge/biome_modifier/add_wraptor.json new file mode 100644 index 000000000..2d96022cf --- /dev/null +++ b/kubejs/data/species/forge/biome_modifier/add_wraptor.json @@ -0,0 +1,3 @@ +{ + "type": "forge:none" +} \ No newline at end of file From 8433029e350734b3629212e6e305935ce715e72f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 11 Aug 2025 02:18:42 +0100 Subject: [PATCH 002/158] fixed a quest title --- config/ftbquests/quests/chapters/hv__high_voltage.snbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index 486b97afc..996dc5e6c 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -561,7 +561,7 @@ type: "item" } ] - title: "{quests.high_voltage.ptfe.title" + title: "{quests.high_voltage.ptfe.title}" x: 0.0d y: 4.5d } From 25422a5d4e9dfcd4772f2514601a8d75c133d83d Mon Sep 17 00:00:00 2001 From: NINAustinFett <51243875+NINAustinFett@users.noreply.github.com> Date: Sun, 10 Aug 2025 23:14:37 -0400 Subject: [PATCH 003/158] Fixed Moon Light Level for Spawning (#1589) Moon Needed a light level of 12 or higher to stop ad astra mobs from spawning --- kubejs/data/tfg/dimension_type/moon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/data/tfg/dimension_type/moon.json b/kubejs/data/tfg/dimension_type/moon.json index 492702880..018d89689 100644 --- a/kubejs/data/tfg/dimension_type/moon.json +++ b/kubejs/data/tfg/dimension_type/moon.json @@ -10,7 +10,7 @@ "infiniburn": "#minecraft:infiniburn_overworld", "logical_height": 384, "min_y": 0, - "monster_spawn_block_light_limit": 15, + "monster_spawn_block_light_limit": 0, "monster_spawn_light_level": { "type": "minecraft:uniform", "value": { From 4a0603cec2fd8a2db284648968cd6cc819ad87f6 Mon Sep 17 00:00:00 2001 From: Redeix Date: Mon, 11 Aug 2025 05:28:45 -0500 Subject: [PATCH 004/158] prospecting rework (#1594) * prospecting rework * changelog --- CHANGELOG.md | 1 + kubejs/assets/tfg/lang/en_us.json | 5 +++++ kubejs/assets/tfg/particles/ore_prospector.json | 5 +++++ .../textures/particle/ore_prospector_particle.png | Bin 0 -> 215 bytes kubejs/server_scripts/tfg/tags.js | 12 ++++++++++++ 5 files changed, 23 insertions(+) create mode 100644 kubejs/assets/tfg/particles/ore_prospector.json create mode 100644 kubejs/assets/tfg/textures/particle/ore_prospector_particle.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 2db55f846..1c5e0facb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [Unreleased] ### Changes +- Complete rework of prospector's picks. (#1594) @Redeix ### Bug fixes ## [0.10.9] - 10-08-2025 diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 3232beb69..b9bc01cff 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -736,6 +736,11 @@ "tfg.tooltip.moon_rabbit_variant.cyan": "Seafoam Fur", "tfg.tooltip.moon_rabbit_variant.purple": "Lavender Fur", "tfg.tooltip.moon_rabbit_variant.sofu": "Sundae Fur", + "tfg.toast.ore_prospector_none": "No ores found in range.", + "tfg.toast.ore_prospector_message": "Ores found within %s §6blocks in this direction: %s", + "tooltip.tfg.ore_prospector_stats": "Scan Range: %s, Cross Section: %s x %s.", + "tooltip.tfg.ore_prospector_count": "This prospector will display ore counts.", + "tooltip.tfg.ore_prospector_xray": "This prospector will display an x-ray view of ore blocks.", "item.treetap.tap": "Deprecated Item, Craft to Upgrade", "item.gtceu.zinc_ingot": "Deprecated Item, Craft to Upgrade", "item.gtceu.brass_ingot": "Deprecated Item, Craft to Upgrade", diff --git a/kubejs/assets/tfg/particles/ore_prospector.json b/kubejs/assets/tfg/particles/ore_prospector.json new file mode 100644 index 000000000..74e1988cc --- /dev/null +++ b/kubejs/assets/tfg/particles/ore_prospector.json @@ -0,0 +1,5 @@ +{ + "textures": [ + "tfg:ore_prospector_particle" + ] +} diff --git a/kubejs/assets/tfg/textures/particle/ore_prospector_particle.png b/kubejs/assets/tfg/textures/particle/ore_prospector_particle.png new file mode 100644 index 0000000000000000000000000000000000000000..386bf311647d4279ccc5fadd53faf674cadaa6aa GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`^E_P~Lo9l?PTI|R*g&GizV(g3 z1rt5yb$c8Yf-9zrNF7>rr=oX>`H`syxnpM8IPRD4h*>H>*UnGflIN>v)!N&FezJN` zZ%4P+{+!t_%o4ygiG`t{j;*7wIkV~RnR{9{Ig>t}k`|isOLG18($0IYw3o2GY|84_ zi7#VUTOe!9$Z#idMiIkKuA?=L|9u6xR6Mha<{4VGt(AWfy*2*b14a>VBgbP!)j)?b OFnGH9xvX { event.add('tfg:harvester', 'tfg:harvest_basket') event.add('tfg:harvester', 'tfg:aluminium_harvest_basket') + + event.removeAll('tfc:propicks') + event.add('tfg:tools/ore_prospectors/copper', 'tfc:metal/propick/copper') + event.add('tfg:tools/ore_prospectors/bronze', 'tfc:metal/propick/bronze') + event.add('tfg:tools/ore_prospectors/bronze', 'tfc:metal/propick/bismuth_bronze') + event.add('tfg:tools/ore_prospectors/bronze', 'tfc:metal/propick/black_bronze') + event.add('tfg:tools/ore_prospectors/wrought_iron', 'tfc:metal/propick/wrought_iron') + event.add('tfg:tools/ore_prospectors/steel', 'tfc:metal/propick/steel') + event.add('tfg:tools/ore_prospectors/black_steel', 'tfc:metal/propick/black_steel') + event.add('tfg:tools/ore_prospectors/blue_steel', 'tfc:metal/propick/blue_steel') + event.add('tfg:tools/ore_prospectors/red_steel', 'tfc:metal/propick/red_steel') + //#endregion // #region Paper from wood From 25237c0be8ac954e23f40c407c1bfcce15d4ca3e Mon Sep 17 00:00:00 2001 From: Xikaro Date: Mon, 11 Aug 2025 18:42:34 +0500 Subject: [PATCH 005/158] ISSUE_TEMPLATE --- .github/ISSUE_TEMPLATE/BUG_REPORT.yml | 2 +- .github/ISSUE_TEMPLATE/CRASH_REPORT.yml | 2 +- .github/ISSUE_TEMPLATE/ENHANCEMENT.yml | 2 +- .github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml | 2 +- .github/ISSUE_TEMPLATE/QUESTION.yml | 2 +- defaultconfigs/firmalife-server.toml | 246 +++--- defaultconfigs/greate-server.toml | 850 ++++++++++----------- 7 files changed, 553 insertions(+), 553 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml index 43e6835ea..a0514eeeb 100644 --- a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml +++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml @@ -1,4 +1,4 @@ -name: "Bug report" +name: "[🐛]: Bug report" description: "Report a bug where something is not working as expected, which does not crash the game." title: "[🐛]: " labels: [ "Status: Backlog" ] diff --git a/.github/ISSUE_TEMPLATE/CRASH_REPORT.yml b/.github/ISSUE_TEMPLATE/CRASH_REPORT.yml index ee0f20405..6520e1409 100644 --- a/.github/ISSUE_TEMPLATE/CRASH_REPORT.yml +++ b/.github/ISSUE_TEMPLATE/CRASH_REPORT.yml @@ -1,4 +1,4 @@ -name: "Crash Report" +name: "[💥]: Crash Report" description: "Report a bug that crashes the game or prevents startup." title: "[💥]: " labels: [ "Status: Backlog" ] diff --git a/.github/ISSUE_TEMPLATE/ENHANCEMENT.yml b/.github/ISSUE_TEMPLATE/ENHANCEMENT.yml index a1ff6bc8a..2e4288bc9 100644 --- a/.github/ISSUE_TEMPLATE/ENHANCEMENT.yml +++ b/.github/ISSUE_TEMPLATE/ENHANCEMENT.yml @@ -1,4 +1,4 @@ -name: "Enhancement" +name: "[🪡]: Enhancement" description: "Provide supporting details for a feature in development" title: "[🪡]: " labels: [ "Status: Backlog" ] diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml index a81d4cbec..a73f7aa56 100644 --- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml +++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml @@ -1,4 +1,4 @@ -name: "Feature request" +name: "[🪶]: Feature request" description: "Request a new feature or a change to an existing one." title: "[🪶]: " labels: [ "Status: Backlog" ] diff --git a/.github/ISSUE_TEMPLATE/QUESTION.yml b/.github/ISSUE_TEMPLATE/QUESTION.yml index 80db9b202..ba1b89c57 100644 --- a/.github/ISSUE_TEMPLATE/QUESTION.yml +++ b/.github/ISSUE_TEMPLATE/QUESTION.yml @@ -1,4 +1,4 @@ -name: "Ask a Question" +name: "[❓]: Ask a Question" description: "Ask a question regarding this project." title: "[❓]: " labels: [ "Status: Backlog" ] diff --git a/defaultconfigs/firmalife-server.toml b/defaultconfigs/firmalife-server.toml index 744699e5e..b7a2384be 100644 --- a/defaultconfigs/firmalife-server.toml +++ b/defaultconfigs/firmalife-server.toml @@ -1,123 +1,123 @@ - -[general] - #If false, sprinklers will not accept Firmalife pipes and will instead require something that exposes a fluid capability, eg. a barrel. - usePipesForSprinklers = false - #Days in a cellar to make cheese Aged. - #Range: > 1 - cheeseAgedDays = 28 - #Days in a cellar to make cheese Vintage. - #Range: > 1 - cheeseVintageDays = 112 - #Ticks to dry something on a drying mat (24000 ticks = 1 day) - #Range: > 1 - dryingTicks = 12000 - #Ticks to dry something on a solar drier (24000 ticks = 1 day) - #Range: > 1 - solarDryingTicks = 1000 - #Ticks to smoke something on a string (24000 ticks = 1 day) - #Range: > 1 - smokingTicks = 8000 - #Number of blocks below the firepit that wool string will search for valid smoking firepits. - #Range: > 1 - smokingFirepitRange = 6 - #Ticks for a composter tumbler to finish (24000 ticks = 1 day) - #Range: > 1 - compostTumblerTicks = 96000 - #Ticks for an oven to cure (24000 ticks = 1 day) - #Range: > 1 - ovenCureTicks = 2000 - #Minimum temperature for an oven to start the curing process (24000 ticks = 1 day) - #Range: > 1 - ovenCureTemperature = 600 - #If true, ovens will hurt the player if they touch it without a peel in hand. - ovenRequirePeel = false - #The chance for fuel burning in an oven to drop an ash block into an ashtray. - #Range: 0.0 ~ 1.0 - ovenAshChance = 0.5 - #If true, players can throw seed balls. - enableSeedBalls = true - #If true, bees can swarm and hurt the player if provoked. - enableBeeSwarm = true - #The capacity in mB of the wine glass. Default 250 - #Range: > 1 - hollowShellCapacity = 250 - #The average temperature below which stronger decay modifiers apply to cellar blocks. - #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 - cellarLevel2Temperature = 0.0 - #The average temperature below which even stronger decay modifiers apply to cellar blocks. - #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 - cellarLevel3Temperature = -12.0 - #The average amount of days for a crop in a greenhouse to grow. For normal crops, this is 24 days. - #Range: 4.9E-324 ~ 1.7976931348623157E308 - greenhouseGrowthDays = 20.0 - #The average amount of days for a crop in a greenhouse to consume all its water. - #Range: 0.0 ~ 1.7976931348623157E308 - greenhouseWaterDays = 12.0 - #The average amount of days for a crop to consume all of a nutrient. You should probably not configure this value unless you know what it does in the code. For regular crops this value is 12. - #Range: 0.0 ~ 1.7976931348623157E308 - greenhouseNutrientDays = 8.0 - #The max bounded distance from the climate station a greenhouse wall can be. Higher numbers = more lag. - #Range: 1 ~ 128 - greenhouseRadius = 15 - #The max bounded distance from the climate station a cellar wall can be. Higher numbers = more lag. - #Range: 1 ~ 128 - cellarRadius = 15 - #If true, the tumbler and the pumping station work magically with a redstone signal and no power required. - mechanicalPowerCheatMode = true - -[foodTraits] - #The modifier for the 'Dried' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. - #Range: 0.0 ~ 1.7976931348623157E308 - traitDriedModifier = 0.5 - #The modifier for the 'Fresh' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. - #Range: 0.0 ~ 1.7976931348623157E308 - traitFreshModifier = 1.100000023841858 - #The modifier for the 'Aged' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. - #Range: 0.0 ~ 1.7976931348623157E308 - traitAgedModifier = 0.8999999761581421 - #The modifier for the 'Vintage' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. - #Range: 0.0 ~ 1.7976931348623157E308 - traitVintageModifier = 0.6000000238418579 - #The modifier for the 'Oven_baked' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. - #Range: 0.0 ~ 1.7976931348623157E308 - traitOven_bakedModifier = 0.8999999761581421 - #The modifier for the 'Smoked' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. - #Range: 0.0 ~ 1.7976931348623157E308 - traitSmokedModifier = 0.699999988079071 - #The modifier for the 'Rancid_smoked' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. - #Range: 0.0 ~ 1.7976931348623157E308 - traitRancid_smokedModifier = 2.0 - #The modifier for the 'Shelved' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. - #Range: 0.0 ~ 1.7976931348623157E308 - traitShelvedModifier = 0.4000000059604645 - #The modifier for the 'Shelved_2' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. - #Range: 0.0 ~ 1.7976931348623157E308 - traitShelved_2Modifier = 0.3499999940395355 - #The modifier for the 'Shelved_3' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. - #Range: 0.0 ~ 1.7976931348623157E308 - traitShelved_3Modifier = 0.25 - #The modifier for the 'Hung' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. - #Range: 0.0 ~ 1.7976931348623157E308 - traitHungModifier = 0.3499999940395355 - #The modifier for the 'Hung_2' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. - #Range: 0.0 ~ 1.7976931348623157E308 - traitHung_2Modifier = 0.30000001192092896 - #The modifier for the 'Hung_3' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. - #Range: 0.0 ~ 1.7976931348623157E308 - traitHung_3Modifier = 0.25 - #The modifier for the 'Fermented' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. - #Range: 0.0 ~ 1.7976931348623157E308 - traitFermentedModifier = 0.25 - #The modifier for the 'Bee_pollinated' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. - #Range: 0.0 ~ 1.7976931348623157E308 - traitBee_pollinatedModifier = 0.800000011920929 - #The modifier for the 'Dirt_grown' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. - #Range: 0.0 ~ 1.7976931348623157E308 - traitDirt_grownModifier = 0.8999999761581421 - #The modifier for the 'Gravel_grown' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. - #Range: 0.0 ~ 1.7976931348623157E308 - traitGravel_grownModifier = 0.800000011920929 - #The modifier for the 'Slope_grown' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. - #Range: 0.0 ~ 1.7976931348623157E308 - traitSlope_grownModifier = 0.800000011920929 - + +[general] + #If false, sprinklers will not accept Firmalife pipes and will instead require something that exposes a fluid capability, eg. a barrel. + usePipesForSprinklers = false + #Days in a cellar to make cheese Aged. + #Range: > 1 + cheeseAgedDays = 28 + #Days in a cellar to make cheese Vintage. + #Range: > 1 + cheeseVintageDays = 112 + #Ticks to dry something on a drying mat (24000 ticks = 1 day) + #Range: > 1 + dryingTicks = 12000 + #Ticks to dry something on a solar drier (24000 ticks = 1 day) + #Range: > 1 + solarDryingTicks = 1000 + #Ticks to smoke something on a string (24000 ticks = 1 day) + #Range: > 1 + smokingTicks = 8000 + #Number of blocks below the firepit that wool string will search for valid smoking firepits. + #Range: > 1 + smokingFirepitRange = 6 + #Ticks for a composter tumbler to finish (24000 ticks = 1 day) + #Range: > 1 + compostTumblerTicks = 96000 + #Ticks for an oven to cure (24000 ticks = 1 day) + #Range: > 1 + ovenCureTicks = 2000 + #Minimum temperature for an oven to start the curing process (24000 ticks = 1 day) + #Range: > 1 + ovenCureTemperature = 600 + #If true, ovens will hurt the player if they touch it without a peel in hand. + ovenRequirePeel = false + #The chance for fuel burning in an oven to drop an ash block into an ashtray. + #Range: 0.0 ~ 1.0 + ovenAshChance = 0.5 + #If true, players can throw seed balls. + enableSeedBalls = true + #If true, bees can swarm and hurt the player if provoked. + enableBeeSwarm = true + #The capacity in mB of the wine glass. Default 250 + #Range: > 1 + hollowShellCapacity = 250 + #The average temperature below which stronger decay modifiers apply to cellar blocks. + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 + cellarLevel2Temperature = 0.0 + #The average temperature below which even stronger decay modifiers apply to cellar blocks. + #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308 + cellarLevel3Temperature = -12.0 + #The average amount of days for a crop in a greenhouse to grow. For normal crops, this is 24 days. + #Range: 4.9E-324 ~ 1.7976931348623157E308 + greenhouseGrowthDays = 20.0 + #The average amount of days for a crop in a greenhouse to consume all its water. + #Range: 0.0 ~ 1.7976931348623157E308 + greenhouseWaterDays = 12.0 + #The average amount of days for a crop to consume all of a nutrient. You should probably not configure this value unless you know what it does in the code. For regular crops this value is 12. + #Range: 0.0 ~ 1.7976931348623157E308 + greenhouseNutrientDays = 8.0 + #The max bounded distance from the climate station a greenhouse wall can be. Higher numbers = more lag. + #Range: 1 ~ 128 + greenhouseRadius = 15 + #The max bounded distance from the climate station a cellar wall can be. Higher numbers = more lag. + #Range: 1 ~ 128 + cellarRadius = 15 + #If true, the tumbler and the pumping station work magically with a redstone signal and no power required. + mechanicalPowerCheatMode = true + +[foodTraits] + #The modifier for the 'Dried' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. + #Range: 0.0 ~ 1.7976931348623157E308 + traitDriedModifier = 0.5 + #The modifier for the 'Fresh' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. + #Range: 0.0 ~ 1.7976931348623157E308 + traitFreshModifier = 1.100000023841858 + #The modifier for the 'Aged' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. + #Range: 0.0 ~ 1.7976931348623157E308 + traitAgedModifier = 0.8999999761581421 + #The modifier for the 'Vintage' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. + #Range: 0.0 ~ 1.7976931348623157E308 + traitVintageModifier = 0.6000000238418579 + #The modifier for the 'Oven_baked' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. + #Range: 0.0 ~ 1.7976931348623157E308 + traitOven_bakedModifier = 0.8999999761581421 + #The modifier for the 'Smoked' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. + #Range: 0.0 ~ 1.7976931348623157E308 + traitSmokedModifier = 0.699999988079071 + #The modifier for the 'Rancid_smoked' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. + #Range: 0.0 ~ 1.7976931348623157E308 + traitRancid_smokedModifier = 2.0 + #The modifier for the 'Shelved' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. + #Range: 0.0 ~ 1.7976931348623157E308 + traitShelvedModifier = 0.4000000059604645 + #The modifier for the 'Shelved_2' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. + #Range: 0.0 ~ 1.7976931348623157E308 + traitShelved_2Modifier = 0.3499999940395355 + #The modifier for the 'Shelved_3' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. + #Range: 0.0 ~ 1.7976931348623157E308 + traitShelved_3Modifier = 0.25 + #The modifier for the 'Hung' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. + #Range: 0.0 ~ 1.7976931348623157E308 + traitHungModifier = 0.3499999940395355 + #The modifier for the 'Hung_2' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. + #Range: 0.0 ~ 1.7976931348623157E308 + traitHung_2Modifier = 0.30000001192092896 + #The modifier for the 'Hung_3' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. + #Range: 0.0 ~ 1.7976931348623157E308 + traitHung_3Modifier = 0.25 + #The modifier for the 'Fermented' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. + #Range: 0.0 ~ 1.7976931348623157E308 + traitFermentedModifier = 0.25 + #The modifier for the 'Bee_pollinated' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. + #Range: 0.0 ~ 1.7976931348623157E308 + traitBee_pollinatedModifier = 0.800000011920929 + #The modifier for the 'Dirt_grown' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. + #Range: 0.0 ~ 1.7976931348623157E308 + traitDirt_grownModifier = 0.8999999761581421 + #The modifier for the 'Gravel_grown' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. + #Range: 0.0 ~ 1.7976931348623157E308 + traitGravel_grownModifier = 0.800000011920929 + #The modifier for the 'Slope_grown' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay. + #Range: 0.0 ~ 1.7976931348623157E308 + traitSlope_grownModifier = 0.800000011920929 + diff --git a/defaultconfigs/greate-server.toml b/defaultconfigs/greate-server.toml index 39338548d..afef19eff 100644 --- a/defaultconfigs/greate-server.toml +++ b/defaultconfigs/greate-server.toml @@ -1,425 +1,425 @@ -#. -#Multiplier used for calculating how many ticks should initially be removed in fan processing recipes, based on how fast the fan is spinning. -#Range: 0.0 ~ 3.4028234663852886E38 -fanSpeedMultiplier = 0.75 - -#. -#Parameters and abilities of Greate's kinetic mechanisms -[kinetics] - - #. - #. - #Fine tune settings related to belts - [kinetics.belts] - - #. - #. - #Rubber Belt Settings - [kinetics.belts.rubber] - #. - #Maximum length in blocks of rubber mechanical belts - #Range: > 5 - rubberMaxBeltLength = 20 - - #. - #Silicone Rubber Belt Settings - [kinetics.belts.silicone] - #. - #Maximum length in blocks of silicone mechanical belts - #Range: > 5 - siliconeMaxBeltLength = 25 - - #. - #Polyethylene Belt Settings - [kinetics.belts.polyethylene] - #. - #Maximum length in blocks of polyethylene mechanical belts - #Range: > 5 - polyethyleneMaxBeltLength = 30 - - #. - #Polytetrafluoroethylene Belt Settings - [kinetics.belts.polytetrafluoroethylene] - #. - #Maximum length in blocks of polytetrafluoroethylene mechanical belts - #Range: > 5 - polytetrafluoroethyleneMaxBeltLength = 35 - - #. - #Polybenzimidazole Belt Settings - [kinetics.belts.polybenzimidazole] - #. - #Maximum length in blocks of polybenzimidazole mechanical belts - #Range: > 5 - polybenzimidazoleMaxBeltLength = 40 - - [kinetics.stressValues] - - #. - #Fine tune the kinetic stats of individual components - [kinetics.stressValues.v2] - - #. - #.[in Stress Units]Configure the individual stress impact of mechanical blocks. Note that this cost is doubled for every speed increase it receives - [kinetics.stressValues.v2.impact] - - [kinetics.stressValues.v2.impact.andesite_alloy] - rubber_belt_andesite_alloy = 0.0 - andesite_alloy_shaft = 0.0 - andesite_encased_andesite_alloy_shaft = 0.0 - brass_encased_andesite_alloy_shaft = 0.0 - andesite_alloy_cogwheel = 0.0 - large_andesite_alloy_cogwheel = 0.0 - andesite_encased_andesite_alloy_cogwheel = 0.0 - andesite_encased_large_andesite_alloy_cogwheel = 0.0 - brass_encased_andesite_alloy_cogwheel = 0.0 - brass_encased_large_andesite_alloy_cogwheel = 0.0 - andesite_alloy_crushing_wheel = 0.5 - andesite_alloy_encased_fan = 0.5 - andesite_alloy_gearbox = 0.0 - andesite_alloy_mechanical_press = 0.5 - andesite_alloy_mechanical_mixer = 0.5 - andesite_alloy_millstone = 0.5 - andesite_alloy_mechanical_saw = 0.5 - andesite_alloy_mechanical_pump = 0.5 - - [kinetics.stressValues.v2.impact.steel] - rubber_belt_steel = 0.0 - steel_shaft = 0.0 - andesite_encased_steel_shaft = 0.0 - brass_encased_steel_shaft = 0.0 - steel_cogwheel = 0.0 - large_steel_cogwheel = 0.0 - andesite_encased_steel_cogwheel = 0.0 - andesite_encased_large_steel_cogwheel = 0.0 - brass_encased_steel_cogwheel = 0.0 - brass_encased_large_steel_cogwheel = 0.0 - steel_crushing_wheel = 1.0 - steel_encased_fan = 1.0 - steel_gearbox = 0.0 - steel_mechanical_press = 1.0 - steel_mechanical_mixer = 1.0 - steel_millstone = 1.0 - steel_mechanical_saw = 1.0 - steel_mechanical_pump = 1.0 - tungsten_steel_gearbox = 0.0 - tungsten_steel_crushing_wheel = 3.0 - brass_encased_tungsten_steel_shaft = 0.0 - silicone_rubber_belt_stainless_steel = 0.0 - andesite_encased_large_tungsten_steel_cogwheel = 0.0 - andesite_encased_tungsten_steel_cogwheel = 0.0 - stainless_steel_mechanical_saw = 4.0 - stainless_steel_cogwheel = 0.0 - andesite_encased_stainless_steel_shaft = 0.0 - tungsten_steel_encased_fan = 3.0 - andesite_encased_large_stainless_steel_cogwheel = 0.0 - large_tungsten_steel_cogwheel = 0.0 - stainless_steel_shaft = 0.0 - tungsten_steel_cogwheel = 0.0 - stainless_steel_mechanical_press = 4.0 - large_stainless_steel_cogwheel = 0.0 - brass_encased_large_tungsten_steel_cogwheel = 0.0 - stainless_steel_mechanical_pump = 2.0 - brass_encased_large_stainless_steel_cogwheel = 0.0 - stainless_steel_encased_fan = 2.0 - stainless_steel_millstone = 2.0 - stainless_steel_gearbox = 0.0 - tungsten_steel_millstone = 3.0 - brass_encased_stainless_steel_shaft = 0.0 - tungsten_steel_mechanical_press = 6.0 - polyethylene_belt_tungsten_steel = 0.0 - tungsten_steel_shaft = 0.0 - stainless_steel_mechanical_mixer = 2.0 - andesite_encased_stainless_steel_cogwheel = 0.0 - andesite_encased_tungsten_steel_shaft = 0.0 - tungsten_steel_mechanical_saw = 6.0 - brass_encased_tungsten_steel_cogwheel = 0.0 - brass_encased_stainless_steel_cogwheel = 0.0 - stainless_steel_crushing_wheel = 2.0 - tungsten_steel_mechanical_mixer = 3.0 - tungsten_steel_mechanical_pump = 3.0 - - [kinetics.stressValues.v2.impact.aluminium] - silicone_rubber_belt_aluminium = 0.0 - aluminium_shaft = 0.0 - andesite_encased_aluminium_shaft = 0.0 - brass_encased_aluminium_shaft = 0.0 - aluminium_cogwheel = 0.0 - large_aluminium_cogwheel = 0.0 - andesite_encased_aluminium_cogwheel = 0.0 - andesite_encased_large_aluminium_cogwheel = 0.0 - brass_encased_aluminium_cogwheel = 0.0 - brass_encased_large_aluminium_cogwheel = 0.0 - aluminium_crushing_wheel = 1.5 - aluminium_encased_fan = 1.5 - aluminium_gearbox = 0.0 - aluminium_mechanical_press = 1.5 - aluminium_mechanical_mixer = 1.5 - aluminium_millstone = 1.5 - aluminium_mechanical_saw = 1.5 - aluminium_mechanical_pump = 1.5 - - [kinetics.stressValues.v2.impact.stainless_steel] - silicone_rubber_belt_stainless_steel = 0.0 - stainless_steel_shaft = 0.0 - andesite_encased_stainless_steel_shaft = 0.0 - brass_encased_stainless_steel_shaft = 0.0 - stainless_steel_cogwheel = 0.0 - large_stainless_steel_cogwheel = 0.0 - andesite_encased_stainless_steel_cogwheel = 0.0 - andesite_encased_large_stainless_steel_cogwheel = 0.0 - brass_encased_stainless_steel_cogwheel = 0.0 - brass_encased_large_stainless_steel_cogwheel = 0.0 - stainless_steel_crushing_wheel = 2.0 - stainless_steel_encased_fan = 2.0 - stainless_steel_gearbox = 0.0 - stainless_steel_mechanical_press = 2.0 - stainless_steel_mechanical_mixer = 2.0 - stainless_steel_millstone = 2.0 - stainless_steel_mechanical_saw = 2.0 - stainless_steel_mechanical_pump = 2.0 - - [kinetics.stressValues.v2.impact.titanium] - polyethylene_belt_titanium = 0.0 - titanium_shaft = 0.0 - andesite_encased_titanium_shaft = 0.0 - brass_encased_titanium_shaft = 0.0 - titanium_cogwheel = 0.0 - large_titanium_cogwheel = 0.0 - andesite_encased_titanium_cogwheel = 0.0 - andesite_encased_large_titanium_cogwheel = 0.0 - brass_encased_titanium_cogwheel = 0.0 - brass_encased_large_titanium_cogwheel = 0.0 - titanium_crushing_wheel = 2.5 - titanium_encased_fan = 2.5 - titanium_gearbox = 0.0 - titanium_mechanical_press = 2.5 - titanium_mechanical_mixer = 2.5 - titanium_millstone = 2.5 - titanium_mechanical_saw = 2.5 - titanium_mechanical_pump = 2.5 - - [kinetics.stressValues.v2.impact.tungsten_steel] - polyethylene_belt_tungsten_steel = 0.0 - tungsten_steel_shaft = 0.0 - andesite_encased_tungsten_steel_shaft = 0.0 - brass_encased_tungsten_steel_shaft = 0.0 - tungsten_steel_cogwheel = 0.0 - large_tungsten_steel_cogwheel = 0.0 - andesite_encased_tungsten_steel_cogwheel = 0.0 - andesite_encased_large_tungsten_steel_cogwheel = 0.0 - brass_encased_tungsten_steel_cogwheel = 0.0 - brass_encased_large_tungsten_steel_cogwheel = 0.0 - tungsten_steel_crushing_wheel = 3.0 - tungsten_steel_encased_fan = 3.0 - tungsten_steel_gearbox = 0.0 - tungsten_steel_mechanical_press = 3.0 - tungsten_steel_mechanical_mixer = 3.0 - tungsten_steel_millstone = 3.0 - tungsten_steel_mechanical_saw = 3.0 - tungsten_steel_mechanical_pump = 3.0 - - [kinetics.stressValues.v2.impact.rhodium_plated_palladium] - polytetrafluoroethylene_belt_rhodium_plated_palladium = 0.0 - rhodium_plated_palladium_shaft = 0.0 - andesite_encased_rhodium_plated_palladium_shaft = 0.0 - brass_encased_rhodium_plated_palladium_shaft = 0.0 - rhodium_plated_palladium_cogwheel = 0.0 - large_rhodium_plated_palladium_cogwheel = 0.0 - andesite_encased_rhodium_plated_palladium_cogwheel = 0.0 - andesite_encased_large_rhodium_plated_palladium_cogwheel = 0.0 - brass_encased_rhodium_plated_palladium_cogwheel = 0.0 - brass_encased_large_rhodium_plated_palladium_cogwheel = 0.0 - rhodium_plated_palladium_crushing_wheel = 3.5 - rhodium_plated_palladium_encased_fan = 3.5 - rhodium_plated_palladium_gearbox = 0.0 - rhodium_plated_palladium_mechanical_press = 3.5 - rhodium_plated_palladium_mechanical_mixer = 3.5 - rhodium_plated_palladium_millstone = 3.5 - rhodium_plated_palladium_mechanical_saw = 3.5 - rhodium_plated_palladium_mechanical_pump = 3.5 - - [kinetics.stressValues.v2.impact.naquadah_alloy] - polytetrafluoroethylene_belt_naquadah_alloy = 0.0 - naquadah_alloy_shaft = 0.0 - andesite_encased_naquadah_alloy_shaft = 0.0 - brass_encased_naquadah_alloy_shaft = 0.0 - naquadah_alloy_cogwheel = 0.0 - large_naquadah_alloy_cogwheel = 0.0 - andesite_encased_naquadah_alloy_cogwheel = 0.0 - andesite_encased_large_naquadah_alloy_cogwheel = 0.0 - brass_encased_naquadah_alloy_cogwheel = 0.0 - brass_encased_large_naquadah_alloy_cogwheel = 0.0 - naquadah_alloy_crushing_wheel = 4.0 - naquadah_alloy_encased_fan = 4.0 - naquadah_alloy_gearbox = 0.0 - naquadah_alloy_mechanical_press = 4.0 - naquadah_alloy_mechanical_mixer = 4.0 - naquadah_alloy_millstone = 4.0 - naquadah_alloy_mechanical_saw = 4.0 - naquadah_alloy_mechanical_pump = 4.0 - - [kinetics.stressValues.v2.impact.darmstadtium] - polybenzimidazole_belt_darmstadtium = 0.0 - darmstadtium_shaft = 0.0 - andesite_encased_darmstadtium_shaft = 0.0 - brass_encased_darmstadtium_shaft = 0.0 - darmstadtium_cogwheel = 0.0 - large_darmstadtium_cogwheel = 0.0 - andesite_encased_darmstadtium_cogwheel = 0.0 - andesite_encased_large_darmstadtium_cogwheel = 0.0 - brass_encased_darmstadtium_cogwheel = 0.0 - brass_encased_large_darmstadtium_cogwheel = 0.0 - darmstadtium_crushing_wheel = 4.5 - darmstadtium_encased_fan = 4.5 - darmstadtium_gearbox = 0.0 - darmstadtium_mechanical_press = 4.5 - darmstadtium_mechanical_mixer = 4.5 - darmstadtium_millstone = 4.5 - darmstadtium_mechanical_saw = 4.5 - darmstadtium_mechanical_pump = 4.5 - - [kinetics.stressValues.v2.impact.neutronium] - polybenzimidazole_belt_neutronium = 0.0 - neutronium_shaft = 0.0 - andesite_encased_neutronium_shaft = 0.0 - brass_encased_neutronium_shaft = 0.0 - neutronium_cogwheel = 0.0 - large_neutronium_cogwheel = 0.0 - andesite_encased_neutronium_cogwheel = 0.0 - andesite_encased_large_neutronium_cogwheel = 0.0 - brass_encased_neutronium_cogwheel = 0.0 - brass_encased_large_neutronium_cogwheel = 0.0 - neutronium_crushing_wheel = 5.0 - neutronium_encased_fan = 5.6 - neutronium_gearbox = 0.0 - neutronium_mechanical_press = 5.0 - neutronium_mechanical_mixer = 5.0 - neutronium_millstone = 5.0 - neutronium_mechanical_saw = 5.0 - neutronium_mechanical_pump = 5.0 - - #. - #Fine tune settings related to tiers - [kinetics.stressValues.v2.maxCapacity] - - #. - #. - #Settings related to andesite tier machines - [kinetics.stressValues.v2.maxCapacity.andesite] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - andesiteMaxCapacity = 32 - - #. - #Settings related to steel tier machines - [kinetics.stressValues.v2.maxCapacity.steel] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - steelMaxCapacity = 128 - - #. - #Settings related to aluminium tier machines - [kinetics.stressValues.v2.maxCapacity.aluminium] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - aluminiumMaxCapacity = 512 - - #. - #Settings related to stainless steel tier machines - [kinetics.stressValues.v2.maxCapacity.stainlessSteel] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - stainlessSteelMaxCapacity = 2048 - - #. - #Settings related to titanium tier machines - [kinetics.stressValues.v2.maxCapacity.titanium] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - titaniumMaxCapacity = 8192 - - #. - #Settings related to tungstensteel tier machines - [kinetics.stressValues.v2.maxCapacity.tungstensteel] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - tungstensteelMaxCapacity = 32768 - - #. - #Settings related to palladium tier machines - [kinetics.stressValues.v2.maxCapacity.palladium] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - palladiumMaxCapacity = 131072 - - #. - #Settings related to naquadah tier machines - [kinetics.stressValues.v2.maxCapacity.naquadah] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - naquadahMaxCapacity = 524288 - - #. - #Settings related to darmstadtium tier machines - [kinetics.stressValues.v2.maxCapacity.darmstadtium] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - darmstadtiumMaxCapacity = 2097152 - - #. - #Settings related to neutronium tier machines - [kinetics.stressValues.v2.maxCapacity.neutronium] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - neutroniumMaxCapacity = 8388608 - - #. - #Fine tune settings related to pumps - [kinetics.pumps] - - #. - #. - #Configure the individual pressure of pumps. Note that pressure is multiplied by the speed of the pump - [kinetics.pumps.pressure] - #. - #Range: 0.0 ~ 3.4028234663852886E38 - andesitePressure = 8.0 - #. - #Range: 0.0 ~ 3.4028234663852886E38 - steelPressure = 32.0 - #. - #Range: 0.0 ~ 3.4028234663852886E38 - aluminiumPressure = 128.0 - #. - #Range: 0.0 ~ 3.4028234663852886E38 - stainlessSteelPressure = 512.0 - #. - #Range: 0.0 ~ 3.4028234663852886E38 - titaniumPressure = 2048.0 - #. - #Range: 0.0 ~ 3.4028234663852886E38 - tungstensteelPressure = 8192.0 - #. - #Range: 0.0 ~ 3.4028234663852886E38 - palladiumPressure = 16384.0 - #. - #Range: 0.0 ~ 3.4028234663852886E38 - naquadahPressure = 32768.0 - #. - #Range: 0.0 ~ 3.4028234663852886E38 - darmstadtiumPressure = 131072.0 - #. - #Range: 0.0 ~ 3.4028234663852886E38 - neutroniumPressure = 524288.0 - +#. +#Multiplier used for calculating how many ticks should initially be removed in fan processing recipes, based on how fast the fan is spinning. +#Range: 0.0 ~ 3.4028234663852886E38 +fanSpeedMultiplier = 0.75 + +#. +#Parameters and abilities of Greate's kinetic mechanisms +[kinetics] + + #. + #. + #Fine tune settings related to belts + [kinetics.belts] + + #. + #. + #Rubber Belt Settings + [kinetics.belts.rubber] + #. + #Maximum length in blocks of rubber mechanical belts + #Range: > 5 + rubberMaxBeltLength = 20 + + #. + #Silicone Rubber Belt Settings + [kinetics.belts.silicone] + #. + #Maximum length in blocks of silicone mechanical belts + #Range: > 5 + siliconeMaxBeltLength = 25 + + #. + #Polyethylene Belt Settings + [kinetics.belts.polyethylene] + #. + #Maximum length in blocks of polyethylene mechanical belts + #Range: > 5 + polyethyleneMaxBeltLength = 30 + + #. + #Polytetrafluoroethylene Belt Settings + [kinetics.belts.polytetrafluoroethylene] + #. + #Maximum length in blocks of polytetrafluoroethylene mechanical belts + #Range: > 5 + polytetrafluoroethyleneMaxBeltLength = 35 + + #. + #Polybenzimidazole Belt Settings + [kinetics.belts.polybenzimidazole] + #. + #Maximum length in blocks of polybenzimidazole mechanical belts + #Range: > 5 + polybenzimidazoleMaxBeltLength = 40 + + [kinetics.stressValues] + + #. + #Fine tune the kinetic stats of individual components + [kinetics.stressValues.v2] + + #. + #.[in Stress Units]Configure the individual stress impact of mechanical blocks. Note that this cost is doubled for every speed increase it receives + [kinetics.stressValues.v2.impact] + + [kinetics.stressValues.v2.impact.andesite_alloy] + rubber_belt_andesite_alloy = 0.0 + andesite_alloy_shaft = 0.0 + andesite_encased_andesite_alloy_shaft = 0.0 + brass_encased_andesite_alloy_shaft = 0.0 + andesite_alloy_cogwheel = 0.0 + large_andesite_alloy_cogwheel = 0.0 + andesite_encased_andesite_alloy_cogwheel = 0.0 + andesite_encased_large_andesite_alloy_cogwheel = 0.0 + brass_encased_andesite_alloy_cogwheel = 0.0 + brass_encased_large_andesite_alloy_cogwheel = 0.0 + andesite_alloy_crushing_wheel = 0.5 + andesite_alloy_encased_fan = 0.5 + andesite_alloy_gearbox = 0.0 + andesite_alloy_mechanical_press = 0.5 + andesite_alloy_mechanical_mixer = 0.5 + andesite_alloy_millstone = 0.5 + andesite_alloy_mechanical_saw = 0.5 + andesite_alloy_mechanical_pump = 0.5 + + [kinetics.stressValues.v2.impact.steel] + rubber_belt_steel = 0.0 + steel_shaft = 0.0 + andesite_encased_steel_shaft = 0.0 + brass_encased_steel_shaft = 0.0 + steel_cogwheel = 0.0 + large_steel_cogwheel = 0.0 + andesite_encased_steel_cogwheel = 0.0 + andesite_encased_large_steel_cogwheel = 0.0 + brass_encased_steel_cogwheel = 0.0 + brass_encased_large_steel_cogwheel = 0.0 + steel_crushing_wheel = 1.0 + steel_encased_fan = 1.0 + steel_gearbox = 0.0 + steel_mechanical_press = 1.0 + steel_mechanical_mixer = 1.0 + steel_millstone = 1.0 + steel_mechanical_saw = 1.0 + steel_mechanical_pump = 1.0 + tungsten_steel_gearbox = 0.0 + tungsten_steel_crushing_wheel = 3.0 + brass_encased_tungsten_steel_shaft = 0.0 + silicone_rubber_belt_stainless_steel = 0.0 + andesite_encased_large_tungsten_steel_cogwheel = 0.0 + andesite_encased_tungsten_steel_cogwheel = 0.0 + stainless_steel_mechanical_saw = 4.0 + stainless_steel_cogwheel = 0.0 + andesite_encased_stainless_steel_shaft = 0.0 + tungsten_steel_encased_fan = 3.0 + andesite_encased_large_stainless_steel_cogwheel = 0.0 + large_tungsten_steel_cogwheel = 0.0 + stainless_steel_shaft = 0.0 + tungsten_steel_cogwheel = 0.0 + stainless_steel_mechanical_press = 4.0 + large_stainless_steel_cogwheel = 0.0 + brass_encased_large_tungsten_steel_cogwheel = 0.0 + stainless_steel_mechanical_pump = 2.0 + brass_encased_large_stainless_steel_cogwheel = 0.0 + stainless_steel_encased_fan = 2.0 + stainless_steel_millstone = 2.0 + stainless_steel_gearbox = 0.0 + tungsten_steel_millstone = 3.0 + brass_encased_stainless_steel_shaft = 0.0 + tungsten_steel_mechanical_press = 6.0 + polyethylene_belt_tungsten_steel = 0.0 + tungsten_steel_shaft = 0.0 + stainless_steel_mechanical_mixer = 2.0 + andesite_encased_stainless_steel_cogwheel = 0.0 + andesite_encased_tungsten_steel_shaft = 0.0 + tungsten_steel_mechanical_saw = 6.0 + brass_encased_tungsten_steel_cogwheel = 0.0 + brass_encased_stainless_steel_cogwheel = 0.0 + stainless_steel_crushing_wheel = 2.0 + tungsten_steel_mechanical_mixer = 3.0 + tungsten_steel_mechanical_pump = 3.0 + + [kinetics.stressValues.v2.impact.aluminium] + silicone_rubber_belt_aluminium = 0.0 + aluminium_shaft = 0.0 + andesite_encased_aluminium_shaft = 0.0 + brass_encased_aluminium_shaft = 0.0 + aluminium_cogwheel = 0.0 + large_aluminium_cogwheel = 0.0 + andesite_encased_aluminium_cogwheel = 0.0 + andesite_encased_large_aluminium_cogwheel = 0.0 + brass_encased_aluminium_cogwheel = 0.0 + brass_encased_large_aluminium_cogwheel = 0.0 + aluminium_crushing_wheel = 1.5 + aluminium_encased_fan = 1.5 + aluminium_gearbox = 0.0 + aluminium_mechanical_press = 1.5 + aluminium_mechanical_mixer = 1.5 + aluminium_millstone = 1.5 + aluminium_mechanical_saw = 1.5 + aluminium_mechanical_pump = 1.5 + + [kinetics.stressValues.v2.impact.stainless_steel] + silicone_rubber_belt_stainless_steel = 0.0 + stainless_steel_shaft = 0.0 + andesite_encased_stainless_steel_shaft = 0.0 + brass_encased_stainless_steel_shaft = 0.0 + stainless_steel_cogwheel = 0.0 + large_stainless_steel_cogwheel = 0.0 + andesite_encased_stainless_steel_cogwheel = 0.0 + andesite_encased_large_stainless_steel_cogwheel = 0.0 + brass_encased_stainless_steel_cogwheel = 0.0 + brass_encased_large_stainless_steel_cogwheel = 0.0 + stainless_steel_crushing_wheel = 2.0 + stainless_steel_encased_fan = 2.0 + stainless_steel_gearbox = 0.0 + stainless_steel_mechanical_press = 2.0 + stainless_steel_mechanical_mixer = 2.0 + stainless_steel_millstone = 2.0 + stainless_steel_mechanical_saw = 2.0 + stainless_steel_mechanical_pump = 2.0 + + [kinetics.stressValues.v2.impact.titanium] + polyethylene_belt_titanium = 0.0 + titanium_shaft = 0.0 + andesite_encased_titanium_shaft = 0.0 + brass_encased_titanium_shaft = 0.0 + titanium_cogwheel = 0.0 + large_titanium_cogwheel = 0.0 + andesite_encased_titanium_cogwheel = 0.0 + andesite_encased_large_titanium_cogwheel = 0.0 + brass_encased_titanium_cogwheel = 0.0 + brass_encased_large_titanium_cogwheel = 0.0 + titanium_crushing_wheel = 2.5 + titanium_encased_fan = 2.5 + titanium_gearbox = 0.0 + titanium_mechanical_press = 2.5 + titanium_mechanical_mixer = 2.5 + titanium_millstone = 2.5 + titanium_mechanical_saw = 2.5 + titanium_mechanical_pump = 2.5 + + [kinetics.stressValues.v2.impact.tungsten_steel] + polyethylene_belt_tungsten_steel = 0.0 + tungsten_steel_shaft = 0.0 + andesite_encased_tungsten_steel_shaft = 0.0 + brass_encased_tungsten_steel_shaft = 0.0 + tungsten_steel_cogwheel = 0.0 + large_tungsten_steel_cogwheel = 0.0 + andesite_encased_tungsten_steel_cogwheel = 0.0 + andesite_encased_large_tungsten_steel_cogwheel = 0.0 + brass_encased_tungsten_steel_cogwheel = 0.0 + brass_encased_large_tungsten_steel_cogwheel = 0.0 + tungsten_steel_crushing_wheel = 3.0 + tungsten_steel_encased_fan = 3.0 + tungsten_steel_gearbox = 0.0 + tungsten_steel_mechanical_press = 3.0 + tungsten_steel_mechanical_mixer = 3.0 + tungsten_steel_millstone = 3.0 + tungsten_steel_mechanical_saw = 3.0 + tungsten_steel_mechanical_pump = 3.0 + + [kinetics.stressValues.v2.impact.rhodium_plated_palladium] + polytetrafluoroethylene_belt_rhodium_plated_palladium = 0.0 + rhodium_plated_palladium_shaft = 0.0 + andesite_encased_rhodium_plated_palladium_shaft = 0.0 + brass_encased_rhodium_plated_palladium_shaft = 0.0 + rhodium_plated_palladium_cogwheel = 0.0 + large_rhodium_plated_palladium_cogwheel = 0.0 + andesite_encased_rhodium_plated_palladium_cogwheel = 0.0 + andesite_encased_large_rhodium_plated_palladium_cogwheel = 0.0 + brass_encased_rhodium_plated_palladium_cogwheel = 0.0 + brass_encased_large_rhodium_plated_palladium_cogwheel = 0.0 + rhodium_plated_palladium_crushing_wheel = 3.5 + rhodium_plated_palladium_encased_fan = 3.5 + rhodium_plated_palladium_gearbox = 0.0 + rhodium_plated_palladium_mechanical_press = 3.5 + rhodium_plated_palladium_mechanical_mixer = 3.5 + rhodium_plated_palladium_millstone = 3.5 + rhodium_plated_palladium_mechanical_saw = 3.5 + rhodium_plated_palladium_mechanical_pump = 3.5 + + [kinetics.stressValues.v2.impact.naquadah_alloy] + polytetrafluoroethylene_belt_naquadah_alloy = 0.0 + naquadah_alloy_shaft = 0.0 + andesite_encased_naquadah_alloy_shaft = 0.0 + brass_encased_naquadah_alloy_shaft = 0.0 + naquadah_alloy_cogwheel = 0.0 + large_naquadah_alloy_cogwheel = 0.0 + andesite_encased_naquadah_alloy_cogwheel = 0.0 + andesite_encased_large_naquadah_alloy_cogwheel = 0.0 + brass_encased_naquadah_alloy_cogwheel = 0.0 + brass_encased_large_naquadah_alloy_cogwheel = 0.0 + naquadah_alloy_crushing_wheel = 4.0 + naquadah_alloy_encased_fan = 4.0 + naquadah_alloy_gearbox = 0.0 + naquadah_alloy_mechanical_press = 4.0 + naquadah_alloy_mechanical_mixer = 4.0 + naquadah_alloy_millstone = 4.0 + naquadah_alloy_mechanical_saw = 4.0 + naquadah_alloy_mechanical_pump = 4.0 + + [kinetics.stressValues.v2.impact.darmstadtium] + polybenzimidazole_belt_darmstadtium = 0.0 + darmstadtium_shaft = 0.0 + andesite_encased_darmstadtium_shaft = 0.0 + brass_encased_darmstadtium_shaft = 0.0 + darmstadtium_cogwheel = 0.0 + large_darmstadtium_cogwheel = 0.0 + andesite_encased_darmstadtium_cogwheel = 0.0 + andesite_encased_large_darmstadtium_cogwheel = 0.0 + brass_encased_darmstadtium_cogwheel = 0.0 + brass_encased_large_darmstadtium_cogwheel = 0.0 + darmstadtium_crushing_wheel = 4.5 + darmstadtium_encased_fan = 4.5 + darmstadtium_gearbox = 0.0 + darmstadtium_mechanical_press = 4.5 + darmstadtium_mechanical_mixer = 4.5 + darmstadtium_millstone = 4.5 + darmstadtium_mechanical_saw = 4.5 + darmstadtium_mechanical_pump = 4.5 + + [kinetics.stressValues.v2.impact.neutronium] + polybenzimidazole_belt_neutronium = 0.0 + neutronium_shaft = 0.0 + andesite_encased_neutronium_shaft = 0.0 + brass_encased_neutronium_shaft = 0.0 + neutronium_cogwheel = 0.0 + large_neutronium_cogwheel = 0.0 + andesite_encased_neutronium_cogwheel = 0.0 + andesite_encased_large_neutronium_cogwheel = 0.0 + brass_encased_neutronium_cogwheel = 0.0 + brass_encased_large_neutronium_cogwheel = 0.0 + neutronium_crushing_wheel = 5.0 + neutronium_encased_fan = 5.6 + neutronium_gearbox = 0.0 + neutronium_mechanical_press = 5.0 + neutronium_mechanical_mixer = 5.0 + neutronium_millstone = 5.0 + neutronium_mechanical_saw = 5.0 + neutronium_mechanical_pump = 5.0 + + #. + #Fine tune settings related to tiers + [kinetics.stressValues.v2.maxCapacity] + + #. + #. + #Settings related to andesite tier machines + [kinetics.stressValues.v2.maxCapacity.andesite] + #. + #Configure the max stress a kinetic block of this tier can support. + #Range: > -2147483648 + andesiteMaxCapacity = 32 + + #. + #Settings related to steel tier machines + [kinetics.stressValues.v2.maxCapacity.steel] + #. + #Configure the max stress a kinetic block of this tier can support. + #Range: > -2147483648 + steelMaxCapacity = 128 + + #. + #Settings related to aluminium tier machines + [kinetics.stressValues.v2.maxCapacity.aluminium] + #. + #Configure the max stress a kinetic block of this tier can support. + #Range: > -2147483648 + aluminiumMaxCapacity = 512 + + #. + #Settings related to stainless steel tier machines + [kinetics.stressValues.v2.maxCapacity.stainlessSteel] + #. + #Configure the max stress a kinetic block of this tier can support. + #Range: > -2147483648 + stainlessSteelMaxCapacity = 2048 + + #. + #Settings related to titanium tier machines + [kinetics.stressValues.v2.maxCapacity.titanium] + #. + #Configure the max stress a kinetic block of this tier can support. + #Range: > -2147483648 + titaniumMaxCapacity = 8192 + + #. + #Settings related to tungstensteel tier machines + [kinetics.stressValues.v2.maxCapacity.tungstensteel] + #. + #Configure the max stress a kinetic block of this tier can support. + #Range: > -2147483648 + tungstensteelMaxCapacity = 32768 + + #. + #Settings related to palladium tier machines + [kinetics.stressValues.v2.maxCapacity.palladium] + #. + #Configure the max stress a kinetic block of this tier can support. + #Range: > -2147483648 + palladiumMaxCapacity = 131072 + + #. + #Settings related to naquadah tier machines + [kinetics.stressValues.v2.maxCapacity.naquadah] + #. + #Configure the max stress a kinetic block of this tier can support. + #Range: > -2147483648 + naquadahMaxCapacity = 524288 + + #. + #Settings related to darmstadtium tier machines + [kinetics.stressValues.v2.maxCapacity.darmstadtium] + #. + #Configure the max stress a kinetic block of this tier can support. + #Range: > -2147483648 + darmstadtiumMaxCapacity = 2097152 + + #. + #Settings related to neutronium tier machines + [kinetics.stressValues.v2.maxCapacity.neutronium] + #. + #Configure the max stress a kinetic block of this tier can support. + #Range: > -2147483648 + neutroniumMaxCapacity = 8388608 + + #. + #Fine tune settings related to pumps + [kinetics.pumps] + + #. + #. + #Configure the individual pressure of pumps. Note that pressure is multiplied by the speed of the pump + [kinetics.pumps.pressure] + #. + #Range: 0.0 ~ 3.4028234663852886E38 + andesitePressure = 8.0 + #. + #Range: 0.0 ~ 3.4028234663852886E38 + steelPressure = 32.0 + #. + #Range: 0.0 ~ 3.4028234663852886E38 + aluminiumPressure = 128.0 + #. + #Range: 0.0 ~ 3.4028234663852886E38 + stainlessSteelPressure = 512.0 + #. + #Range: 0.0 ~ 3.4028234663852886E38 + titaniumPressure = 2048.0 + #. + #Range: 0.0 ~ 3.4028234663852886E38 + tungstensteelPressure = 8192.0 + #. + #Range: 0.0 ~ 3.4028234663852886E38 + palladiumPressure = 16384.0 + #. + #Range: 0.0 ~ 3.4028234663852886E38 + naquadahPressure = 32768.0 + #. + #Range: 0.0 ~ 3.4028234663852886E38 + darmstadtiumPressure = 131072.0 + #. + #Range: 0.0 ~ 3.4028234663852886E38 + neutroniumPressure = 524288.0 + From 94d37acde25c2566935a3c769bd353cac1e1fe9f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 11 Aug 2025 16:00:19 +0100 Subject: [PATCH 006/158] added recipes for emptying gas tank/space suits --- kubejs/server_scripts/ad_astra/recipes.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/kubejs/server_scripts/ad_astra/recipes.js b/kubejs/server_scripts/ad_astra/recipes.js index 618a1e1fc..625382592 100644 --- a/kubejs/server_scripts/ad_astra/recipes.js +++ b/kubejs/server_scripts/ad_astra/recipes.js @@ -304,12 +304,18 @@ const registerAdAstraRecipes = (event) => { B: 'tfg:space_suit_fabric', D: 'ad_astra:oxygen_gear' }).id('tfg:space_suit') + + event.shapeless('ad_astra:space_suit', ['ad_astra:space_suit']) + .id('tfg:empty_space_suit') /* event.recipes.gtceu.assembler('ad_astra:netherite_space_suit') .itemInputs('ad_astra:space_suit', '5x #forge:plates/tungsten_steel','5x tfg:better_space_suit_fabric') .itemOutputs('ad_astra:netherite_space_suit') .duration(400) .EUt(GTValues.VA[GTValues.IV]) + + event.shapeless('ad_astra:netherite_space_suit', ['ad_astra:netherite_space_suit']) + .id('tfg:empty_netherite_space_suit') */ event.shaped('ad_astra:space_pants', [ 'BAB', @@ -367,6 +373,9 @@ const registerAdAstraRecipes = (event) => { C: 'gtceu:aluminium_fluid_cell' }).id('tfg:gas_tank') + event.shapeless('ad_astra:gas_tank', ['ad_astra:gas_tank']) + .id('tfg:empty_gas_tank') + event.shaped('ad_astra:large_gas_tank', [ 'ABA', 'ACA', @@ -377,6 +386,9 @@ const registerAdAstraRecipes = (event) => { C: 'gtceu:stainless_steel_fluid_cell' }).id('tfg:large_gas_tank') + event.shapeless('ad_astra:large_gas_tank', ['ad_astra:large_gas_tank']) + .id('tfg:empty_large_gas_tank') + //#endregion //#region Machines From 02c7ed4872f5f1ea250c72add776d4ab4a781731 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 11 Aug 2025 20:46:24 +0100 Subject: [PATCH 007/158] added electric lunchbox to quests --- config/ftbquests/quests/chapters/queststfc_tips.snbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index d4dc05675..84b582024 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -1975,7 +1975,7 @@ Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - "ftbfiltersystem:filter": "or(item(tfclunchbox:lunchbox)item(tfclunchbox:cooling_lunchbox))" + "ftbfiltersystem:filter": "or(item(tfclunchbox:lunchbox)item(tfclunchbox:cooling_lunchbox)item(tfclunchbox:electric_lunchbox))" } } title: "{quests.tfg_tips.lunchbox.task.1}" From 0349729547f5307b66c4cb97ee294b3d2bed3552 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 11 Aug 2025 20:46:36 +0100 Subject: [PATCH 008/158] mars crop greenhouse textures --- .../betterend/models/item/amber_root_wild.json | 8 ++++++-- .../betterend/models/item/blossom_berry_wild.json | 8 ++++++-- .../models/item/bolux_mushroom_wild.json | 8 ++++++-- .../betterend/models/item/cave_pumpkin_wild.json | 8 ++++++-- .../models/item/chorus_mushroom_wild.json | 8 ++++++-- .../betterend/models/item/shadow_berry_wild.json | 8 ++++++-- .../textures/block/blossom_berry_seed_3.png | Bin 0 -> 450 bytes .../block/bolux_mushroom_greenhouse_0.png | Bin 0 -> 204 bytes .../block/bolux_mushroom_greenhouse_1.png | Bin 0 -> 241 bytes .../block/bolux_mushroom_greenhouse_2.png | Bin 0 -> 317 bytes .../block/bolux_mushroom_greenhouse_3.png | Bin 0 -> 303 bytes .../textures/block/cave_pumpkin_greenhouse_0.png | Bin 0 -> 241 bytes .../textures/block/cave_pumpkin_greenhouse_1.png | Bin 0 -> 396 bytes .../textures/block/cave_pumpkin_greenhouse_2.png | Bin 0 -> 518 bytes .../textures/block/cave_pumpkin_greenhouse_3.png | Bin 0 -> 547 bytes .../textures/block/shadow_berry_greenhouse_0.png | Bin 0 -> 241 bytes .../textures/block/shadow_berry_greenhouse_1.png | Bin 0 -> 323 bytes .../textures/block/shadow_berry_greenhouse_2.png | Bin 0 -> 464 bytes .../textures/block/shadow_berry_greenhouse_3.png | Bin 0 -> 364 bytes kubejs/server_scripts/tfg/data.js | 8 +++----- 20 files changed, 39 insertions(+), 17 deletions(-) create mode 100644 kubejs/assets/betterend/textures/block/blossom_berry_seed_3.png create mode 100644 kubejs/assets/betterend/textures/block/bolux_mushroom_greenhouse_0.png create mode 100644 kubejs/assets/betterend/textures/block/bolux_mushroom_greenhouse_1.png create mode 100644 kubejs/assets/betterend/textures/block/bolux_mushroom_greenhouse_2.png create mode 100644 kubejs/assets/betterend/textures/block/bolux_mushroom_greenhouse_3.png create mode 100644 kubejs/assets/betterend/textures/block/cave_pumpkin_greenhouse_0.png create mode 100644 kubejs/assets/betterend/textures/block/cave_pumpkin_greenhouse_1.png create mode 100644 kubejs/assets/betterend/textures/block/cave_pumpkin_greenhouse_2.png create mode 100644 kubejs/assets/betterend/textures/block/cave_pumpkin_greenhouse_3.png create mode 100644 kubejs/assets/betterend/textures/block/shadow_berry_greenhouse_0.png create mode 100644 kubejs/assets/betterend/textures/block/shadow_berry_greenhouse_1.png create mode 100644 kubejs/assets/betterend/textures/block/shadow_berry_greenhouse_2.png create mode 100644 kubejs/assets/betterend/textures/block/shadow_berry_greenhouse_3.png diff --git a/kubejs/assets/betterend/models/item/amber_root_wild.json b/kubejs/assets/betterend/models/item/amber_root_wild.json index d23882932..80abace34 100644 --- a/kubejs/assets/betterend/models/item/amber_root_wild.json +++ b/kubejs/assets/betterend/models/item/amber_root_wild.json @@ -1,3 +1,7 @@ { - "parent": "betterend:block/amber_root_wild_mature" -} + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/amber_root_3", + "layer1": "betterend:block/wild_crop" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/blossom_berry_wild.json b/kubejs/assets/betterend/models/item/blossom_berry_wild.json index 85cbcb7b9..2e4b9e1ee 100644 --- a/kubejs/assets/betterend/models/item/blossom_berry_wild.json +++ b/kubejs/assets/betterend/models/item/blossom_berry_wild.json @@ -1,3 +1,7 @@ { - "parent": "betterend:block/blossom_berry_wild_mature" -} + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/blossom_berry_seed_3", + "layer1": "betterend:block/wild_crop" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json b/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json index 19e445b33..c6023eafc 100644 --- a/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json +++ b/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json @@ -1,3 +1,7 @@ { - "parent": "betterend:block/bolux_mushroom_wild_mature" -} + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/bolux_mushroom_greenhouse_3", + "layer1": "betterend:block/wild_crop" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/cave_pumpkin_wild.json b/kubejs/assets/betterend/models/item/cave_pumpkin_wild.json index f252404ac..f28a9349b 100644 --- a/kubejs/assets/betterend/models/item/cave_pumpkin_wild.json +++ b/kubejs/assets/betterend/models/item/cave_pumpkin_wild.json @@ -1,3 +1,7 @@ { - "parent": "betterend:block/cave_pumpkin_wild" -} + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/cave_pumpkin_stem_3", + "layer1": "betterend:block/wild_crop" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json b/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json index 6e95364a6..f6d53a097 100644 --- a/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json +++ b/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json @@ -1,3 +1,7 @@ { - "parent": "betterend:block/chorus_mushroom_wild_mature" -} + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/chorus_mushroom_3", + "layer1": "betterend:block/wild_crop" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/shadow_berry_wild.json b/kubejs/assets/betterend/models/item/shadow_berry_wild.json index 0ebb8c7c2..8ce40e68e 100644 --- a/kubejs/assets/betterend/models/item/shadow_berry_wild.json +++ b/kubejs/assets/betterend/models/item/shadow_berry_wild.json @@ -1,3 +1,7 @@ { - "parent": "betterend:block/shadow_berry_wild_mature" -} + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/shadow_berry_greenhouse_3", + "layer1": "betterend:block/wild_crop" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/textures/block/blossom_berry_seed_3.png b/kubejs/assets/betterend/textures/block/blossom_berry_seed_3.png new file mode 100644 index 0000000000000000000000000000000000000000..6c5b329b5210185d74d1900b90e50ab380605dc8 GIT binary patch literal 450 zcmV;z0X_bSP)5lCetyVHn1LCq{$B33uHUkt9t~LxZ40b5MwzOVAeh zFE}|g^)Cd?E^Q)0PK^rE)DR(@e2RJJ30B;E4f=hU$XUA@ zRzWT@wpf(PiwiX^Tg8*-qOc}En#F491cFkdtYXQLTcXWI_LW|L%HHsdbRwmmTM4X! z{67XK4GcqPGWn#}pK|+9SG;(XfOM(o`4GS`bb9^iub$Wn-oLO`pmLKB5B8HP!ZIRv suuNXg|ECF}$dLlleH|hvSmzG#13^l|AbkXHr2qf`07*qoM6N<$f-bwh^8f$< literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/bolux_mushroom_greenhouse_0.png b/kubejs/assets/betterend/textures/block/bolux_mushroom_greenhouse_0.png new file mode 100644 index 0000000000000000000000000000000000000000..63415ca538646027751a33c68512be8979307a41 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP_WL^ z#WBR9H#tFqm6>0n&@+Z_!>|4`*Y6hatd3G!wL77|_g_655XkA7iG0+*UuS3l1UqDQ zb}VX765p_Z`%S+6u>&A*^k}Qnzqhx|ISx;gcAfJpk%3u%-TS}iK~ic8M?jQu6{1-oD!M(_nV%o`D73?SUXnNi Z!wG*qu7>-k)qu`r@O1TaS?83{1OPyfR7d~- literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/bolux_mushroom_greenhouse_2.png b/kubejs/assets/betterend/textures/block/bolux_mushroom_greenhouse_2.png new file mode 100644 index 0000000000000000000000000000000000000000..50958dda425fcf92cff6ae3bcd7fd5315c2d3b1d GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkQ1HE{ zi(`mI@7sw7{SG+@wAu3bVAHCEvFpbr9EY9OTpLuK55_P=ckoFjAvgRrdRWW-}PE1^MuM+hQ7m{J^F&r z%loBmtvK_lSsUK&yb+%JcuR@Q#J2SeG2iEBGnAJ8(4A()7M#1uHr(vrlT(}5Eq*2a zZrZ&E-cJ}z)*gGm@fSu&OZTOw87hpZm1G z=B+TFcEFHV=5mK>2hWD{>hTxuGa5ZH*YL?tWe-`aEO*Wh=vf9&S3j3^P6kox1#Q}e@n)#W9oq_9ZX)%`jvaC!SY!B|~kGv-gv-z3$1 zdLzvY1kL-}G!7s4-!FNu?pK$uCUaZo3%$Tef(bjmKVf$MHzzjYYEmhq&t?O8b7p;h zZNIY>yaLZ2r%jmnD5;^cHHG=d&xnU#8t1+EuOj{6_J*#HCpYKw?6FzHGk^b|W3RdP lBzOiY_}z9tsL{a4P`cb`{oI9bqJYk2@O1TaS?83{1OQfZULpVh literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/cave_pumpkin_greenhouse_1.png b/kubejs/assets/betterend/textures/block/cave_pumpkin_greenhouse_1.png new file mode 100644 index 0000000000000000000000000000000000000000..680f1f5c642921bb2ef63b0af387df8bf89fa5e3 GIT binary patch literal 396 zcmV;70dxL|P)MoV`KFbR)&-e2_&-+NYXw=F= zQ-h4gHl=z~GO9(9(!$(#`y8HMOYVBveX)0PB>@bEHULp2#N)*)xwgV-q99fZP7?*e z*_4;z`&_8|!z8wK^4X+EBD=%7KTJFmA=g$gszm`X+L7tBECOnbd^Wkb11B6%W3azQ zN(*CDi()Xev1WZfdd~ou>5BMO;DkFZi*9cMKu+HRU|NtdZy$KNdn2BS%rifJ)l64} zHS2TGxsd=?ZNMY=j!`X&s1ia`gXE7c7uI>U;NXOvQT{C0RDAQ(Jl^%}f2E*QZ%WFrgil|9Cqz?4D&~uof20WXY`{(za zbAR_-0}y_EW1~1>Ywyqi?C);aN-)c4oU-2dW@IdTnvJ^kT!-3+ucp9V%=wP|D(GsM z>NtuM&WC>h@LY!|P5>wXL~(-WIy4(~D-{4L0C;u0NVV+~E^pe=IMp>H8>B4BwBVPt z5`b`d(>{H@!XzFLcKU3ewv1LF<^JmaX8e6bwe9D!1JsTV%<0cA#h^^>0s`+R!4X0wp)^(B*dKrtxOU4LhD06@jXpbYP4cwU)T$o}qz{kvKq z?DUz$1I~IE06fZ`QN)vYKvYVo1hXvoCG`iOmz)!J`kGV$ni+0QYPL+XQP=xFi7wgs z@#Te21%HdaoGZ1`kZwrwJ6vZvX%Q07*qo IM6N<$f-w{64gdfE literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/cave_pumpkin_greenhouse_3.png b/kubejs/assets/betterend/textures/block/cave_pumpkin_greenhouse_3.png new file mode 100644 index 0000000000000000000000000000000000000000..b5f0abb1590551c42fc30ca7f4c3849b500c5723 GIT binary patch literal 547 zcmV+;0^I$HP)5k}+%BU=W5MnJ5Xatk|>=BRsenYA?l0=i-3rmcbCR zG-HQu0sjI+))FXm$dJ)fC}hYMTrm0v+2j^N2S?a0#-Lcn1popEc=O{0HQS{3>QMDQy;ngPGx6tSgcyV|IYXz@YO0Ap zC*2WX*q>6~uTrcOaK4PV8+e>t+-Mt;F!N*X1|D182Wp#nZr}QxT-+q1)W3h#dK{|q zew8{fw5I@%3PiRnQ?jzm{Fqzk7sqE;+WjI*a-7Ip0Yuu;9X)mda)yqaOBQ-Mwl#@={MlVyL8M6_ zy}JD|B`^M@(+ z)BCyq|NHBtWp?d&u!7GGM~!Eqa;`H(-ah?PHvcF?b@s-ng2f*+w7Vi%JthAta9P|I zo^vc?p@&HDst<{Om<*KP-4mR1F#8~z$7UNYm5mpr6F1MOc%^+?^#L2-*8egYujcG~ mpIN5u((>18`RiR8ADHI0x)_uw*}Vihm%-E3&t;ucLK6UjQd^$@ literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/shadow_berry_greenhouse_1.png b/kubejs/assets/betterend/textures/block/shadow_berry_greenhouse_1.png new file mode 100644 index 0000000000000000000000000000000000000000..c8c35d534eb78e31bec78bfb3e2efc95d375bf59 GIT binary patch literal 323 zcmV-J0lfZ+P)n5+p!%p(+uqe^o*bMJvs-@IR~=C!))`GntF#APH6TDF}lRrivD0iiW#3D z@Be;!hk!Rbto|WIO|8E1&6GA6iu{(~W2Zp}Nd6as!qWD9e&I7^IYJUgzWlR?C~?6Be^RQcASeEFSMrN&zsxA0nmf0Dru9 Ve|CEQ1y%q6002ovPDHLkV1fySg_!^V literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/block/shadow_berry_greenhouse_2.png b/kubejs/assets/betterend/textures/block/shadow_berry_greenhouse_2.png new file mode 100644 index 0000000000000000000000000000000000000000..632fe668a19c8db35ddf53fad514259eb6120085 GIT binary patch literal 464 zcmV;>0WbcEP)*kxOpWKomufyW155ZPXGB5SerYVnPH`20}?dudXA2?f(EE9&G`ztwcO70Wi8F zFSf*x0r2hXmkeMvI^9=1E~7gDoNn>1SrBXhoJz&I`9%y#(955x$nF@tO6J>RVhFe( zmj==OMJo$l;(7rFp`p*4G;BCS- zT}|<1NAwD#l2EKNg6aPC=PAU9Q@;-kOpobqh)$uTVv`G^H{_yVP!g->#))i(UPOp4 zVQz9UJvyraI4aU8oo=!HGQtWV`Xuy5a(VUwt2=^g39jYC=`&RGgTc+C>~6mQPvFh$ z{Q1+X#V=PM-=OrDbjV^A5G5RpG^CO0YKBtogVjPSt6xmyTlf6#EFcd~l(l#_LkvhY|#Dc`o0fYom#e4B!Y%nn} zvGD?xs6#{l#{mHb%&fa&%COs0za zAps!epJ!}aDR=c}$Xo-^R2u+nzX0IiS^!4rDFDt6kqErq>E=|kZ8887*8nh>k>Z00 zT=ykEJ&Hu&dev<9TL7kW)oj`@g)|8yn!+fX0dVk5ECQoU-l|5sS9iTLQVJw}R|kT* z?06E1z`G6rXQXt0eF?zh^BVxSOU?c1$n%1JJf@9D-lsA%9H)9u#c=0000< KMNUMnLSTYJ_mXS? literal 0 HcmV?d00001 diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index 0a89ca871..0946de948 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -425,7 +425,7 @@ const registerTFGFLPlanters = (event) => { 'betterend:block/blossom_berry_seed_0', 'betterend:block/blossom_berry_seed_1', 'betterend:block/blossom_berry_seed_2', - 'betterend:block/blossom_berry_seed_3' // TODO + 'betterend:block/blossom_berry_seed_3' ], null ) @@ -440,7 +440,6 @@ const registerTFGFLPlanters = (event) => { 'betterend:bolux_mushroom_product', 'phosphorous', [ - // TODO: all 'betterend:block/bolux_mushroom_greenhouse_0', 'betterend:block/bolux_mushroom_greenhouse_1', 'betterend:block/bolux_mushroom_greenhouse_2', @@ -477,13 +476,13 @@ const registerTFGFLPlanters = (event) => { 'betterend:cave_pumpkin', 'phosphorous', [ - // TODO: all 'betterend:block/cave_pumpkin_greenhouse_0', 'betterend:block/cave_pumpkin_greenhouse_1', 'betterend:block/cave_pumpkin_greenhouse_2', 'betterend:block/cave_pumpkin_greenhouse_3' ], - 'betterend:block/cave_pumpkin_greenhouse_fruit' + //'betterend:block/cave_pumpkin_greenhouse_fruit' + 'betterend:block/cave_pumpkin_top' // TODO: check ) event.firmalifePlantable( @@ -496,7 +495,6 @@ const registerTFGFLPlanters = (event) => { 'betterend:shadow_berry_product', 'potassium', [ - // TODO: all 'betterend:block/shadow_berry_greenhouse_0', 'betterend:block/shadow_berry_greenhouse_1', 'betterend:block/shadow_berry_greenhouse_2', From a9d3141ecbda02dbeb1355c40ccb919bc43cc065 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 11 Aug 2025 20:58:15 +0100 Subject: [PATCH 009/158] changed recipes for sprinkler and tree tap to extruder, added curving press ones too --- kubejs/server_scripts/afc/recipes.js | 4 ++-- kubejs/server_scripts/firmalife/recipes.js | 4 ++-- .../vintage_improvements/recipes.js | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/kubejs/server_scripts/afc/recipes.js b/kubejs/server_scripts/afc/recipes.js index 11d12beb8..7e3acf87a 100644 --- a/kubejs/server_scripts/afc/recipes.js +++ b/kubejs/server_scripts/afc/recipes.js @@ -90,9 +90,9 @@ const registerAFCRecipes = (event) => { .bonus(false) .id('afc:anvil/tree_tap') - event.recipes.gtceu.assembler('afc:tree_tap') + event.recipes.gtceu.extruder('afc:tree_tap') .itemInputs('#forge:ingots/copper') - .circuit(3) + .notConsumable('gtceu:bottle_extruder_mold') .itemOutputs('afc:tree_tap') .duration(50) .EUt(7) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 8e29ab7da..9f873817b 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -192,10 +192,10 @@ const registerFirmaLifeRecipes = (event) => { //#region Медная / Copper - event.recipes.gtceu.bender('tfg:firmalife/sprinkler_electric_only') + event.recipes.gtceu.extruder('tfg:firmalife/sprinkler_electric_only') .itemInputs('#forge:plates/copper') + .notConsumable('tfg:small_casing_extruder_mold') .itemOutputs('firmalife:sprinkler') - .circuit(4) .duration(60) .EUt(8) diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 871f1d60a..a2308bf06 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -701,6 +701,22 @@ function registerVintageImprovementsRecipes(event) { processingTime: 50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER }).id(`tfg:vi/curving/fire_brick`) + event.custom({ + type: 'vintageimprovements:curving', + ingredients: [{ tag: 'forge:ingots/copper' }], + itemAsHead: 'gtceu:bottle_extruder_mold', + results: [{ item: 'afc:tree_tap' }], + processingTime: 50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER + }).id(`tfg:vi/curving/tree_tap`) + + event.custom({ + type: 'vintageimprovements:curving', + ingredients: [{ tag: 'forge:plates/copper' }], + itemAsHead: 'tfg:small_casing_extruder_mold', + results: [{ item: 'firmalife:sprinkler' }], + processingTime: 50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER + }).id(`tfg:vi/curving/sprinkler`) + // #endregion } From 6ce1abdcb96e509ccbbbb5cc84bbc67d77de0ddc Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 11 Aug 2025 21:02:59 +0100 Subject: [PATCH 010/158] oh, those don't render right --- kubejs/assets/betterend/models/item/amber_root_wild.json | 3 +-- kubejs/assets/betterend/models/item/blossom_berry_wild.json | 3 +-- kubejs/assets/betterend/models/item/bolux_mushroom_wild.json | 3 +-- kubejs/assets/betterend/models/item/cave_pumpkin_wild.json | 3 +-- kubejs/assets/betterend/models/item/chorus_mushroom_wild.json | 3 +-- kubejs/assets/betterend/models/item/shadow_berry_wild.json | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/kubejs/assets/betterend/models/item/amber_root_wild.json b/kubejs/assets/betterend/models/item/amber_root_wild.json index 80abace34..3de793d23 100644 --- a/kubejs/assets/betterend/models/item/amber_root_wild.json +++ b/kubejs/assets/betterend/models/item/amber_root_wild.json @@ -1,7 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "betterend:block/amber_root_3", - "layer1": "betterend:block/wild_crop" + "layer0": "betterend:block/amber_root_3" } } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/blossom_berry_wild.json b/kubejs/assets/betterend/models/item/blossom_berry_wild.json index 2e4b9e1ee..b95007e6e 100644 --- a/kubejs/assets/betterend/models/item/blossom_berry_wild.json +++ b/kubejs/assets/betterend/models/item/blossom_berry_wild.json @@ -1,7 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "betterend:block/blossom_berry_seed_3", - "layer1": "betterend:block/wild_crop" + "layer0": "betterend:block/blossom_berry_seed_3" } } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json b/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json index c6023eafc..9a12586e8 100644 --- a/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json +++ b/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json @@ -1,7 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "betterend:block/bolux_mushroom_greenhouse_3", - "layer1": "betterend:block/wild_crop" + "layer0": "betterend:block/bolux_mushroom_greenhouse_3" } } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/cave_pumpkin_wild.json b/kubejs/assets/betterend/models/item/cave_pumpkin_wild.json index f28a9349b..c0988d12b 100644 --- a/kubejs/assets/betterend/models/item/cave_pumpkin_wild.json +++ b/kubejs/assets/betterend/models/item/cave_pumpkin_wild.json @@ -1,7 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "betterend:block/cave_pumpkin_stem_3", - "layer1": "betterend:block/wild_crop" + "layer0": "betterend:block/cave_pumpkin_stem_3" } } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json b/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json index f6d53a097..ed4ab05b3 100644 --- a/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json +++ b/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json @@ -1,7 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "betterend:block/chorus_mushroom_3", - "layer1": "betterend:block/wild_crop" + "layer0": "betterend:block/chorus_mushroom_3" } } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/shadow_berry_wild.json b/kubejs/assets/betterend/models/item/shadow_berry_wild.json index 8ce40e68e..53886c083 100644 --- a/kubejs/assets/betterend/models/item/shadow_berry_wild.json +++ b/kubejs/assets/betterend/models/item/shadow_berry_wild.json @@ -1,7 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "betterend:block/shadow_berry_greenhouse_3", - "layer1": "betterend:block/wild_crop" + "layer0": "betterend:block/shadow_berry_greenhouse_3" } } \ No newline at end of file From 6253092e5d03464dc8c5da4054b94e1405b6742f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 11 Aug 2025 21:03:26 +0100 Subject: [PATCH 011/158] since everyone hates the copper sheet texture so much --- .../assets/create/textures/item/copper_sheet.png | Bin 0 -> 324 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 kubejs/assets/create/textures/item/copper_sheet.png diff --git a/kubejs/assets/create/textures/item/copper_sheet.png b/kubejs/assets/create/textures/item/copper_sheet.png new file mode 100644 index 0000000000000000000000000000000000000000..a11d08a7f74a812bd4b34b1f8a701eb1bdea7469 GIT binary patch literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9EFZXnDkGR4^uDEQ6O z#WBR9H#tE4D;@AcbPzpKwF>iJ=E@P^HtH#}a8ns|=q+ooh#)Ns4{BL>~Uu| zshRQU%)f8A;==|LnTjvlCbl*9rU(AZVLDf8XLZ$7TE8)Z11T?oj06;VJ0l7Sm1q@$0dA*Rhx4^2SLlN@pg_*rnGd zf8F0$Ct^zr<1;6ThRh?9+y>73YW{Ox?^xHVaN^4Jzw=k>cbh)sab{qc9G3ro<3h1- Qzz|^YboFyt=akR{0O3k{4*&oF literal 0 HcmV?d00001 From b7abbd0f49030dae23039f49225476f716425112 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 11 Aug 2025 21:07:26 +0100 Subject: [PATCH 012/158] cave pumpkin pie + chunks --- .../models/item/cave_pumpkin_chunks.json | 2 +- .../betterend/models/item/cave_pumpkin_pie.json | 2 +- .../textures/item/cave_pumpkin_chunks.png | Bin 0 -> 350 bytes 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 kubejs/assets/betterend/textures/item/cave_pumpkin_chunks.png diff --git a/kubejs/assets/betterend/models/item/cave_pumpkin_chunks.json b/kubejs/assets/betterend/models/item/cave_pumpkin_chunks.json index 64136f5db..bfa019840 100644 --- a/kubejs/assets/betterend/models/item/cave_pumpkin_chunks.json +++ b/kubejs/assets/betterend/models/item/cave_pumpkin_chunks.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/cave_pumpkin_chunks" + "parent": "betterend:item/cave_pumpkin_chunks" } diff --git a/kubejs/assets/betterend/models/item/cave_pumpkin_pie.json b/kubejs/assets/betterend/models/item/cave_pumpkin_pie.json index 16fc029ee..85d9c0613 100644 --- a/kubejs/assets/betterend/models/item/cave_pumpkin_pie.json +++ b/kubejs/assets/betterend/models/item/cave_pumpkin_pie.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/cave_pumpkin_pie" + "parent": "betterend:item/cave_pumpkin_pie" } diff --git a/kubejs/assets/betterend/textures/item/cave_pumpkin_chunks.png b/kubejs/assets/betterend/textures/item/cave_pumpkin_chunks.png new file mode 100644 index 0000000000000000000000000000000000000000..868317a05616895555b5914f92419de01b8f2af9 GIT binary patch literal 350 zcmV-k0iphhP)wB;=gIO#KW5qNCyWO_1 zWS-0Gf|@L15J85*!UnS(%zo&=g?R@qT)2htj&pa1!9~CH_}=$@yzl-0aKPTsb_rVb zvZv0~W-p{a{!7gI4G$oh&G6D4A`Be>Yq8n=f?2=e Date: Mon, 11 Aug 2025 21:20:30 +0100 Subject: [PATCH 013/158] remove first person model, who even uses this?? --- pakku-lock.json | 69 ------------------------------------------------- pakku.json | 3 --- 2 files changed, 72 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index 5dcea02a4..39fd6607a 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -6346,75 +6346,6 @@ } ] }, - { - "pakku_id": "c6bD4qYaWC0uDzgX", - "pakku_links": [ - "rZMUz1QjgqD53x3s" - ], - "type": "MOD", - "side": "CLIENT", - "slug": { - "curseforge": "first-person-model", - "modrinth": "first-person-model" - }, - "name": { - "curseforge": "First-person Model (Forge/Fabric)", - "modrinth": "First-person Model" - }, - "id": { - "curseforge": "333287", - "modrinth": "H5XMjpHi" - }, - "redistributable": false, - "files": [ - { - "type": "curseforge", - "file_name": "firstperson-forge-2.5.0-mc1.20.1.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6733/387/firstperson-forge-2.5.0-mc1.20.1.jar", - "id": "6733387", - "parent_id": "333287", - "hashes": { - "sha1": "58280ce1c376420ee138d99c5a7c8c5f5de315c3", - "md5": "bd5b3e7464a42660131d5934f7c24aac" - }, - "required_dependencies": [ - "433760" - ], - "size": 519546, - "date_published": "2025-07-05T14:28:10.673Z" - }, - { - "type": "modrinth", - "file_name": "firstperson-forge-2.5.0-mc1.20.1.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/H5XMjpHi/versions/ub6wk879/firstperson-forge-2.5.0-mc1.20.1.jar", - "id": "ub6wk879", - "parent_id": "H5XMjpHi", - "hashes": { - "sha512": "57f421f4d9ec969218372029798bc0e83aa661fce95744f5608dd03718e5a88a217fc36b7a71a7ab79b21a531a28a1c549e364241d103857afd932eaa0ce1002", - "sha1": "58280ce1c376420ee138d99c5a7c8c5f5de315c3" - }, - "required_dependencies": [ - "MPCX6s5C" - ], - "size": 519546, - "date_published": "2025-07-05T14:28:11.556615Z" - } - ] - }, { "pakku_id": "BHSq7VGlM9Gejcqi", "type": "MOD", diff --git a/pakku.json b/pakku.json index cee9fd870..249b29c7f 100644 --- a/pakku.json +++ b/pakku.json @@ -155,9 +155,6 @@ "embeddium": { "side": "CLIENT" }, - "first-person-model": { - "side": "CLIENT" - }, "flickerfix": { "side": "CLIENT" }, From de8fe6ce7855dc5364a767c053916f1be9fc91ea Mon Sep 17 00:00:00 2001 From: TomPlop Date: Mon, 11 Aug 2025 16:44:22 -0400 Subject: [PATCH 014/158] Rebalance LSA (#1591) * Balance LSA * Add changelog * Add Parallel Hatch ability * Trying to fix changelog * Try again --- kubejs/server_scripts/gregtech/recipes.js | 4 ++-- kubejs/server_scripts/gregtech/recipes.machines.js | 8 ++++---- kubejs/startup_scripts/gtceu/machines.js | 3 ++- kubejs/startup_scripts/tfg/materials.js | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 088597a16..d3503f3ac 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1287,9 +1287,9 @@ const registerGTCEURecipes = (event) => { .EUt(GTValues.VH[GTValues.EV]) event.recipes.gtceu.large_chemical_reactor('tfg:solar_coolant_t2') - .inputFluids(Fluid.of('tfg:solar_coolant', 1000), Fluid.of('gtceu:argon', 1000)) + .inputFluids(Fluid.of('tfg:solar_coolant', 8000), Fluid.of('gtceu:argon', 1000)) .itemInputs(Item.of('#forge:aerogels')) - .outputFluids(Fluid.of('tfg:solar_coolant_tier2', 1000)) + .outputFluids(Fluid.of('tfg:solar_coolant_tier2', 8000)) .duration(20*15) .EUt(GTValues.VH[GTValues.IV]) diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 183feaa64..4103eed3f 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -1119,8 +1119,8 @@ function registerGTCEuMachineRecipes(event) { .notConsumable('ad_astra:photovoltaic_etrium_cell') .perTick(true) .chancedFluidInput('tfg:solar_coolant 10', 5000, 0) - .inputFluids('tfg:cryogenized_fluix 40') - .outputFluids('tfg:fluix 10') + .inputFluids('tfg:cryogenized_fluix 4') + .outputFluids('tfg:fluix 1') .perTick(false) .duration(20 * 20) .daytime(false) @@ -1142,8 +1142,8 @@ function registerGTCEuMachineRecipes(event) { .notConsumable('ad_astra:photovoltaic_vesnium_cell') .perTick(true) .chancedFluidInput('tfg:solar_coolant_tier2 10', 5000, 0) - .inputFluids('tfg:cryogenized_fluix 40') - .outputFluids('tfg:fluix 10') + .inputFluids('tfg:cryogenized_fluix 4') + .outputFluids('tfg:fluix 1') .perTick(false) .duration(20 * 20) .daytime(false) diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 4eed86f06..843994131 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -340,7 +340,7 @@ const registerGTCEuMachines = (event) => { .rotationState(RotationState.NON_Y_AXIS) .generator(true) .recipeType('large_solar_panel_tier3') - .noRecipeModifier() + .recipeModifiers(GTRecipeModifiers.PARALLEL_HATCH) .appearanceBlock(() => Block.getBlock('tfg:casings/machine_casing_iron_desh')) .pattern(definition => FactoryBlockPattern.start() .aisle(" A A ", " A A ", " A A ", " S S ", " S S ", " S S ", " CCCCCCCCC ", " ", " ", " ", " ", " ", " ", " ") @@ -414,6 +414,7 @@ const registerGTCEuMachines = (event) => { .where("I", Predicates.blocks("tfg:casings/machine_casing_iron_desh") .or(Predicates.autoAbilities(definition.getRecipeTypes())) .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1)) + .or(Predicates.abilities(PartAbility.PARALLEL_HATCH).setMaxGlobalLimited(1)) ) .where(" ", Predicates.any()) .build() diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index 8ecba7247..c4c2c0256 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -173,7 +173,7 @@ const registerTFGMaterials = (event) => { event.create('tfg:solar_coolant_tier2') .gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(73)) - .formula('(He³8O11H11)(Ar)(?)') + .formula('(He³8O11H11)8(Ar)(?)') .color(0xfeff5d) //end region From e81c4b7d95b3b882cbeb48b67e84ae253eb11e4d Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 11 Aug 2025 21:45:14 +0100 Subject: [PATCH 015/158] update changelog for #1591 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c5e0facb..bf1863002 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## [Unreleased] ### Changes - Complete rework of prospector's picks. (#1594) @Redeix +- Rebalance Large Solar Array to make Mk2 circuit 2 viable, and buffed to LSA Mk3 circuit 2 (#1591) @TomPlop ### Bug fixes ## [0.10.9] - 10-08-2025 From 8a4d458c401ecd7c860aa5111d9a7e34fa5b0df7 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 11 Aug 2025 22:41:20 +0100 Subject: [PATCH 016/158] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf1863002..28472f4d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Complete rework of prospector's picks. (#1594) @Redeix - Rebalance Large Solar Array to make Mk2 circuit 2 viable, and buffed to LSA Mk3 circuit 2 (#1591) @TomPlop ### Bug fixes +- Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett ## [0.10.9] - 10-08-2025 ### Changes From 2bdb46c397426c9bc6e927f85286e3ff0a36c964 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 11 Aug 2025 22:59:10 +0100 Subject: [PATCH 017/158] mars pumpkin pie + other tag stuff --- .../models/item/cave_pumpkin_chunks.json | 5 +- .../models/item/cave_pumpkin_pie.json | 5 +- .../models/item/cave_pumpkin_pie_dough.json | 6 +++ .../models/item/cave_pumpkin_pie_raw.json | 6 +++ .../textures/item/cave_pumpkin_pie.png | Bin 220 -> 419 bytes .../textures/item/cave_pumpkin_pie_dough.png | Bin 0 -> 385 bytes .../textures/item/cave_pumpkin_pie_raw.png | Bin 0 -> 370 bytes kubejs/server_scripts/beneath/tags.js | 2 + kubejs/server_scripts/betterend/tags.js | 14 ++++-- kubejs/server_scripts/firmalife/recipes.js | 7 +++ kubejs/server_scripts/tfc/tags.js | 2 + kubejs/server_scripts/tfg/data.js | 18 +++++-- kubejs/server_scripts/tfg/recipes.food.js | 44 +++++++++++++++++- kubejs/startup_scripts/betterend/items.js | 3 ++ kubejs/startup_scripts/tfc/constants.js | 13 ++---- kubejs/startup_scripts/tfg/blocks.crops.js | 5 ++ 16 files changed, 111 insertions(+), 19 deletions(-) create mode 100644 kubejs/assets/betterend/models/item/cave_pumpkin_pie_dough.json create mode 100644 kubejs/assets/betterend/models/item/cave_pumpkin_pie_raw.json create mode 100644 kubejs/assets/betterend/textures/item/cave_pumpkin_pie_dough.png create mode 100644 kubejs/assets/betterend/textures/item/cave_pumpkin_pie_raw.png diff --git a/kubejs/assets/betterend/models/item/cave_pumpkin_chunks.json b/kubejs/assets/betterend/models/item/cave_pumpkin_chunks.json index bfa019840..61f1ceec6 100644 --- a/kubejs/assets/betterend/models/item/cave_pumpkin_chunks.json +++ b/kubejs/assets/betterend/models/item/cave_pumpkin_chunks.json @@ -1,3 +1,6 @@ { - "parent": "betterend:item/cave_pumpkin_chunks" + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/cave_pumpkin_chunks" + } } diff --git a/kubejs/assets/betterend/models/item/cave_pumpkin_pie.json b/kubejs/assets/betterend/models/item/cave_pumpkin_pie.json index 85d9c0613..60392ed2a 100644 --- a/kubejs/assets/betterend/models/item/cave_pumpkin_pie.json +++ b/kubejs/assets/betterend/models/item/cave_pumpkin_pie.json @@ -1,3 +1,6 @@ { - "parent": "betterend:item/cave_pumpkin_pie" + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/cave_pumpkin_pie" + } } diff --git a/kubejs/assets/betterend/models/item/cave_pumpkin_pie_dough.json b/kubejs/assets/betterend/models/item/cave_pumpkin_pie_dough.json new file mode 100644 index 000000000..9b26d1ba2 --- /dev/null +++ b/kubejs/assets/betterend/models/item/cave_pumpkin_pie_dough.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/cave_pumpkin_pie_dough" + } +} diff --git a/kubejs/assets/betterend/models/item/cave_pumpkin_pie_raw.json b/kubejs/assets/betterend/models/item/cave_pumpkin_pie_raw.json new file mode 100644 index 000000000..fd408aadf --- /dev/null +++ b/kubejs/assets/betterend/models/item/cave_pumpkin_pie_raw.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/cave_pumpkin_pie_raw" + } +} diff --git a/kubejs/assets/betterend/textures/item/cave_pumpkin_pie.png b/kubejs/assets/betterend/textures/item/cave_pumpkin_pie.png index 419b2de106541e3ba496f48952e5a5e9baa3d51d..150e6d368d98845ff39047357a6d289d63a6ca11 100644 GIT binary patch delta 404 zcmV;F0c-x;0iy$u8Gi-<001BJ|6u?C010qNS#tmY3ljhU3ljkVnw%H_00C7=L_t(I zjn$DsO9F8a#eaqfn}J}vB;}=(f>#NIKq8RnkkFy}0u@A;K7fSOM-YmFZb=3~8xbLf z1c_i>_uwgFO$;p*+Jp{nC%66Q9y-<>-@Nx`<_-M&ayfw)+kZ=@6TXl>9pJm2gz>Fi z3+oz?A6ja+u|)Y>Khotj3s*%Bs6ii|H90ibe_u}oZcv0W%BG9JGSz~@^_z5btw&f`8+~Rzt5FZ0u)vyvqqW1VXbyuxDZUY)t!u2ORE%-~u)Q%lGGuyV34xrPk28}I;sdkX)1cgbjuO0000U_P~dS6 zOmgDb_rFoQJuLNA0Kdn7PRDHf>06c0@*HsHtZ;E@VOCxFrk|9sSKorM+oho1^j$|d6xf4|jhNP-ZaEPiQ_!M)P zS%M*ahzeXi$xur$1O>_YE!z@K)NHFOg50Ioj$uf6<}P>d{r>;=^5DP2`z;|GrIoo~ z-{-CTy?|_#R$)8XyTJfG-4rOxUhh6tfRXttphUFkcArhn$u7>p03Z6yH=E^FYh1E zC80+={_%TKZtTxij!_1>EylQw(cr+rqy46u%Gpb#7#Mb5Dd$f9dt)Im5E(pO{an^L HB{Ts5HJ^?h literal 0 HcmV?d00001 diff --git a/kubejs/server_scripts/beneath/tags.js b/kubejs/server_scripts/beneath/tags.js index 006a33c3f..71c0b81c5 100644 --- a/kubejs/server_scripts/beneath/tags.js +++ b/kubejs/server_scripts/beneath/tags.js @@ -33,6 +33,8 @@ const registerBeneathItemTags = (event) => { event.add("forge:raw_materials/sylvite", "tfc:ores/sylvite") event.add('forge:ores', 'beneath:ore/nether_cursecoal') event.add('forge:ores', 'beneath:ore/blackstone_sylvite') + + event.add('forge:mushrooms', '#beneath:mushrooms') event.remove('beneath:sparks_on_sulfur') } \ No newline at end of file diff --git a/kubejs/server_scripts/betterend/tags.js b/kubejs/server_scripts/betterend/tags.js index fbd659bd6..a8810133a 100644 --- a/kubejs/server_scripts/betterend/tags.js +++ b/kubejs/server_scripts/betterend/tags.js @@ -13,7 +13,7 @@ function registerBetterEndItemTags(event) { event.add('tfc:foods/grains', 'betterend:amber_root_product') event.add('tfc:foods', 'betterend:blossom_berry_product') - event.add('tfc:foods/fruit', 'betterend:blossom_berry_product') + event.add('tfc:foods/fruits', 'betterend:blossom_berry_product') event.add('tfc:foods', 'betterend:bolux_mushroom_product') event.add('tfc:foods/vegetables', 'betterend:bolux_mushroom_product') @@ -24,8 +24,11 @@ function registerBetterEndItemTags(event) { event.add('tfc:foods', 'betterend:cave_pumpkin') event.add('tfc:foods', 'betterend:cave_pumpkin_chunks') - event.add('tfc:foods/fruit', 'betterend:cave_pumpkin_chunks') + event.add('tfc:foods/fruits', 'betterend:cave_pumpkin_chunks') + event.add('tfc:foods', 'betterend:cave_pumpkin_pie_dough') + event.add('tfc:foods', 'betterend:cave_pumpkin_pie_raw') event.add('tfc:foods', 'betterend:cave_pumpkin_pie') + event.add('firmalife:foods/washable', 'betterend:cave_pumpkin_pie') event.add('tfc:foods', 'betterend:chorus_mushroom_product') event.add('tfc:foods/vegetables', 'betterend:chorus_mushroom_product') @@ -35,7 +38,10 @@ function registerBetterEndItemTags(event) { event.add('forge:mushrooms', 'betterend:chorus_mushroom_cooked') event.add('tfc:foods', 'betterend:shadow_berry_product') - event.add('tfc:foods/fruit', 'betterend:shadow_berry_product') + event.add('tfc:foods/fruits', 'betterend:shadow_berry_product') event.add('tfc:foods', 'betterend:shadow_berry_cooked') - event.add('tfc:foods/fruit', 'betterend:shadow_berry_cooked') + event.add('tfc:foods/fruits', 'betterend:shadow_berry_cooked') + + event.add('forge:mushrooms', 'betterend:flammalix') + event.add('forge:mushrooms', 'betterend:small_amaranita_mushroom') } \ No newline at end of file diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 9f873817b..97703d632 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -164,6 +164,13 @@ const registerFirmaLifeRecipes = (event) => { .duration(30) .EUt(GTValues.VA[GTValues.ULV]) + event.recipes.gtceu.alloy_smelter('pie_pan') + .itemInputs('#forge:ingots/wrought_iron') + .notConsumable('gtceu:cylinder_casting_mold') + .itemOutputs('6x firmalife:pie_pan') + .EUt(GTValues.VA[GTValues.ULV]) + .duration(100) + event.replaceInput({ id: 'firmalife:crafting/bottle_label' }, 'firmalife:beeswax', '#forge:wax') //#endregion diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 3a474067a..dacd213d5 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -323,6 +323,8 @@ const registerTFCItemTags = (event) => { event.add('tfc:forge_invisible_whitelist', 'greate:aluminum_mechanical_pump') event.add('tfc:forge_invisible_whitelist', 'greate:stainless_steel_mechanical_pump') event.add('tfc:forge_invisible_whitelist', 'greate:titanium_mechanical_pump') + + event.add('forge:mushrooms', 'tfc:plant/artists_conk') } const registerTFCBlockTags = (event) => { diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index 0946de948..a394700ae 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -207,13 +207,23 @@ const registerTFGFoodData = (event) => { food.fruit(0.75) }) + event.foodItem('betterend:cave_pumpkin_pie_dough', food => { + food.hunger(2) + food.decayModifier(3) + }) + + event.foodItem('betterend:cave_pumpkin_pie_raw', food => { + food.hunger(2) + food.decayModifier(3) + }) + event.foodItem('betterend:cave_pumpkin_pie', food => { food.hunger(4) - food.saturation(3) - food.decayModifier(2.5) + food.saturation(4) + food.decayModifier(2) food.water(5) - food.fruit(2) - food.grain(1.5) + food.fruit(4) + food.grain(2) }) event.foodItem('betterend:chorus_mushroom_product', food => { diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index 6de3fd8c3..084c286ac 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -814,6 +814,7 @@ function registerTFGFoodRecipes(event) { itemOutputs: ["species:birtday_cake"] }) + // These don't need the ISP handling, they're just here to keep all the food recipes together event.recipes.gtceu.mixer('tfg:tfc/olive_oil_water') @@ -880,7 +881,7 @@ function registerTFGFoodRecipes(event) { //#endregion - //#region Heating recipes for new foods + //#region New foods event.recipes.tfc.heating('tfg:food/raw_birt', 200) .resultItem(TFC.isp.of('tfg:food/cooked_birt').copyFood()) @@ -897,6 +898,47 @@ function registerTFGFoodRecipes(event) { event.recipes.tfc.heating('tfg:food/raw_moon_rabbit', 200) .resultItem(TFC.isp.of('tfg:food/cooked_moon_rabbit').copyFood()) + event.recipes.tfc.heating('betterend:bolux_mushroom_product', 200) + .resultItem(TFC.isp.of('betterend:bolux_mushroom_cooked').copyFood()) + + event.recipes.tfc.heating('betterend:chorus_mushroom_product', 200) + .resultItem(TFC.isp.of('betterend:chorus_mushroom_cooked').copyFood()) + + event.recipes.tfc.heating('betterend:shadow_berry_product', 200) + .resultItem(TFC.isp.of('betterend:shadow_berry_cooked').copyFood()) + + event.recipes.tfc.heating('betterend:cave_pumpkin_pie_raw', 200) + .resultItem(TFC.isp.of('betterend:cave_pumpkin_pie').copyFood()) + + event.recipes.tfc.advanced_shapeless_crafting( + TFC.itemStackProvider.of('4x betterend:cave_pumpkin_chunks').copyFood(), + [TFC.ingredient.notRotten('betterend:cave_pumpkin'), '#forge:tools/hammers'], 'betterend:cave_pumpkin') + .id(`tfg:crafting/cave_pumpkin_chunks_hammer`) + + event.recipes.tfc.advanced_shapeless_crafting( + TFC.itemStackProvider.of('4x betterend:cave_pumpkin_chunks').copyFood(), + [TFC.ingredient.notRotten('betterend:cave_pumpkin'), '#tfc:knives'], 'betterend:cave_pumpkin') + .id(`tfg:crafting/cave_pumpkin_chunks_knife`) + + // TODO: replace sniffer egg with a tag for all mars eggs? + processorRecipe("cave_pumpkin_pie_dough", 300, GTValues.VA[GTValues.HV], { + itemInputs: ['minecraft:sniffer_egg', '2x betterend:cave_pumpkin_chunks', 'betterend:amber_root_product', '#tfc:sweetener'], + fluidInputs: ['minecraft:water 1000'], + itemOutputs: ["betterend:cave_pumpkin_pie_dough"] + }) + + event.recipes.firmalife.mixing_bowl() + .ingredients(['minecraft:sniffer_egg', 'betterend:cave_pumpkin_chunks', 'betterend:cave_pumpkin_chunks', 'betterend:amber_root_product', '#tfc:sweetener'], + Fluid.of('minecraft:water', 1000)) + .outputItem('betterend:cave_pumpkin_pie_dough') + .id('tfg:mixing_bowl/cave_pumpkin_pie_dough') + + event.recipes.tfc.advanced_shapeless_crafting( + TFC.isp.of(`betterend:cave_pumpkin_pie_raw`).copyFood().firmaLifeAddPiePan(), [ + TFC.ingredient.notRotten(`betterend:cave_pumpkin_pie_dough`), + '#firmalife:pie_pans' + ]).id(`tfg:shapeless/cave_pumpkin_pie_raw`) + //#endregion // Food processing machine recipes diff --git a/kubejs/startup_scripts/betterend/items.js b/kubejs/startup_scripts/betterend/items.js index b38b3464f..02809bb71 100644 --- a/kubejs/startup_scripts/betterend/items.js +++ b/kubejs/startup_scripts/betterend/items.js @@ -16,6 +16,9 @@ function registerBetterEndItems(event) { food.hunger(4) food.saturation(1) }) + event.create('betterend:cave_pumpkin_pie_raw') + event.create('betterend:cave_pumpkin_pie_dough') + .food(food => {}) event.create('betterend:cave_pumpkin_pie') .food(food => { food.hunger(4) diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 4069a4633..7c52bd704 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -690,7 +690,6 @@ global.TFC_MUD_TYPES = [ global.TFC_WOOD_ITEM_TYPES_TO_WOOD_DUST = { '#tfc:lumber': { name: 'lumber', output: ['1x gtceu:wood_dust'] }, '#tfc:support_beams': { name: 'support_beams', output: ['2x gtceu:wood_dust'] }, - // '#minecraft:boats': { name: 'boats', output: ['5x gtceu:wood_dust'] }, '#tfc:minecarts': { name: 'minecarts', output: ['5x gtceu:wood_dust', '1x gtceu:small_wrought_iron_dust'] }, '#minecraft:signs': { name: 'signs', output: ['1x gtceu:wood_dust'] }, '#minecraft:hanging_signs': { name: 'hanging_signs', output: ['1x gtceu:wood_dust'] }, @@ -709,18 +708,12 @@ global.TFC_WOOD_ITEM_TYPES_TO_WOOD_DUST = { '#tfc:twigs': { name: 'twigs', output: ['1x gtceu:wood_dust'] }, '#tfc:workbenches': { name: 'workbenches', output: ['1x gtceu:wood_dust'] }, '#forge:chests/wooden': { name: 'wooden_chests', output: ['8x gtceu:wood_dust'] }, - // '#tfg:only_trapped_wooden_chests': { name: 'trapped_wooden_chests', output: ['8x gtceu:wood_dust', '1x gtceu:wrought_iron_small_dust'] }, '#tfc:looms': { name: 'looms', output: ['2x gtceu:wood_dust'] }, '#tfc:sluices': { name: 'sluices', output: ['4x gtceu:wood_dust'] }, '#tfc:barrels': { name: 'barrels', output: ['2x gtceu:wood_dust'] }, '#tfc:lecterns': { name: 'lecterns', output: ['4x gtceu:wood_dust'] }, '#tfc:scribing_tables': { name: 'scribing_tables', output: ['1x gtceu:wood_dust'] }, '#tfc:jar_shelves': { name: 'jar_shelves', output: ['1x gtceu:wood_dust'] }, - // '#tfc:axles': { name: 'axles', output: ['1x gtceu:wood_dust'] }, - // '#tfg:bladed_axles': { name: 'bladed_axles', output: ['1x gtceu:wood_dust'] }, - // '#tfc:clutches': { name: 'clutches', output: ['1x gtceu:wood_dust'] }, - // '#tfc:gear_boxes': { name: 'gear_boxes', output: ['3x gtceu:wood_dust'] }, - // '#tfc:water_wheels': { name: 'water_wheels', output: ['4x gtceu:wood_dust'] }, '#tfcastikorcarts:cart_wheel': { name: '', output: ['1x gtceu:wood_dust'] }, '#tfcastikorcarts:plow': { name: 'plow', output: ['2x gtceu:wood_dust'] }, '#tfcastikorcarts:animal_cart': { name: 'animal_cart', output: ['2x gtceu:wood_dust'] }, @@ -919,7 +912,11 @@ global.TFC_MEAT_RECIPE_COMPONENTS = [ { input: 'tfg:food/raw_crawlermari', output: 'tfg:food/cooked_crawlermari', name: 'cooked_crawlermari' }, { input: 'tfg:food/raw_limpet', output: 'tfg:food/cooked_limpet', name: 'cooked_limpet' }, { input: 'tfg:sunflower_product', output: 'tfg:roasted_sunflower_seeds', name: 'roasted_sunflower_seeds' }, - { input: 'tfg:food/raw_moon_rabbit', output: 'tfg:food/cooked_moon_rabbit', name: 'cooked_moon_rabbit' } + { input: 'tfg:food/raw_moon_rabbit', output: 'tfg:food/cooked_moon_rabbit', name: 'cooked_moon_rabbit' }, + { input: 'betterend:bolux_mushroom_product', output: 'betterend:bolux_mushroom_cooked', name: 'bolux_mushroom' }, + { input: 'betterend:chorus_mushroom_product', output: 'betterend:chorus_mushroom_cooked', name: 'chorus_mushroom' }, + { input: 'betterend:shadow_berry_product', output: 'betterend:shadow_berry_cooked', name: 'shadow_berry' }, + { input: 'betterend:cave_pumpkin_pie_raw', output: 'betterend:cave_pumpkin_pie', name: 'cave_pumpkin_pie' } ]; global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = [ diff --git a/kubejs/startup_scripts/tfg/blocks.crops.js b/kubejs/startup_scripts/tfg/blocks.crops.js index ccdbce9d7..2a520e0a0 100644 --- a/kubejs/startup_scripts/tfg/blocks.crops.js +++ b/kubejs/startup_scripts/tfg/blocks.crops.js @@ -154,6 +154,8 @@ const registerTFGCrops = (event) => { product.food(food => { food.hunger(2) food.saturation(1) + food.effect('minecraft:hunger', 30 * 20, 0, 1) + food.effect('minecraft:weakness', 30 * 20, 0, 1) }) }) .deadBlock(dead => { @@ -181,6 +183,7 @@ const registerTFGCrops = (event) => { product.food(food => { food.hunger(5) food.saturation(1) + food.effect('minecraft:poison', 5 * 20, 0, 1) }) }) .deadBlock(dead => { @@ -207,6 +210,8 @@ const registerTFGCrops = (event) => { product.food(food => { food.hunger(2) food.saturation(1) + food.effect('tfc:thirst', 60 * 20, 0, 1) + food.effect('minecraft:nausea', 30 * 20, 0, 1) }) }) .deadBlock(dead => { From a90f1c06ab929433e9f6f63b68e2e51418f9187f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 11 Aug 2025 22:59:21 +0100 Subject: [PATCH 018/158] langs --- kubejs/assets/betterend/lang/en_us.json | 2 + kubejs/assets/tfc/lang/en_us.json | 2729 +---------------------- kubejs/assets/tfc/lang/ru_ru.json | 2262 +------------------ kubejs/assets/tfc/lang/uk_ua.json | 2599 --------------------- kubejs/assets/tfg/lang/en_us.json | 13 +- kubejs/assets/tfg/lang/uk_ua.json | 2 + 6 files changed, 78 insertions(+), 7529 deletions(-) diff --git a/kubejs/assets/betterend/lang/en_us.json b/kubejs/assets/betterend/lang/en_us.json index 2115afb90..e11658dc2 100644 --- a/kubejs/assets/betterend/lang/en_us.json +++ b/kubejs/assets/betterend/lang/en_us.json @@ -82,6 +82,8 @@ "item.betterend.cave_pumpkin_chunks": "Bulbkin Chunks", "item.betterend.cave_pumpkin_product": "Bulbkin", "item.betterend.cave_pumpkin_plant_seeds": "Bulbkin Seeds", + "item.betterend.cave_pumpkin_pie_dough": "Bulbkin Pie Dough", + "item.betterend.cave_pumpkin_pie_raw": "Raw Bulbkin Pie", "item.betterend.cave_pumpkin_pie": "Bulbkin Pie", "item.betterend.chorus_mushroom_cooked": "Cooked Chalmie Mushroom", "item.betterend.chorus_mushroom_product": "Chalmie Mushroom", diff --git a/kubejs/assets/tfc/lang/en_us.json b/kubejs/assets/tfc/lang/en_us.json index ff6679e80..61aab90fe 100644 --- a/kubejs/assets/tfc/lang/en_us.json +++ b/kubejs/assets/tfc/lang/en_us.json @@ -1,2666 +1,67 @@ { - "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", - "block.tfc.fluid.salt_water": "Sea Water", - "block.tfc.cauldron.salt_water": "Sea Water Cauldron", - "block.gtceu.andesite_almandine_ore.prospected": "Almandine", - "block.gtceu.andesite_aluminium_ore.prospected": "Aluminium", - "block.gtceu.andesite_alunite_ore.prospected": "Alunite", - "block.gtceu.andesite_amethyst_ore.prospected": "Amethyst", - "block.gtceu.andesite_apatite_ore.prospected": "Apatite", - "block.gtceu.andesite_asbestos_ore.prospected": "Asbestos", - "block.gtceu.andesite_barite_ore.prospected": "Barite", - "block.gtceu.andesite_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.andesite_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.andesite_bauxite_ore.prospected": "Bauxite", - "block.gtceu.andesite_bentonite_ore.prospected": "Bentonite", - "block.gtceu.andesite_beryllium_ore.prospected": "Beryllium", - "block.gtceu.andesite_bismuth_ore.prospected": "Bismuth", - "block.gtceu.andesite_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.andesite_borax_ore.prospected": "Borax", - "block.gtceu.andesite_bornite_ore.prospected": "Bornite", - "block.gtceu.andesite_calcite_ore.prospected": "Calcite", - "block.gtceu.andesite_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.andesite_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.andesite_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.andesite_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.andesite_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.andesite_chromite_ore.prospected": "Chromite", - "block.gtceu.andesite_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.andesite_coal_ore.prospected": "Coal", - "block.gtceu.andesite_cobalt_ore.prospected": "Cobalt", - "block.gtceu.andesite_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.andesite_cooperite_ore.prospected": "Cooperite", - "block.gtceu.andesite_copper_ore.prospected": "Copper", - "block.gtceu.andesite_diamond_ore.prospected": "Diamond", - "block.gtceu.andesite_diatomite_ore.prospected": "Diatomite", - "block.gtceu.andesite_electrotine_ore.prospected": "Electrotine", - "block.gtceu.andesite_emerald_ore.prospected": "Emerald", - "block.gtceu.andesite_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.andesite_galena_ore.prospected": "Galena", - "block.gtceu.andesite_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.andesite_garnierite_ore.prospected": "Garnierite", - "block.gtceu.andesite_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.andesite_goethite_ore.prospected": "Goethite", - "block.gtceu.andesite_gold_ore.prospected": "Gold", - "block.gtceu.andesite_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.andesite_graphite_ore.prospected": "Graphite", - "block.gtceu.andesite_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.andesite_grossular_ore.prospected": "Grossular", - "block.gtceu.andesite_gypsum_ore.prospected": "Gypsum", - "block.gtceu.andesite_hematite_ore.prospected": "Hematite", - "block.gtceu.andesite_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.andesite_iron_ore.prospected": "Iron", - "block.gtceu.andesite_kyanite_ore.prospected": "Kyanite", - "block.gtceu.andesite_lapis_ore.prospected": "Lapis", - "block.gtceu.andesite_lazurite_ore.prospected": "Lazurite", - "block.gtceu.andesite_lead_ore.prospected": "Lead", - "block.gtceu.andesite_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.andesite_lithium_ore.prospected": "Lithium", - "block.gtceu.andesite_magnesite_ore.prospected": "Magnesite", - "block.gtceu.andesite_magnetite_ore.prospected": "Magnetite", - "block.gtceu.andesite_malachite_ore.prospected": "Malachite", - "block.gtceu.andesite_mica_ore.prospected": "Mica", - "block.gtceu.andesite_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.andesite_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.andesite_monazite_ore.prospected": "Monazite", - "block.gtceu.andesite_naquadah_ore.prospected": "Naquadah", - "block.gtceu.andesite_neodymium_ore.prospected": "Neodymium", - "block.gtceu.andesite_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.andesite_nickel_ore.prospected": "Nickel", - "block.gtceu.andesite_oilsands_ore.prospected": "Oilsands", - "block.gtceu.andesite_olivine_ore.prospected": "Olivine", - "block.gtceu.andesite_opal_ore.prospected": "Opal", - "block.gtceu.andesite_palladium_ore.prospected": "Palladium", - "block.gtceu.andesite_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.andesite_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.andesite_platinum_ore.prospected": "Platinum", - "block.gtceu.andesite_plutonium_ore.prospected": "Plutonium", - "block.gtceu.andesite_pollucite_ore.prospected": "Pollucite", - "block.gtceu.andesite_powellite_ore.prospected": "Powellite", - "block.gtceu.andesite_pyrite_ore.prospected": "Pyrite", - "block.gtceu.andesite_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.andesite_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.andesite_pyrope_ore.prospected": "Pyrope", - "block.gtceu.andesite_quartzite_ore.prospected": "Quartzite", - "block.gtceu.andesite_realgar_ore.prospected": "Realgar", - "block.gtceu.andesite_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.andesite_redstone_ore.prospected": "Redstone", - "block.gtceu.andesite_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.andesite_ruby_ore.prospected": "Ruby", - "block.gtceu.andesite_salt_ore.prospected": "Salt", - "block.gtceu.andesite_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.andesite_sapphire_ore.prospected": "Sapphire", - "block.gtceu.andesite_scheelite_ore.prospected": "Scheelite", - "block.gtceu.andesite_silver_ore.prospected": "Silver", - "block.gtceu.andesite_soapstone_ore.prospected": "Soapstone", - "block.gtceu.andesite_sodalite_ore.prospected": "Sodalite", - "block.gtceu.andesite_spessartine_ore.prospected": "Spessartine", - "block.gtceu.andesite_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.andesite_spodumene_ore.prospected": "Spodumene", - "block.gtceu.andesite_stibnite_ore.prospected": "Stibnite", - "block.gtceu.andesite_sulfur_ore.prospected": "Sulfur", - "block.gtceu.andesite_sylvite_ore.prospected": "Sylvite", - "block.gtceu.andesite_talc_ore.prospected": "Talc", - "block.gtceu.andesite_tantalite_ore.prospected": "Tantalite", - "block.gtceu.andesite_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.andesite_thorium_ore.prospected": "Thorium", - "block.gtceu.andesite_tin_ore.prospected": "Tin", - "block.gtceu.andesite_topaz_ore.prospected": "Topaz", - "block.gtceu.andesite_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.andesite_trona_ore.prospected": "Trona", - "block.gtceu.andesite_tungstate_ore.prospected": "Tungstate", - "block.gtceu.andesite_uraninite_ore.prospected": "Uraninite", - "block.gtceu.andesite_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.andesite_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.andesite_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.andesite_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.andesite_zeolite_ore.prospected": "Zeolite", - "block.gtceu.basalt_almandine_ore.prospected": "Almandine", - "block.gtceu.basalt_aluminium_ore.prospected": "Aluminium", - "block.gtceu.basalt_alunite_ore.prospected": "Alunite", - "block.gtceu.basalt_amethyst_ore.prospected": "Amethyst", - "block.gtceu.basalt_apatite_ore.prospected": "Apatite", - "block.gtceu.basalt_asbestos_ore.prospected": "Asbestos", - "block.gtceu.basalt_barite_ore.prospected": "Barite", - "block.gtceu.basalt_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.basalt_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.basalt_bauxite_ore.prospected": "Bauxite", - "block.gtceu.basalt_bentonite_ore.prospected": "Bentonite", - "block.gtceu.basalt_beryllium_ore.prospected": "Beryllium", - "block.gtceu.basalt_bismuth_ore.prospected": "Bismuth", - "block.gtceu.basalt_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.basalt_borax_ore.prospected": "Borax", - "block.gtceu.basalt_bornite_ore.prospected": "Bornite", - "block.gtceu.basalt_calcite_ore.prospected": "Calcite", - "block.gtceu.basalt_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.basalt_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.basalt_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.basalt_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.basalt_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.basalt_chromite_ore.prospected": "Chromite", - "block.gtceu.basalt_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.basalt_coal_ore.prospected": "Coal", - "block.gtceu.basalt_cobalt_ore.prospected": "Cobalt", - "block.gtceu.basalt_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.basalt_cooperite_ore.prospected": "Cooperite", - "block.gtceu.basalt_copper_ore.prospected": "Copper", - "block.gtceu.basalt_diamond_ore.prospected": "Diamond", - "block.gtceu.basalt_diatomite_ore.prospected": "Diatomite", - "block.gtceu.basalt_electrotine_ore.prospected": "Electrotine", - "block.gtceu.basalt_emerald_ore.prospected": "Emerald", - "block.gtceu.basalt_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.basalt_galena_ore.prospected": "Galena", - "block.gtceu.basalt_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.basalt_garnierite_ore.prospected": "Garnierite", - "block.gtceu.basalt_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.basalt_goethite_ore.prospected": "Goethite", - "block.gtceu.basalt_gold_ore.prospected": "Gold", - "block.gtceu.basalt_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.basalt_graphite_ore.prospected": "Graphite", - "block.gtceu.basalt_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.basalt_grossular_ore.prospected": "Grossular", - "block.gtceu.basalt_gypsum_ore.prospected": "Gypsum", - "block.gtceu.basalt_hematite_ore.prospected": "Hematite", - "block.gtceu.basalt_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.basalt_iron_ore.prospected": "Iron", - "block.gtceu.basalt_kyanite_ore.prospected": "Kyanite", - "block.gtceu.basalt_lapis_ore.prospected": "Lapis", - "block.gtceu.basalt_lazurite_ore.prospected": "Lazurite", - "block.gtceu.basalt_lead_ore.prospected": "Lead", - "block.gtceu.basalt_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.basalt_lithium_ore.prospected": "Lithium", - "block.gtceu.basalt_magnesite_ore.prospected": "Magnesite", - "block.gtceu.basalt_magnetite_ore.prospected": "Magnetite", - "block.gtceu.basalt_malachite_ore.prospected": "Malachite", - "block.gtceu.basalt_mica_ore.prospected": "Mica", - "block.gtceu.basalt_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.basalt_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.basalt_monazite_ore.prospected": "Monazite", - "block.gtceu.basalt_naquadah_ore.prospected": "Naquadah", - "block.gtceu.basalt_neodymium_ore.prospected": "Neodymium", - "block.gtceu.basalt_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.basalt_nickel_ore.prospected": "Nickel", - "block.gtceu.basalt_oilsands_ore.prospected": "Oilsands", - "block.gtceu.basalt_olivine_ore.prospected": "Olivine", - "block.gtceu.basalt_opal_ore.prospected": "Opal", - "block.gtceu.basalt_palladium_ore.prospected": "Palladium", - "block.gtceu.basalt_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.basalt_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.basalt_platinum_ore.prospected": "Platinum", - "block.gtceu.basalt_plutonium_ore.prospected": "Plutonium", - "block.gtceu.basalt_pollucite_ore.prospected": "Pollucite", - "block.gtceu.basalt_powellite_ore.prospected": "Powellite", - "block.gtceu.basalt_pyrite_ore.prospected": "Pyrite", - "block.gtceu.basalt_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.basalt_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.basalt_pyrope_ore.prospected": "Pyrope", - "block.gtceu.basalt_quartzite_ore.prospected": "Quartzite", - "block.gtceu.basalt_realgar_ore.prospected": "Realgar", - "block.gtceu.basalt_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.basalt_redstone_ore.prospected": "Redstone", - "block.gtceu.basalt_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.basalt_ruby_ore.prospected": "Ruby", - "block.gtceu.basalt_salt_ore.prospected": "Salt", - "block.gtceu.basalt_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.basalt_sapphire_ore.prospected": "Sapphire", - "block.gtceu.basalt_scheelite_ore.prospected": "Scheelite", - "block.gtceu.basalt_silver_ore.prospected": "Silver", - "block.gtceu.basalt_soapstone_ore.prospected": "Soapstone", - "block.gtceu.basalt_sodalite_ore.prospected": "Sodalite", - "block.gtceu.basalt_spessartine_ore.prospected": "Spessartine", - "block.gtceu.basalt_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.basalt_spodumene_ore.prospected": "Spodumene", - "block.gtceu.basalt_stibnite_ore.prospected": "Stibnite", - "block.gtceu.basalt_sulfur_ore.prospected": "Sulfur", - "block.gtceu.basalt_sylvite_ore.prospected": "Sylvite", - "block.gtceu.basalt_talc_ore.prospected": "Talc", - "block.gtceu.basalt_tantalite_ore.prospected": "Tantalite", - "block.gtceu.basalt_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.basalt_thorium_ore.prospected": "Thorium", - "block.gtceu.basalt_tin_ore.prospected": "Tin", - "block.gtceu.basalt_topaz_ore.prospected": "Topaz", - "block.gtceu.basalt_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.basalt_trona_ore.prospected": "Trona", - "block.gtceu.basalt_tungstate_ore.prospected": "Tungstate", - "block.gtceu.basalt_uraninite_ore.prospected": "Uraninite", - "block.gtceu.basalt_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.basalt_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.basalt_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.basalt_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.basalt_zeolite_ore.prospected": "Zeolite", - "block.gtceu.chalk_almandine_ore.prospected": "Almandine", - "block.gtceu.chalk_aluminium_ore.prospected": "Aluminium", - "block.gtceu.chalk_alunite_ore.prospected": "Alunite", - "block.gtceu.chalk_amethyst_ore.prospected": "Amethyst", - "block.gtceu.chalk_apatite_ore.prospected": "Apatite", - "block.gtceu.chalk_asbestos_ore.prospected": "Asbestos", - "block.gtceu.chalk_barite_ore.prospected": "Barite", - "block.gtceu.chalk_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.chalk_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.chalk_bauxite_ore.prospected": "Bauxite", - "block.gtceu.chalk_bentonite_ore.prospected": "Bentonite", - "block.gtceu.chalk_beryllium_ore.prospected": "Beryllium", - "block.gtceu.chalk_bismuth_ore.prospected": "Bismuth", - "block.gtceu.chalk_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.chalk_borax_ore.prospected": "Borax", - "block.gtceu.chalk_bornite_ore.prospected": "Bornite", - "block.gtceu.chalk_calcite_ore.prospected": "Calcite", - "block.gtceu.chalk_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.chalk_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.chalk_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.chalk_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.chalk_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.chalk_chromite_ore.prospected": "Chromite", - "block.gtceu.chalk_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.chalk_coal_ore.prospected": "Coal", - "block.gtceu.chalk_cobalt_ore.prospected": "Cobalt", - "block.gtceu.chalk_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.chalk_cooperite_ore.prospected": "Cooperite", - "block.gtceu.chalk_copper_ore.prospected": "Copper", - "block.gtceu.chalk_diamond_ore.prospected": "Diamond", - "block.gtceu.chalk_diatomite_ore.prospected": "Diatomite", - "block.gtceu.chalk_electrotine_ore.prospected": "Electrotine", - "block.gtceu.chalk_emerald_ore.prospected": "Emerald", - "block.gtceu.chalk_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.chalk_galena_ore.prospected": "Galena", - "block.gtceu.chalk_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.chalk_garnierite_ore.prospected": "Garnierite", - "block.gtceu.chalk_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.chalk_goethite_ore.prospected": "Goethite", - "block.gtceu.chalk_gold_ore.prospected": "Gold", - "block.gtceu.chalk_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.chalk_graphite_ore.prospected": "Graphite", - "block.gtceu.chalk_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.chalk_grossular_ore.prospected": "Grossular", - "block.gtceu.chalk_gypsum_ore.prospected": "Gypsum", - "block.gtceu.chalk_hematite_ore.prospected": "Hematite", - "block.gtceu.chalk_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.chalk_iron_ore.prospected": "Iron", - "block.gtceu.chalk_kyanite_ore.prospected": "Kyanite", - "block.gtceu.chalk_lapis_ore.prospected": "Lapis", - "block.gtceu.chalk_lazurite_ore.prospected": "Lazurite", - "block.gtceu.chalk_lead_ore.prospected": "Lead", - "block.gtceu.chalk_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.chalk_lithium_ore.prospected": "Lithium", - "block.gtceu.chalk_magnesite_ore.prospected": "Magnesite", - "block.gtceu.chalk_magnetite_ore.prospected": "Magnetite", - "block.gtceu.chalk_malachite_ore.prospected": "Malachite", - "block.gtceu.chalk_mica_ore.prospected": "Mica", - "block.gtceu.chalk_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.chalk_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.chalk_monazite_ore.prospected": "Monazite", - "block.gtceu.chalk_naquadah_ore.prospected": "Naquadah", - "block.gtceu.chalk_neodymium_ore.prospected": "Neodymium", - "block.gtceu.chalk_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.chalk_nickel_ore.prospected": "Nickel", - "block.gtceu.chalk_oilsands_ore.prospected": "Oilsands", - "block.gtceu.chalk_olivine_ore.prospected": "Olivine", - "block.gtceu.chalk_opal_ore.prospected": "Opal", - "block.gtceu.chalk_palladium_ore.prospected": "Palladium", - "block.gtceu.chalk_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.chalk_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.chalk_platinum_ore.prospected": "Platinum", - "block.gtceu.chalk_plutonium_ore.prospected": "Plutonium", - "block.gtceu.chalk_pollucite_ore.prospected": "Pollucite", - "block.gtceu.chalk_powellite_ore.prospected": "Powellite", - "block.gtceu.chalk_pyrite_ore.prospected": "Pyrite", - "block.gtceu.chalk_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.chalk_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.chalk_pyrope_ore.prospected": "Pyrope", - "block.gtceu.chalk_quartzite_ore.prospected": "Quartzite", - "block.gtceu.chalk_realgar_ore.prospected": "Realgar", - "block.gtceu.chalk_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.chalk_redstone_ore.prospected": "Redstone", - "block.gtceu.chalk_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.chalk_ruby_ore.prospected": "Ruby", - "block.gtceu.chalk_salt_ore.prospected": "Salt", - "block.gtceu.chalk_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.chalk_sapphire_ore.prospected": "Sapphire", - "block.gtceu.chalk_scheelite_ore.prospected": "Scheelite", - "block.gtceu.chalk_silver_ore.prospected": "Silver", - "block.gtceu.chalk_soapstone_ore.prospected": "Soapstone", - "block.gtceu.chalk_sodalite_ore.prospected": "Sodalite", - "block.gtceu.chalk_spessartine_ore.prospected": "Spessartine", - "block.gtceu.chalk_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.chalk_spodumene_ore.prospected": "Spodumene", - "block.gtceu.chalk_stibnite_ore.prospected": "Stibnite", - "block.gtceu.chalk_sulfur_ore.prospected": "Sulfur", - "block.gtceu.chalk_sylvite_ore.prospected": "Sylvite", - "block.gtceu.chalk_talc_ore.prospected": "Talc", - "block.gtceu.chalk_tantalite_ore.prospected": "Tantalite", - "block.gtceu.chalk_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.chalk_thorium_ore.prospected": "Thorium", - "block.gtceu.chalk_tin_ore.prospected": "Tin", - "block.gtceu.chalk_topaz_ore.prospected": "Topaz", - "block.gtceu.chalk_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.chalk_trona_ore.prospected": "Trona", - "block.gtceu.chalk_tungstate_ore.prospected": "Tungstate", - "block.gtceu.chalk_uraninite_ore.prospected": "Uraninite", - "block.gtceu.chalk_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.chalk_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.chalk_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.chalk_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.chalk_zeolite_ore.prospected": "Zeolite", - "block.gtceu.chert_almandine_ore.prospected": "Almandine", - "block.gtceu.chert_aluminium_ore.prospected": "Aluminium", - "block.gtceu.chert_alunite_ore.prospected": "Alunite", - "block.gtceu.chert_amethyst_ore.prospected": "Amethyst", - "block.gtceu.chert_apatite_ore.prospected": "Apatite", - "block.gtceu.chert_asbestos_ore.prospected": "Asbestos", - "block.gtceu.chert_barite_ore.prospected": "Barite", - "block.gtceu.chert_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.chert_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.chert_bauxite_ore.prospected": "Bauxite", - "block.gtceu.chert_bentonite_ore.prospected": "Bentonite", - "block.gtceu.chert_beryllium_ore.prospected": "Beryllium", - "block.gtceu.chert_bismuth_ore.prospected": "Bismuth", - "block.gtceu.chert_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.chert_borax_ore.prospected": "Borax", - "block.gtceu.chert_bornite_ore.prospected": "Bornite", - "block.gtceu.chert_calcite_ore.prospected": "Calcite", - "block.gtceu.chert_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.chert_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.chert_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.chert_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.chert_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.chert_chromite_ore.prospected": "Chromite", - "block.gtceu.chert_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.chert_coal_ore.prospected": "Coal", - "block.gtceu.chert_cobalt_ore.prospected": "Cobalt", - "block.gtceu.chert_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.chert_cooperite_ore.prospected": "Cooperite", - "block.gtceu.chert_copper_ore.prospected": "Copper", - "block.gtceu.chert_diamond_ore.prospected": "Diamond", - "block.gtceu.chert_diatomite_ore.prospected": "Diatomite", - "block.gtceu.chert_electrotine_ore.prospected": "Electrotine", - "block.gtceu.chert_emerald_ore.prospected": "Emerald", - "block.gtceu.chert_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.chert_galena_ore.prospected": "Galena", - "block.gtceu.chert_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.chert_garnierite_ore.prospected": "Garnierite", - "block.gtceu.chert_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.chert_goethite_ore.prospected": "Goethite", - "block.gtceu.chert_gold_ore.prospected": "Gold", - "block.gtceu.chert_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.chert_graphite_ore.prospected": "Graphite", - "block.gtceu.chert_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.chert_grossular_ore.prospected": "Grossular", - "block.gtceu.chert_gypsum_ore.prospected": "Gypsum", - "block.gtceu.chert_hematite_ore.prospected": "Hematite", - "block.gtceu.chert_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.chert_iron_ore.prospected": "Iron", - "block.gtceu.chert_kyanite_ore.prospected": "Kyanite", - "block.gtceu.chert_lapis_ore.prospected": "Lapis", - "block.gtceu.chert_lazurite_ore.prospected": "Lazurite", - "block.gtceu.chert_lead_ore.prospected": "Lead", - "block.gtceu.chert_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.chert_lithium_ore.prospected": "Lithium", - "block.gtceu.chert_magnesite_ore.prospected": "Magnesite", - "block.gtceu.chert_magnetite_ore.prospected": "Magnetite", - "block.gtceu.chert_malachite_ore.prospected": "Malachite", - "block.gtceu.chert_mica_ore.prospected": "Mica", - "block.gtceu.chert_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.chert_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.chert_monazite_ore.prospected": "Monazite", - "block.gtceu.chert_naquadah_ore.prospected": "Naquadah", - "block.gtceu.chert_neodymium_ore.prospected": "Neodymium", - "block.gtceu.chert_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.chert_nickel_ore.prospected": "Nickel", - "block.gtceu.chert_oilsands_ore.prospected": "Oilsands", - "block.gtceu.chert_olivine_ore.prospected": "Olivine", - "block.gtceu.chert_opal_ore.prospected": "Opal", - "block.gtceu.chert_palladium_ore.prospected": "Palladium", - "block.gtceu.chert_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.chert_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.chert_platinum_ore.prospected": "Platinum", - "block.gtceu.chert_plutonium_ore.prospected": "Plutonium", - "block.gtceu.chert_pollucite_ore.prospected": "Pollucite", - "block.gtceu.chert_powellite_ore.prospected": "Powellite", - "block.gtceu.chert_pyrite_ore.prospected": "Pyrite", - "block.gtceu.chert_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.chert_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.chert_pyrope_ore.prospected": "Pyrope", - "block.gtceu.chert_quartzite_ore.prospected": "Quartzite", - "block.gtceu.chert_realgar_ore.prospected": "Realgar", - "block.gtceu.chert_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.chert_redstone_ore.prospected": "Redstone", - "block.gtceu.chert_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.chert_ruby_ore.prospected": "Ruby", - "block.gtceu.chert_salt_ore.prospected": "Salt", - "block.gtceu.chert_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.chert_sapphire_ore.prospected": "Sapphire", - "block.gtceu.chert_scheelite_ore.prospected": "Scheelite", - "block.gtceu.chert_silver_ore.prospected": "Silver", - "block.gtceu.chert_soapstone_ore.prospected": "Soapstone", - "block.gtceu.chert_sodalite_ore.prospected": "Sodalite", - "block.gtceu.chert_spessartine_ore.prospected": "Spessartine", - "block.gtceu.chert_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.chert_spodumene_ore.prospected": "Spodumene", - "block.gtceu.chert_stibnite_ore.prospected": "Stibnite", - "block.gtceu.chert_sulfur_ore.prospected": "Sulfur", - "block.gtceu.chert_sylvite_ore.prospected": "Sylvite", - "block.gtceu.chert_talc_ore.prospected": "Talc", - "block.gtceu.chert_tantalite_ore.prospected": "Tantalite", - "block.gtceu.chert_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.chert_thorium_ore.prospected": "Thorium", - "block.gtceu.chert_tin_ore.prospected": "Tin", - "block.gtceu.chert_topaz_ore.prospected": "Topaz", - "block.gtceu.chert_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.chert_trona_ore.prospected": "Trona", - "block.gtceu.chert_tungstate_ore.prospected": "Tungstate", - "block.gtceu.chert_uraninite_ore.prospected": "Uraninite", - "block.gtceu.chert_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.chert_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.chert_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.chert_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.chert_zeolite_ore.prospected": "Zeolite", - "block.gtceu.claystone_almandine_ore.prospected": "Almandine", - "block.gtceu.claystone_aluminium_ore.prospected": "Aluminium", - "block.gtceu.claystone_alunite_ore.prospected": "Alunite", - "block.gtceu.claystone_amethyst_ore.prospected": "Amethyst", - "block.gtceu.claystone_apatite_ore.prospected": "Apatite", - "block.gtceu.claystone_asbestos_ore.prospected": "Asbestos", - "block.gtceu.claystone_barite_ore.prospected": "Barite", - "block.gtceu.claystone_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.claystone_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.claystone_bauxite_ore.prospected": "Bauxite", - "block.gtceu.claystone_bentonite_ore.prospected": "Bentonite", - "block.gtceu.claystone_beryllium_ore.prospected": "Beryllium", - "block.gtceu.claystone_bismuth_ore.prospected": "Bismuth", - "block.gtceu.claystone_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.claystone_borax_ore.prospected": "Borax", - "block.gtceu.claystone_bornite_ore.prospected": "Bornite", - "block.gtceu.claystone_calcite_ore.prospected": "Calcite", - "block.gtceu.claystone_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.claystone_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.claystone_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.claystone_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.claystone_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.claystone_chromite_ore.prospected": "Chromite", - "block.gtceu.claystone_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.claystone_coal_ore.prospected": "Coal", - "block.gtceu.claystone_cobalt_ore.prospected": "Cobalt", - "block.gtceu.claystone_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.claystone_cooperite_ore.prospected": "Cooperite", - "block.gtceu.claystone_copper_ore.prospected": "Copper", - "block.gtceu.claystone_diamond_ore.prospected": "Diamond", - "block.gtceu.claystone_diatomite_ore.prospected": "Diatomite", - "block.gtceu.claystone_electrotine_ore.prospected": "Electrotine", - "block.gtceu.claystone_emerald_ore.prospected": "Emerald", - "block.gtceu.claystone_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.claystone_galena_ore.prospected": "Galena", - "block.gtceu.claystone_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.claystone_garnierite_ore.prospected": "Garnierite", - "block.gtceu.claystone_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.claystone_goethite_ore.prospected": "Goethite", - "block.gtceu.claystone_gold_ore.prospected": "Gold", - "block.gtceu.claystone_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.claystone_graphite_ore.prospected": "Graphite", - "block.gtceu.claystone_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.claystone_grossular_ore.prospected": "Grossular", - "block.gtceu.claystone_gypsum_ore.prospected": "Gypsum", - "block.gtceu.claystone_hematite_ore.prospected": "Hematite", - "block.gtceu.claystone_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.claystone_iron_ore.prospected": "Iron", - "block.gtceu.claystone_kyanite_ore.prospected": "Kyanite", - "block.gtceu.claystone_lapis_ore.prospected": "Lapis", - "block.gtceu.claystone_lazurite_ore.prospected": "Lazurite", - "block.gtceu.claystone_lead_ore.prospected": "Lead", - "block.gtceu.claystone_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.claystone_lithium_ore.prospected": "Lithium", - "block.gtceu.claystone_magnesite_ore.prospected": "Magnesite", - "block.gtceu.claystone_magnetite_ore.prospected": "Magnetite", - "block.gtceu.claystone_malachite_ore.prospected": "Malachite", - "block.gtceu.claystone_mica_ore.prospected": "Mica", - "block.gtceu.claystone_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.claystone_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.claystone_monazite_ore.prospected": "Monazite", - "block.gtceu.claystone_naquadah_ore.prospected": "Naquadah", - "block.gtceu.claystone_neodymium_ore.prospected": "Neodymium", - "block.gtceu.claystone_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.claystone_nickel_ore.prospected": "Nickel", - "block.gtceu.claystone_oilsands_ore.prospected": "Oilsands", - "block.gtceu.claystone_olivine_ore.prospected": "Olivine", - "block.gtceu.claystone_opal_ore.prospected": "Opal", - "block.gtceu.claystone_palladium_ore.prospected": "Palladium", - "block.gtceu.claystone_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.claystone_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.claystone_platinum_ore.prospected": "Platinum", - "block.gtceu.claystone_plutonium_ore.prospected": "Plutonium", - "block.gtceu.claystone_pollucite_ore.prospected": "Pollucite", - "block.gtceu.claystone_powellite_ore.prospected": "Powellite", - "block.gtceu.claystone_pyrite_ore.prospected": "Pyrite", - "block.gtceu.claystone_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.claystone_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.claystone_pyrope_ore.prospected": "Pyrope", - "block.gtceu.claystone_quartzite_ore.prospected": "Quartzite", - "block.gtceu.claystone_realgar_ore.prospected": "Realgar", - "block.gtceu.claystone_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.claystone_redstone_ore.prospected": "Redstone", - "block.gtceu.claystone_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.claystone_ruby_ore.prospected": "Ruby", - "block.gtceu.claystone_salt_ore.prospected": "Salt", - "block.gtceu.claystone_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.claystone_sapphire_ore.prospected": "Sapphire", - "block.gtceu.claystone_scheelite_ore.prospected": "Scheelite", - "block.gtceu.claystone_silver_ore.prospected": "Silver", - "block.gtceu.claystone_soapstone_ore.prospected": "Soapstone", - "block.gtceu.claystone_sodalite_ore.prospected": "Sodalite", - "block.gtceu.claystone_spessartine_ore.prospected": "Spessartine", - "block.gtceu.claystone_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.claystone_spodumene_ore.prospected": "Spodumene", - "block.gtceu.claystone_stibnite_ore.prospected": "Stibnite", - "block.gtceu.claystone_sulfur_ore.prospected": "Sulfur", - "block.gtceu.claystone_sylvite_ore.prospected": "Sylvite", - "block.gtceu.claystone_talc_ore.prospected": "Talc", - "block.gtceu.claystone_tantalite_ore.prospected": "Tantalite", - "block.gtceu.claystone_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.claystone_thorium_ore.prospected": "Thorium", - "block.gtceu.claystone_tin_ore.prospected": "Tin", - "block.gtceu.claystone_topaz_ore.prospected": "Topaz", - "block.gtceu.claystone_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.claystone_trona_ore.prospected": "Trona", - "block.gtceu.claystone_tungstate_ore.prospected": "Tungstate", - "block.gtceu.claystone_uraninite_ore.prospected": "Uraninite", - "block.gtceu.claystone_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.claystone_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.claystone_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.claystone_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.claystone_zeolite_ore.prospected": "Zeolite", - "block.gtceu.conglomerate_almandine_ore.prospected": "Almandine", - "block.gtceu.conglomerate_aluminium_ore.prospected": "Aluminium", - "block.gtceu.conglomerate_alunite_ore.prospected": "Alunite", - "block.gtceu.conglomerate_amethyst_ore.prospected": "Amethyst", - "block.gtceu.conglomerate_apatite_ore.prospected": "Apatite", - "block.gtceu.conglomerate_asbestos_ore.prospected": "Asbestos", - "block.gtceu.conglomerate_barite_ore.prospected": "Barite", - "block.gtceu.conglomerate_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.conglomerate_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.conglomerate_bauxite_ore.prospected": "Bauxite", - "block.gtceu.conglomerate_bentonite_ore.prospected": "Bentonite", - "block.gtceu.conglomerate_beryllium_ore.prospected": "Beryllium", - "block.gtceu.conglomerate_bismuth_ore.prospected": "Bismuth", - "block.gtceu.conglomerate_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.conglomerate_borax_ore.prospected": "Borax", - "block.gtceu.conglomerate_bornite_ore.prospected": "Bornite", - "block.gtceu.conglomerate_calcite_ore.prospected": "Calcite", - "block.gtceu.conglomerate_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.conglomerate_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.conglomerate_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.conglomerate_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.conglomerate_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.conglomerate_chromite_ore.prospected": "Chromite", - "block.gtceu.conglomerate_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.conglomerate_coal_ore.prospected": "Coal", - "block.gtceu.conglomerate_cobalt_ore.prospected": "Cobalt", - "block.gtceu.conglomerate_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.conglomerate_cooperite_ore.prospected": "Cooperite", - "block.gtceu.conglomerate_copper_ore.prospected": "Copper", - "block.gtceu.conglomerate_diamond_ore.prospected": "Diamond", - "block.gtceu.conglomerate_diatomite_ore.prospected": "Diatomite", - "block.gtceu.conglomerate_electrotine_ore.prospected": "Electrotine", - "block.gtceu.conglomerate_emerald_ore.prospected": "Emerald", - "block.gtceu.conglomerate_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.conglomerate_galena_ore.prospected": "Galena", - "block.gtceu.conglomerate_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.conglomerate_garnierite_ore.prospected": "Garnierite", - "block.gtceu.conglomerate_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.conglomerate_goethite_ore.prospected": "Goethite", - "block.gtceu.conglomerate_gold_ore.prospected": "Gold", - "block.gtceu.conglomerate_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.conglomerate_graphite_ore.prospected": "Graphite", - "block.gtceu.conglomerate_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.conglomerate_grossular_ore.prospected": "Grossular", - "block.gtceu.conglomerate_gypsum_ore.prospected": "Gypsum", - "block.gtceu.conglomerate_hematite_ore.prospected": "Hematite", - "block.gtceu.conglomerate_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.conglomerate_iron_ore.prospected": "Iron", - "block.gtceu.conglomerate_kyanite_ore.prospected": "Kyanite", - "block.gtceu.conglomerate_lapis_ore.prospected": "Lapis", - "block.gtceu.conglomerate_lazurite_ore.prospected": "Lazurite", - "block.gtceu.conglomerate_lead_ore.prospected": "Lead", - "block.gtceu.conglomerate_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.conglomerate_lithium_ore.prospected": "Lithium", - "block.gtceu.conglomerate_magnesite_ore.prospected": "Magnesite", - "block.gtceu.conglomerate_magnetite_ore.prospected": "Magnetite", - "block.gtceu.conglomerate_malachite_ore.prospected": "Malachite", - "block.gtceu.conglomerate_mica_ore.prospected": "Mica", - "block.gtceu.conglomerate_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.conglomerate_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.conglomerate_monazite_ore.prospected": "Monazite", - "block.gtceu.conglomerate_naquadah_ore.prospected": "Naquadah", - "block.gtceu.conglomerate_neodymium_ore.prospected": "Neodymium", - "block.gtceu.conglomerate_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.conglomerate_nickel_ore.prospected": "Nickel", - "block.gtceu.conglomerate_oilsands_ore.prospected": "Oilsands", - "block.gtceu.conglomerate_olivine_ore.prospected": "Olivine", - "block.gtceu.conglomerate_opal_ore.prospected": "Opal", - "block.gtceu.conglomerate_palladium_ore.prospected": "Palladium", - "block.gtceu.conglomerate_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.conglomerate_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.conglomerate_platinum_ore.prospected": "Platinum", - "block.gtceu.conglomerate_plutonium_ore.prospected": "Plutonium", - "block.gtceu.conglomerate_pollucite_ore.prospected": "Pollucite", - "block.gtceu.conglomerate_powellite_ore.prospected": "Powellite", - "block.gtceu.conglomerate_pyrite_ore.prospected": "Pyrite", - "block.gtceu.conglomerate_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.conglomerate_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.conglomerate_pyrope_ore.prospected": "Pyrope", - "block.gtceu.conglomerate_quartzite_ore.prospected": "Quartzite", - "block.gtceu.conglomerate_realgar_ore.prospected": "Realgar", - "block.gtceu.conglomerate_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.conglomerate_redstone_ore.prospected": "Redstone", - "block.gtceu.conglomerate_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.conglomerate_ruby_ore.prospected": "Ruby", - "block.gtceu.conglomerate_salt_ore.prospected": "Salt", - "block.gtceu.conglomerate_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.conglomerate_sapphire_ore.prospected": "Sapphire", - "block.gtceu.conglomerate_scheelite_ore.prospected": "Scheelite", - "block.gtceu.conglomerate_silver_ore.prospected": "Silver", - "block.gtceu.conglomerate_soapstone_ore.prospected": "Soapstone", - "block.gtceu.conglomerate_sodalite_ore.prospected": "Sodalite", - "block.gtceu.conglomerate_spessartine_ore.prospected": "Spessartine", - "block.gtceu.conglomerate_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.conglomerate_spodumene_ore.prospected": "Spodumene", - "block.gtceu.conglomerate_stibnite_ore.prospected": "Stibnite", - "block.gtceu.conglomerate_sulfur_ore.prospected": "Sulfur", - "block.gtceu.conglomerate_sylvite_ore.prospected": "Sylvite", - "block.gtceu.conglomerate_talc_ore.prospected": "Talc", - "block.gtceu.conglomerate_tantalite_ore.prospected": "Tantalite", - "block.gtceu.conglomerate_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.conglomerate_thorium_ore.prospected": "Thorium", - "block.gtceu.conglomerate_tin_ore.prospected": "Tin", - "block.gtceu.conglomerate_topaz_ore.prospected": "Topaz", - "block.gtceu.conglomerate_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.conglomerate_trona_ore.prospected": "Trona", - "block.gtceu.conglomerate_tungstate_ore.prospected": "Tungstate", - "block.gtceu.conglomerate_uraninite_ore.prospected": "Uraninite", - "block.gtceu.conglomerate_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.conglomerate_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.conglomerate_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.conglomerate_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.conglomerate_zeolite_ore.prospected": "Zeolite", - "block.gtceu.dacite_almandine_ore.prospected": "Almandine", - "block.gtceu.dacite_aluminium_ore.prospected": "Aluminium", - "block.gtceu.dacite_alunite_ore.prospected": "Alunite", - "block.gtceu.dacite_amethyst_ore.prospected": "Amethyst", - "block.gtceu.dacite_apatite_ore.prospected": "Apatite", - "block.gtceu.dacite_asbestos_ore.prospected": "Asbestos", - "block.gtceu.dacite_barite_ore.prospected": "Barite", - "block.gtceu.dacite_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.dacite_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.dacite_bauxite_ore.prospected": "Bauxite", - "block.gtceu.dacite_bentonite_ore.prospected": "Bentonite", - "block.gtceu.dacite_beryllium_ore.prospected": "Beryllium", - "block.gtceu.dacite_bismuth_ore.prospected": "Bismuth", - "block.gtceu.dacite_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.dacite_borax_ore.prospected": "Borax", - "block.gtceu.dacite_bornite_ore.prospected": "Bornite", - "block.gtceu.dacite_calcite_ore.prospected": "Calcite", - "block.gtceu.dacite_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.dacite_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.dacite_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.dacite_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.dacite_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.dacite_chromite_ore.prospected": "Chromite", - "block.gtceu.dacite_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.dacite_coal_ore.prospected": "Coal", - "block.gtceu.dacite_cobalt_ore.prospected": "Cobalt", - "block.gtceu.dacite_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.dacite_cooperite_ore.prospected": "Cooperite", - "block.gtceu.dacite_copper_ore.prospected": "Copper", - "block.gtceu.dacite_diamond_ore.prospected": "Diamond", - "block.gtceu.dacite_diatomite_ore.prospected": "Diatomite", - "block.gtceu.dacite_electrotine_ore.prospected": "Electrotine", - "block.gtceu.dacite_emerald_ore.prospected": "Emerald", - "block.gtceu.dacite_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.dacite_galena_ore.prospected": "Galena", - "block.gtceu.dacite_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.dacite_garnierite_ore.prospected": "Garnierite", - "block.gtceu.dacite_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.dacite_goethite_ore.prospected": "Goethite", - "block.gtceu.dacite_gold_ore.prospected": "Gold", - "block.gtceu.dacite_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.dacite_graphite_ore.prospected": "Graphite", - "block.gtceu.dacite_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.dacite_grossular_ore.prospected": "Grossular", - "block.gtceu.dacite_gypsum_ore.prospected": "Gypsum", - "block.gtceu.dacite_hematite_ore.prospected": "Hematite", - "block.gtceu.dacite_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.dacite_iron_ore.prospected": "Iron", - "block.gtceu.dacite_kyanite_ore.prospected": "Kyanite", - "block.gtceu.dacite_lapis_ore.prospected": "Lapis", - "block.gtceu.dacite_lazurite_ore.prospected": "Lazurite", - "block.gtceu.dacite_lead_ore.prospected": "Lead", - "block.gtceu.dacite_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.dacite_lithium_ore.prospected": "Lithium", - "block.gtceu.dacite_magnesite_ore.prospected": "Magnesite", - "block.gtceu.dacite_magnetite_ore.prospected": "Magnetite", - "block.gtceu.dacite_malachite_ore.prospected": "Malachite", - "block.gtceu.dacite_mica_ore.prospected": "Mica", - "block.gtceu.dacite_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.dacite_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.dacite_monazite_ore.prospected": "Monazite", - "block.gtceu.dacite_naquadah_ore.prospected": "Naquadah", - "block.gtceu.dacite_neodymium_ore.prospected": "Neodymium", - "block.gtceu.dacite_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.dacite_nickel_ore.prospected": "Nickel", - "block.gtceu.dacite_oilsands_ore.prospected": "Oilsands", - "block.gtceu.dacite_olivine_ore.prospected": "Olivine", - "block.gtceu.dacite_opal_ore.prospected": "Opal", - "block.gtceu.dacite_palladium_ore.prospected": "Palladium", - "block.gtceu.dacite_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.dacite_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.dacite_platinum_ore.prospected": "Platinum", - "block.gtceu.dacite_plutonium_ore.prospected": "Plutonium", - "block.gtceu.dacite_pollucite_ore.prospected": "Pollucite", - "block.gtceu.dacite_powellite_ore.prospected": "Powellite", - "block.gtceu.dacite_pyrite_ore.prospected": "Pyrite", - "block.gtceu.dacite_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.dacite_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.dacite_pyrope_ore.prospected": "Pyrope", - "block.gtceu.dacite_quartzite_ore.prospected": "Quartzite", - "block.gtceu.dacite_realgar_ore.prospected": "Realgar", - "block.gtceu.dacite_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.dacite_redstone_ore.prospected": "Redstone", - "block.gtceu.dacite_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.dacite_ruby_ore.prospected": "Ruby", - "block.gtceu.dacite_salt_ore.prospected": "Salt", - "block.gtceu.dacite_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.dacite_sapphire_ore.prospected": "Sapphire", - "block.gtceu.dacite_scheelite_ore.prospected": "Scheelite", - "block.gtceu.dacite_silver_ore.prospected": "Silver", - "block.gtceu.dacite_soapstone_ore.prospected": "Soapstone", - "block.gtceu.dacite_sodalite_ore.prospected": "Sodalite", - "block.gtceu.dacite_spessartine_ore.prospected": "Spessartine", - "block.gtceu.dacite_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.dacite_spodumene_ore.prospected": "Spodumene", - "block.gtceu.dacite_stibnite_ore.prospected": "Stibnite", - "block.gtceu.dacite_sulfur_ore.prospected": "Sulfur", - "block.gtceu.dacite_sylvite_ore.prospected": "Sylvite", - "block.gtceu.dacite_talc_ore.prospected": "Talc", - "block.gtceu.dacite_tantalite_ore.prospected": "Tantalite", - "block.gtceu.dacite_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.dacite_thorium_ore.prospected": "Thorium", - "block.gtceu.dacite_tin_ore.prospected": "Tin", - "block.gtceu.dacite_topaz_ore.prospected": "Topaz", - "block.gtceu.dacite_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.dacite_trona_ore.prospected": "Trona", - "block.gtceu.dacite_tungstate_ore.prospected": "Tungstate", - "block.gtceu.dacite_uraninite_ore.prospected": "Uraninite", - "block.gtceu.dacite_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.dacite_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.dacite_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.dacite_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.dacite_zeolite_ore.prospected": "Zeolite", - "block.gtceu.diorite_almandine_ore.prospected": "Almandine", - "block.gtceu.diorite_aluminium_ore.prospected": "Aluminium", - "block.gtceu.diorite_alunite_ore.prospected": "Alunite", - "block.gtceu.diorite_amethyst_ore.prospected": "Amethyst", - "block.gtceu.diorite_apatite_ore.prospected": "Apatite", - "block.gtceu.diorite_asbestos_ore.prospected": "Asbestos", - "block.gtceu.diorite_barite_ore.prospected": "Barite", - "block.gtceu.diorite_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.diorite_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.diorite_bauxite_ore.prospected": "Bauxite", - "block.gtceu.diorite_bentonite_ore.prospected": "Bentonite", - "block.gtceu.diorite_beryllium_ore.prospected": "Beryllium", - "block.gtceu.diorite_bismuth_ore.prospected": "Bismuth", - "block.gtceu.diorite_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.diorite_borax_ore.prospected": "Borax", - "block.gtceu.diorite_bornite_ore.prospected": "Bornite", - "block.gtceu.diorite_calcite_ore.prospected": "Calcite", - "block.gtceu.diorite_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.diorite_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.diorite_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.diorite_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.diorite_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.diorite_chromite_ore.prospected": "Chromite", - "block.gtceu.diorite_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.diorite_coal_ore.prospected": "Coal", - "block.gtceu.diorite_cobalt_ore.prospected": "Cobalt", - "block.gtceu.diorite_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.diorite_cooperite_ore.prospected": "Cooperite", - "block.gtceu.diorite_copper_ore.prospected": "Copper", - "block.gtceu.diorite_diamond_ore.prospected": "Diamond", - "block.gtceu.diorite_diatomite_ore.prospected": "Diatomite", - "block.gtceu.diorite_electrotine_ore.prospected": "Electrotine", - "block.gtceu.diorite_emerald_ore.prospected": "Emerald", - "block.gtceu.diorite_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.diorite_galena_ore.prospected": "Galena", - "block.gtceu.diorite_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.diorite_garnierite_ore.prospected": "Garnierite", - "block.gtceu.diorite_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.diorite_goethite_ore.prospected": "Goethite", - "block.gtceu.diorite_gold_ore.prospected": "Gold", - "block.gtceu.diorite_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.diorite_graphite_ore.prospected": "Graphite", - "block.gtceu.diorite_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.diorite_grossular_ore.prospected": "Grossular", - "block.gtceu.diorite_gypsum_ore.prospected": "Gypsum", - "block.gtceu.diorite_hematite_ore.prospected": "Hematite", - "block.gtceu.diorite_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.diorite_iron_ore.prospected": "Iron", - "block.gtceu.diorite_kyanite_ore.prospected": "Kyanite", - "block.gtceu.diorite_lapis_ore.prospected": "Lapis", - "block.gtceu.diorite_lazurite_ore.prospected": "Lazurite", - "block.gtceu.diorite_lead_ore.prospected": "Lead", - "block.gtceu.diorite_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.diorite_lithium_ore.prospected": "Lithium", - "block.gtceu.diorite_magnesite_ore.prospected": "Magnesite", - "block.gtceu.diorite_magnetite_ore.prospected": "Magnetite", - "block.gtceu.diorite_malachite_ore.prospected": "Malachite", - "block.gtceu.diorite_mica_ore.prospected": "Mica", - "block.gtceu.diorite_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.diorite_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.diorite_monazite_ore.prospected": "Monazite", - "block.gtceu.diorite_naquadah_ore.prospected": "Naquadah", - "block.gtceu.diorite_neodymium_ore.prospected": "Neodymium", - "block.gtceu.diorite_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.diorite_nickel_ore.prospected": "Nickel", - "block.gtceu.diorite_oilsands_ore.prospected": "Oilsands", - "block.gtceu.diorite_olivine_ore.prospected": "Olivine", - "block.gtceu.diorite_opal_ore.prospected": "Opal", - "block.gtceu.diorite_palladium_ore.prospected": "Palladium", - "block.gtceu.diorite_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.diorite_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.diorite_platinum_ore.prospected": "Platinum", - "block.gtceu.diorite_plutonium_ore.prospected": "Plutonium", - "block.gtceu.diorite_pollucite_ore.prospected": "Pollucite", - "block.gtceu.diorite_powellite_ore.prospected": "Powellite", - "block.gtceu.diorite_pyrite_ore.prospected": "Pyrite", - "block.gtceu.diorite_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.diorite_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.diorite_pyrope_ore.prospected": "Pyrope", - "block.gtceu.diorite_quartzite_ore.prospected": "Quartzite", - "block.gtceu.diorite_realgar_ore.prospected": "Realgar", - "block.gtceu.diorite_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.diorite_redstone_ore.prospected": "Redstone", - "block.gtceu.diorite_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.diorite_ruby_ore.prospected": "Ruby", - "block.gtceu.diorite_salt_ore.prospected": "Salt", - "block.gtceu.diorite_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.diorite_sapphire_ore.prospected": "Sapphire", - "block.gtceu.diorite_scheelite_ore.prospected": "Scheelite", - "block.gtceu.diorite_silver_ore.prospected": "Silver", - "block.gtceu.diorite_soapstone_ore.prospected": "Soapstone", - "block.gtceu.diorite_sodalite_ore.prospected": "Sodalite", - "block.gtceu.diorite_spessartine_ore.prospected": "Spessartine", - "block.gtceu.diorite_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.diorite_spodumene_ore.prospected": "Spodumene", - "block.gtceu.diorite_stibnite_ore.prospected": "Stibnite", - "block.gtceu.diorite_sulfur_ore.prospected": "Sulfur", - "block.gtceu.diorite_sylvite_ore.prospected": "Sylvite", - "block.gtceu.diorite_talc_ore.prospected": "Talc", - "block.gtceu.diorite_tantalite_ore.prospected": "Tantalite", - "block.gtceu.diorite_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.diorite_thorium_ore.prospected": "Thorium", - "block.gtceu.diorite_tin_ore.prospected": "Tin", - "block.gtceu.diorite_topaz_ore.prospected": "Topaz", - "block.gtceu.diorite_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.diorite_trona_ore.prospected": "Trona", - "block.gtceu.diorite_tungstate_ore.prospected": "Tungstate", - "block.gtceu.diorite_uraninite_ore.prospected": "Uraninite", - "block.gtceu.diorite_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.diorite_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.diorite_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.diorite_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.diorite_zeolite_ore.prospected": "Zeolite", - "block.gtceu.dolomite_almandine_ore.prospected": "Almandine", - "block.gtceu.dolomite_aluminium_ore.prospected": "Aluminium", - "block.gtceu.dolomite_alunite_ore.prospected": "Alunite", - "block.gtceu.dolomite_amethyst_ore.prospected": "Amethyst", - "block.gtceu.dolomite_apatite_ore.prospected": "Apatite", - "block.gtceu.dolomite_asbestos_ore.prospected": "Asbestos", - "block.gtceu.dolomite_barite_ore.prospected": "Barite", - "block.gtceu.dolomite_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.dolomite_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.dolomite_bauxite_ore.prospected": "Bauxite", - "block.gtceu.dolomite_bentonite_ore.prospected": "Bentonite", - "block.gtceu.dolomite_beryllium_ore.prospected": "Beryllium", - "block.gtceu.dolomite_bismuth_ore.prospected": "Bismuth", - "block.gtceu.dolomite_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.dolomite_borax_ore.prospected": "Borax", - "block.gtceu.dolomite_bornite_ore.prospected": "Bornite", - "block.gtceu.dolomite_calcite_ore.prospected": "Calcite", - "block.gtceu.dolomite_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.dolomite_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.dolomite_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.dolomite_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.dolomite_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.dolomite_chromite_ore.prospected": "Chromite", - "block.gtceu.dolomite_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.dolomite_coal_ore.prospected": "Coal", - "block.gtceu.dolomite_cobalt_ore.prospected": "Cobalt", - "block.gtceu.dolomite_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.dolomite_cooperite_ore.prospected": "Cooperite", - "block.gtceu.dolomite_copper_ore.prospected": "Copper", - "block.gtceu.dolomite_diamond_ore.prospected": "Diamond", - "block.gtceu.dolomite_diatomite_ore.prospected": "Diatomite", - "block.gtceu.dolomite_electrotine_ore.prospected": "Electrotine", - "block.gtceu.dolomite_emerald_ore.prospected": "Emerald", - "block.gtceu.dolomite_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.dolomite_galena_ore.prospected": "Galena", - "block.gtceu.dolomite_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.dolomite_garnierite_ore.prospected": "Garnierite", - "block.gtceu.dolomite_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.dolomite_goethite_ore.prospected": "Goethite", - "block.gtceu.dolomite_gold_ore.prospected": "Gold", - "block.gtceu.dolomite_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.dolomite_graphite_ore.prospected": "Graphite", - "block.gtceu.dolomite_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.dolomite_grossular_ore.prospected": "Grossular", - "block.gtceu.dolomite_gypsum_ore.prospected": "Gypsum", - "block.gtceu.dolomite_hematite_ore.prospected": "Hematite", - "block.gtceu.dolomite_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.dolomite_iron_ore.prospected": "Iron", - "block.gtceu.dolomite_kyanite_ore.prospected": "Kyanite", - "block.gtceu.dolomite_lapis_ore.prospected": "Lapis", - "block.gtceu.dolomite_lazurite_ore.prospected": "Lazurite", - "block.gtceu.dolomite_lead_ore.prospected": "Lead", - "block.gtceu.dolomite_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.dolomite_lithium_ore.prospected": "Lithium", - "block.gtceu.dolomite_magnesite_ore.prospected": "Magnesite", - "block.gtceu.dolomite_magnetite_ore.prospected": "Magnetite", - "block.gtceu.dolomite_malachite_ore.prospected": "Malachite", - "block.gtceu.dolomite_mica_ore.prospected": "Mica", - "block.gtceu.dolomite_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.dolomite_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.dolomite_monazite_ore.prospected": "Monazite", - "block.gtceu.dolomite_naquadah_ore.prospected": "Naquadah", - "block.gtceu.dolomite_neodymium_ore.prospected": "Neodymium", - "block.gtceu.dolomite_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.dolomite_nickel_ore.prospected": "Nickel", - "block.gtceu.dolomite_oilsands_ore.prospected": "Oilsands", - "block.gtceu.dolomite_olivine_ore.prospected": "Olivine", - "block.gtceu.dolomite_opal_ore.prospected": "Opal", - "block.gtceu.dolomite_palladium_ore.prospected": "Palladium", - "block.gtceu.dolomite_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.dolomite_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.dolomite_platinum_ore.prospected": "Platinum", - "block.gtceu.dolomite_plutonium_ore.prospected": "Plutonium", - "block.gtceu.dolomite_pollucite_ore.prospected": "Pollucite", - "block.gtceu.dolomite_powellite_ore.prospected": "Powellite", - "block.gtceu.dolomite_pyrite_ore.prospected": "Pyrite", - "block.gtceu.dolomite_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.dolomite_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.dolomite_pyrope_ore.prospected": "Pyrope", - "block.gtceu.dolomite_quartzite_ore.prospected": "Quartzite", - "block.gtceu.dolomite_realgar_ore.prospected": "Realgar", - "block.gtceu.dolomite_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.dolomite_redstone_ore.prospected": "Redstone", - "block.gtceu.dolomite_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.dolomite_ruby_ore.prospected": "Ruby", - "block.gtceu.dolomite_salt_ore.prospected": "Salt", - "block.gtceu.dolomite_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.dolomite_sapphire_ore.prospected": "Sapphire", - "block.gtceu.dolomite_scheelite_ore.prospected": "Scheelite", - "block.gtceu.dolomite_silver_ore.prospected": "Silver", - "block.gtceu.dolomite_soapstone_ore.prospected": "Soapstone", - "block.gtceu.dolomite_sodalite_ore.prospected": "Sodalite", - "block.gtceu.dolomite_spessartine_ore.prospected": "Spessartine", - "block.gtceu.dolomite_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.dolomite_spodumene_ore.prospected": "Spodumene", - "block.gtceu.dolomite_stibnite_ore.prospected": "Stibnite", - "block.gtceu.dolomite_sulfur_ore.prospected": "Sulfur", - "block.gtceu.dolomite_sylvite_ore.prospected": "Sylvite", - "block.gtceu.dolomite_talc_ore.prospected": "Talc", - "block.gtceu.dolomite_tantalite_ore.prospected": "Tantalite", - "block.gtceu.dolomite_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.dolomite_thorium_ore.prospected": "Thorium", - "block.gtceu.dolomite_tin_ore.prospected": "Tin", - "block.gtceu.dolomite_topaz_ore.prospected": "Topaz", - "block.gtceu.dolomite_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.dolomite_trona_ore.prospected": "Trona", - "block.gtceu.dolomite_tungstate_ore.prospected": "Tungstate", - "block.gtceu.dolomite_uraninite_ore.prospected": "Uraninite", - "block.gtceu.dolomite_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.dolomite_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.dolomite_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.dolomite_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.dolomite_zeolite_ore.prospected": "Zeolite", - "block.gtceu.gabbro_almandine_ore.prospected": "Almandine", - "block.gtceu.gabbro_aluminium_ore.prospected": "Aluminium", - "block.gtceu.gabbro_alunite_ore.prospected": "Alunite", - "block.gtceu.gabbro_amethyst_ore.prospected": "Amethyst", - "block.gtceu.gabbro_apatite_ore.prospected": "Apatite", - "block.gtceu.gabbro_asbestos_ore.prospected": "Asbestos", - "block.gtceu.gabbro_barite_ore.prospected": "Barite", - "block.gtceu.gabbro_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.gabbro_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.gabbro_bauxite_ore.prospected": "Bauxite", - "block.gtceu.gabbro_bentonite_ore.prospected": "Bentonite", - "block.gtceu.gabbro_beryllium_ore.prospected": "Beryllium", - "block.gtceu.gabbro_bismuth_ore.prospected": "Bismuth", - "block.gtceu.gabbro_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.gabbro_borax_ore.prospected": "Borax", - "block.gtceu.gabbro_bornite_ore.prospected": "Bornite", - "block.gtceu.gabbro_calcite_ore.prospected": "Calcite", - "block.gtceu.gabbro_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.gabbro_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.gabbro_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.gabbro_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.gabbro_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.gabbro_chromite_ore.prospected": "Chromite", - "block.gtceu.gabbro_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.gabbro_coal_ore.prospected": "Coal", - "block.gtceu.gabbro_cobalt_ore.prospected": "Cobalt", - "block.gtceu.gabbro_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.gabbro_cooperite_ore.prospected": "Cooperite", - "block.gtceu.gabbro_copper_ore.prospected": "Copper", - "block.gtceu.gabbro_diamond_ore.prospected": "Diamond", - "block.gtceu.gabbro_diatomite_ore.prospected": "Diatomite", - "block.gtceu.gabbro_electrotine_ore.prospected": "Electrotine", - "block.gtceu.gabbro_emerald_ore.prospected": "Emerald", - "block.gtceu.gabbro_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.gabbro_galena_ore.prospected": "Galena", - "block.gtceu.gabbro_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.gabbro_garnierite_ore.prospected": "Garnierite", - "block.gtceu.gabbro_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.gabbro_goethite_ore.prospected": "Goethite", - "block.gtceu.gabbro_gold_ore.prospected": "Gold", - "block.gtceu.gabbro_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.gabbro_graphite_ore.prospected": "Graphite", - "block.gtceu.gabbro_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.gabbro_grossular_ore.prospected": "Grossular", - "block.gtceu.gabbro_gypsum_ore.prospected": "Gypsum", - "block.gtceu.gabbro_hematite_ore.prospected": "Hematite", - "block.gtceu.gabbro_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.gabbro_iron_ore.prospected": "Iron", - "block.gtceu.gabbro_kyanite_ore.prospected": "Kyanite", - "block.gtceu.gabbro_lapis_ore.prospected": "Lapis", - "block.gtceu.gabbro_lazurite_ore.prospected": "Lazurite", - "block.gtceu.gabbro_lead_ore.prospected": "Lead", - "block.gtceu.gabbro_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.gabbro_lithium_ore.prospected": "Lithium", - "block.gtceu.gabbro_magnesite_ore.prospected": "Magnesite", - "block.gtceu.gabbro_magnetite_ore.prospected": "Magnetite", - "block.gtceu.gabbro_malachite_ore.prospected": "Malachite", - "block.gtceu.gabbro_mica_ore.prospected": "Mica", - "block.gtceu.gabbro_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.gabbro_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.gabbro_monazite_ore.prospected": "Monazite", - "block.gtceu.gabbro_naquadah_ore.prospected": "Naquadah", - "block.gtceu.gabbro_neodymium_ore.prospected": "Neodymium", - "block.gtceu.gabbro_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.gabbro_nickel_ore.prospected": "Nickel", - "block.gtceu.gabbro_oilsands_ore.prospected": "Oilsands", - "block.gtceu.gabbro_olivine_ore.prospected": "Olivine", - "block.gtceu.gabbro_opal_ore.prospected": "Opal", - "block.gtceu.gabbro_palladium_ore.prospected": "Palladium", - "block.gtceu.gabbro_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.gabbro_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.gabbro_platinum_ore.prospected": "Platinum", - "block.gtceu.gabbro_plutonium_ore.prospected": "Plutonium", - "block.gtceu.gabbro_pollucite_ore.prospected": "Pollucite", - "block.gtceu.gabbro_powellite_ore.prospected": "Powellite", - "block.gtceu.gabbro_pyrite_ore.prospected": "Pyrite", - "block.gtceu.gabbro_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.gabbro_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.gabbro_pyrope_ore.prospected": "Pyrope", - "block.gtceu.gabbro_quartzite_ore.prospected": "Quartzite", - "block.gtceu.gabbro_realgar_ore.prospected": "Realgar", - "block.gtceu.gabbro_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.gabbro_redstone_ore.prospected": "Redstone", - "block.gtceu.gabbro_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.gabbro_ruby_ore.prospected": "Ruby", - "block.gtceu.gabbro_salt_ore.prospected": "Salt", - "block.gtceu.gabbro_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.gabbro_sapphire_ore.prospected": "Sapphire", - "block.gtceu.gabbro_scheelite_ore.prospected": "Scheelite", - "block.gtceu.gabbro_silver_ore.prospected": "Silver", - "block.gtceu.gabbro_soapstone_ore.prospected": "Soapstone", - "block.gtceu.gabbro_sodalite_ore.prospected": "Sodalite", - "block.gtceu.gabbro_spessartine_ore.prospected": "Spessartine", - "block.gtceu.gabbro_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.gabbro_spodumene_ore.prospected": "Spodumene", - "block.gtceu.gabbro_stibnite_ore.prospected": "Stibnite", - "block.gtceu.gabbro_sulfur_ore.prospected": "Sulfur", - "block.gtceu.gabbro_sylvite_ore.prospected": "Sylvite", - "block.gtceu.gabbro_talc_ore.prospected": "Talc", - "block.gtceu.gabbro_tantalite_ore.prospected": "Tantalite", - "block.gtceu.gabbro_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.gabbro_thorium_ore.prospected": "Thorium", - "block.gtceu.gabbro_tin_ore.prospected": "Tin", - "block.gtceu.gabbro_topaz_ore.prospected": "Topaz", - "block.gtceu.gabbro_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.gabbro_trona_ore.prospected": "Trona", - "block.gtceu.gabbro_tungstate_ore.prospected": "Tungstate", - "block.gtceu.gabbro_uraninite_ore.prospected": "Uraninite", - "block.gtceu.gabbro_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.gabbro_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.gabbro_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.gabbro_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.gabbro_zeolite_ore.prospected": "Zeolite", - "block.gtceu.gneiss_almandine_ore.prospected": "Almandine", - "block.gtceu.gneiss_aluminium_ore.prospected": "Aluminium", - "block.gtceu.gneiss_alunite_ore.prospected": "Alunite", - "block.gtceu.gneiss_amethyst_ore.prospected": "Amethyst", - "block.gtceu.gneiss_apatite_ore.prospected": "Apatite", - "block.gtceu.gneiss_asbestos_ore.prospected": "Asbestos", - "block.gtceu.gneiss_barite_ore.prospected": "Barite", - "block.gtceu.gneiss_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.gneiss_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.gneiss_bauxite_ore.prospected": "Bauxite", - "block.gtceu.gneiss_bentonite_ore.prospected": "Bentonite", - "block.gtceu.gneiss_beryllium_ore.prospected": "Beryllium", - "block.gtceu.gneiss_bismuth_ore.prospected": "Bismuth", - "block.gtceu.gneiss_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.gneiss_borax_ore.prospected": "Borax", - "block.gtceu.gneiss_bornite_ore.prospected": "Bornite", - "block.gtceu.gneiss_calcite_ore.prospected": "Calcite", - "block.gtceu.gneiss_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.gneiss_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.gneiss_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.gneiss_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.gneiss_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.gneiss_chromite_ore.prospected": "Chromite", - "block.gtceu.gneiss_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.gneiss_coal_ore.prospected": "Coal", - "block.gtceu.gneiss_cobalt_ore.prospected": "Cobalt", - "block.gtceu.gneiss_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.gneiss_cooperite_ore.prospected": "Cooperite", - "block.gtceu.gneiss_copper_ore.prospected": "Copper", - "block.gtceu.gneiss_diamond_ore.prospected": "Diamond", - "block.gtceu.gneiss_diatomite_ore.prospected": "Diatomite", - "block.gtceu.gneiss_electrotine_ore.prospected": "Electrotine", - "block.gtceu.gneiss_emerald_ore.prospected": "Emerald", - "block.gtceu.gneiss_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.gneiss_galena_ore.prospected": "Galena", - "block.gtceu.gneiss_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.gneiss_garnierite_ore.prospected": "Garnierite", - "block.gtceu.gneiss_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.gneiss_goethite_ore.prospected": "Goethite", - "block.gtceu.gneiss_gold_ore.prospected": "Gold", - "block.gtceu.gneiss_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.gneiss_graphite_ore.prospected": "Graphite", - "block.gtceu.gneiss_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.gneiss_grossular_ore.prospected": "Grossular", - "block.gtceu.gneiss_gypsum_ore.prospected": "Gypsum", - "block.gtceu.gneiss_hematite_ore.prospected": "Hematite", - "block.gtceu.gneiss_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.gneiss_iron_ore.prospected": "Iron", - "block.gtceu.gneiss_kyanite_ore.prospected": "Kyanite", - "block.gtceu.gneiss_lapis_ore.prospected": "Lapis", - "block.gtceu.gneiss_lazurite_ore.prospected": "Lazurite", - "block.gtceu.gneiss_lead_ore.prospected": "Lead", - "block.gtceu.gneiss_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.gneiss_lithium_ore.prospected": "Lithium", - "block.gtceu.gneiss_magnesite_ore.prospected": "Magnesite", - "block.gtceu.gneiss_magnetite_ore.prospected": "Magnetite", - "block.gtceu.gneiss_malachite_ore.prospected": "Malachite", - "block.gtceu.gneiss_mica_ore.prospected": "Mica", - "block.gtceu.gneiss_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.gneiss_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.gneiss_monazite_ore.prospected": "Monazite", - "block.gtceu.gneiss_naquadah_ore.prospected": "Naquadah", - "block.gtceu.gneiss_neodymium_ore.prospected": "Neodymium", - "block.gtceu.gneiss_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.gneiss_nickel_ore.prospected": "Nickel", - "block.gtceu.gneiss_oilsands_ore.prospected": "Oilsands", - "block.gtceu.gneiss_olivine_ore.prospected": "Olivine", - "block.gtceu.gneiss_opal_ore.prospected": "Opal", - "block.gtceu.gneiss_palladium_ore.prospected": "Palladium", - "block.gtceu.gneiss_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.gneiss_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.gneiss_platinum_ore.prospected": "Platinum", - "block.gtceu.gneiss_plutonium_ore.prospected": "Plutonium", - "block.gtceu.gneiss_pollucite_ore.prospected": "Pollucite", - "block.gtceu.gneiss_powellite_ore.prospected": "Powellite", - "block.gtceu.gneiss_pyrite_ore.prospected": "Pyrite", - "block.gtceu.gneiss_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.gneiss_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.gneiss_pyrope_ore.prospected": "Pyrope", - "block.gtceu.gneiss_quartzite_ore.prospected": "Quartzite", - "block.gtceu.gneiss_realgar_ore.prospected": "Realgar", - "block.gtceu.gneiss_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.gneiss_redstone_ore.prospected": "Redstone", - "block.gtceu.gneiss_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.gneiss_ruby_ore.prospected": "Ruby", - "block.gtceu.gneiss_salt_ore.prospected": "Salt", - "block.gtceu.gneiss_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.gneiss_sapphire_ore.prospected": "Sapphire", - "block.gtceu.gneiss_scheelite_ore.prospected": "Scheelite", - "block.gtceu.gneiss_silver_ore.prospected": "Silver", - "block.gtceu.gneiss_soapstone_ore.prospected": "Soapstone", - "block.gtceu.gneiss_sodalite_ore.prospected": "Sodalite", - "block.gtceu.gneiss_spessartine_ore.prospected": "Spessartine", - "block.gtceu.gneiss_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.gneiss_spodumene_ore.prospected": "Spodumene", - "block.gtceu.gneiss_stibnite_ore.prospected": "Stibnite", - "block.gtceu.gneiss_sulfur_ore.prospected": "Sulfur", - "block.gtceu.gneiss_sylvite_ore.prospected": "Sylvite", - "block.gtceu.gneiss_talc_ore.prospected": "Talc", - "block.gtceu.gneiss_tantalite_ore.prospected": "Tantalite", - "block.gtceu.gneiss_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.gneiss_thorium_ore.prospected": "Thorium", - "block.gtceu.gneiss_tin_ore.prospected": "Tin", - "block.gtceu.gneiss_topaz_ore.prospected": "Topaz", - "block.gtceu.gneiss_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.gneiss_trona_ore.prospected": "Trona", - "block.gtceu.gneiss_tungstate_ore.prospected": "Tungstate", - "block.gtceu.gneiss_uraninite_ore.prospected": "Uraninite", - "block.gtceu.gneiss_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.gneiss_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.gneiss_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.gneiss_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.gneiss_zeolite_ore.prospected": "Zeolite", - "block.gtceu.granite_almandine_ore.prospected": "Almandine", - "block.gtceu.granite_aluminium_ore.prospected": "Aluminium", - "block.gtceu.granite_alunite_ore.prospected": "Alunite", - "block.gtceu.granite_amethyst_ore.prospected": "Amethyst", - "block.gtceu.granite_apatite_ore.prospected": "Apatite", - "block.gtceu.granite_asbestos_ore.prospected": "Asbestos", - "block.gtceu.granite_barite_ore.prospected": "Barite", - "block.gtceu.granite_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.granite_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.granite_bauxite_ore.prospected": "Bauxite", - "block.gtceu.granite_bentonite_ore.prospected": "Bentonite", - "block.gtceu.granite_beryllium_ore.prospected": "Beryllium", - "block.gtceu.granite_bismuth_ore.prospected": "Bismuth", - "block.gtceu.granite_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.granite_borax_ore.prospected": "Borax", - "block.gtceu.granite_bornite_ore.prospected": "Bornite", - "block.gtceu.granite_calcite_ore.prospected": "Calcite", - "block.gtceu.granite_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.granite_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.granite_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.granite_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.granite_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.granite_chromite_ore.prospected": "Chromite", - "block.gtceu.granite_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.granite_coal_ore.prospected": "Coal", - "block.gtceu.granite_cobalt_ore.prospected": "Cobalt", - "block.gtceu.granite_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.granite_cooperite_ore.prospected": "Cooperite", - "block.gtceu.granite_copper_ore.prospected": "Copper", - "block.gtceu.granite_diamond_ore.prospected": "Diamond", - "block.gtceu.granite_diatomite_ore.prospected": "Diatomite", - "block.gtceu.granite_electrotine_ore.prospected": "Electrotine", - "block.gtceu.granite_emerald_ore.prospected": "Emerald", - "block.gtceu.granite_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.granite_galena_ore.prospected": "Galena", - "block.gtceu.granite_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.granite_garnierite_ore.prospected": "Garnierite", - "block.gtceu.granite_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.granite_goethite_ore.prospected": "Goethite", - "block.gtceu.granite_gold_ore.prospected": "Gold", - "block.gtceu.granite_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.granite_graphite_ore.prospected": "Graphite", - "block.gtceu.granite_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.granite_grossular_ore.prospected": "Grossular", - "block.gtceu.granite_gypsum_ore.prospected": "Gypsum", - "block.gtceu.granite_hematite_ore.prospected": "Hematite", - "block.gtceu.granite_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.granite_iron_ore.prospected": "Iron", - "block.gtceu.granite_kyanite_ore.prospected": "Kyanite", - "block.gtceu.granite_lapis_ore.prospected": "Lapis", - "block.gtceu.granite_lazurite_ore.prospected": "Lazurite", - "block.gtceu.granite_lead_ore.prospected": "Lead", - "block.gtceu.granite_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.granite_lithium_ore.prospected": "Lithium", - "block.gtceu.granite_magnesite_ore.prospected": "Magnesite", - "block.gtceu.granite_magnetite_ore.prospected": "Magnetite", - "block.gtceu.granite_malachite_ore.prospected": "Malachite", - "block.gtceu.granite_mica_ore.prospected": "Mica", - "block.gtceu.granite_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.granite_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.granite_monazite_ore.prospected": "Monazite", - "block.gtceu.granite_naquadah_ore.prospected": "Naquadah", - "block.gtceu.granite_neodymium_ore.prospected": "Neodymium", - "block.gtceu.granite_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.granite_nickel_ore.prospected": "Nickel", - "block.gtceu.granite_oilsands_ore.prospected": "Oilsands", - "block.gtceu.granite_olivine_ore.prospected": "Olivine", - "block.gtceu.granite_opal_ore.prospected": "Opal", - "block.gtceu.granite_palladium_ore.prospected": "Palladium", - "block.gtceu.granite_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.granite_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.granite_platinum_ore.prospected": "Platinum", - "block.gtceu.granite_plutonium_ore.prospected": "Plutonium", - "block.gtceu.granite_pollucite_ore.prospected": "Pollucite", - "block.gtceu.granite_powellite_ore.prospected": "Powellite", - "block.gtceu.granite_pyrite_ore.prospected": "Pyrite", - "block.gtceu.granite_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.granite_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.granite_pyrope_ore.prospected": "Pyrope", - "block.gtceu.granite_quartzite_ore.prospected": "Quartzite", - "block.gtceu.granite_realgar_ore.prospected": "Realgar", - "block.gtceu.granite_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.granite_redstone_ore.prospected": "Redstone", - "block.gtceu.granite_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.granite_ruby_ore.prospected": "Ruby", - "block.gtceu.granite_salt_ore.prospected": "Salt", - "block.gtceu.granite_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.granite_sapphire_ore.prospected": "Sapphire", - "block.gtceu.granite_scheelite_ore.prospected": "Scheelite", - "block.gtceu.granite_silver_ore.prospected": "Silver", - "block.gtceu.granite_soapstone_ore.prospected": "Soapstone", - "block.gtceu.granite_sodalite_ore.prospected": "Sodalite", - "block.gtceu.granite_spessartine_ore.prospected": "Spessartine", - "block.gtceu.granite_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.granite_spodumene_ore.prospected": "Spodumene", - "block.gtceu.granite_stibnite_ore.prospected": "Stibnite", - "block.gtceu.granite_sulfur_ore.prospected": "Sulfur", - "block.gtceu.granite_sylvite_ore.prospected": "Sylvite", - "block.gtceu.granite_talc_ore.prospected": "Talc", - "block.gtceu.granite_tantalite_ore.prospected": "Tantalite", - "block.gtceu.granite_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.granite_thorium_ore.prospected": "Thorium", - "block.gtceu.granite_tin_ore.prospected": "Tin", - "block.gtceu.granite_topaz_ore.prospected": "Topaz", - "block.gtceu.granite_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.granite_trona_ore.prospected": "Trona", - "block.gtceu.granite_tungstate_ore.prospected": "Tungstate", - "block.gtceu.granite_uraninite_ore.prospected": "Uraninite", - "block.gtceu.granite_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.granite_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.granite_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.granite_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.granite_zeolite_ore.prospected": "Zeolite", - "block.gtceu.limestone_almandine_ore.prospected": "Almandine", - "block.gtceu.limestone_aluminium_ore.prospected": "Aluminium", - "block.gtceu.limestone_alunite_ore.prospected": "Alunite", - "block.gtceu.limestone_amethyst_ore.prospected": "Amethyst", - "block.gtceu.limestone_apatite_ore.prospected": "Apatite", - "block.gtceu.limestone_asbestos_ore.prospected": "Asbestos", - "block.gtceu.limestone_barite_ore.prospected": "Barite", - "block.gtceu.limestone_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.limestone_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.limestone_bauxite_ore.prospected": "Bauxite", - "block.gtceu.limestone_bentonite_ore.prospected": "Bentonite", - "block.gtceu.limestone_beryllium_ore.prospected": "Beryllium", - "block.gtceu.limestone_bismuth_ore.prospected": "Bismuth", - "block.gtceu.limestone_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.limestone_borax_ore.prospected": "Borax", - "block.gtceu.limestone_bornite_ore.prospected": "Bornite", - "block.gtceu.limestone_calcite_ore.prospected": "Calcite", - "block.gtceu.limestone_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.limestone_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.limestone_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.limestone_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.limestone_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.limestone_chromite_ore.prospected": "Chromite", - "block.gtceu.limestone_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.limestone_coal_ore.prospected": "Coal", - "block.gtceu.limestone_cobalt_ore.prospected": "Cobalt", - "block.gtceu.limestone_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.limestone_cooperite_ore.prospected": "Cooperite", - "block.gtceu.limestone_copper_ore.prospected": "Copper", - "block.gtceu.limestone_diamond_ore.prospected": "Diamond", - "block.gtceu.limestone_diatomite_ore.prospected": "Diatomite", - "block.gtceu.limestone_electrotine_ore.prospected": "Electrotine", - "block.gtceu.limestone_emerald_ore.prospected": "Emerald", - "block.gtceu.limestone_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.limestone_galena_ore.prospected": "Galena", - "block.gtceu.limestone_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.limestone_garnierite_ore.prospected": "Garnierite", - "block.gtceu.limestone_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.limestone_goethite_ore.prospected": "Goethite", - "block.gtceu.limestone_gold_ore.prospected": "Gold", - "block.gtceu.limestone_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.limestone_graphite_ore.prospected": "Graphite", - "block.gtceu.limestone_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.limestone_grossular_ore.prospected": "Grossular", - "block.gtceu.limestone_gypsum_ore.prospected": "Gypsum", - "block.gtceu.limestone_hematite_ore.prospected": "Hematite", - "block.gtceu.limestone_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.limestone_iron_ore.prospected": "Iron", - "block.gtceu.limestone_kyanite_ore.prospected": "Kyanite", - "block.gtceu.limestone_lapis_ore.prospected": "Lapis", - "block.gtceu.limestone_lazurite_ore.prospected": "Lazurite", - "block.gtceu.limestone_lead_ore.prospected": "Lead", - "block.gtceu.limestone_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.limestone_lithium_ore.prospected": "Lithium", - "block.gtceu.limestone_magnesite_ore.prospected": "Magnesite", - "block.gtceu.limestone_magnetite_ore.prospected": "Magnetite", - "block.gtceu.limestone_malachite_ore.prospected": "Malachite", - "block.gtceu.limestone_mica_ore.prospected": "Mica", - "block.gtceu.limestone_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.limestone_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.limestone_monazite_ore.prospected": "Monazite", - "block.gtceu.limestone_naquadah_ore.prospected": "Naquadah", - "block.gtceu.limestone_neodymium_ore.prospected": "Neodymium", - "block.gtceu.limestone_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.limestone_nickel_ore.prospected": "Nickel", - "block.gtceu.limestone_oilsands_ore.prospected": "Oilsands", - "block.gtceu.limestone_olivine_ore.prospected": "Olivine", - "block.gtceu.limestone_opal_ore.prospected": "Opal", - "block.gtceu.limestone_palladium_ore.prospected": "Palladium", - "block.gtceu.limestone_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.limestone_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.limestone_platinum_ore.prospected": "Platinum", - "block.gtceu.limestone_plutonium_ore.prospected": "Plutonium", - "block.gtceu.limestone_pollucite_ore.prospected": "Pollucite", - "block.gtceu.limestone_powellite_ore.prospected": "Powellite", - "block.gtceu.limestone_pyrite_ore.prospected": "Pyrite", - "block.gtceu.limestone_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.limestone_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.limestone_pyrope_ore.prospected": "Pyrope", - "block.gtceu.limestone_quartzite_ore.prospected": "Quartzite", - "block.gtceu.limestone_realgar_ore.prospected": "Realgar", - "block.gtceu.limestone_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.limestone_redstone_ore.prospected": "Redstone", - "block.gtceu.limestone_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.limestone_ruby_ore.prospected": "Ruby", - "block.gtceu.limestone_salt_ore.prospected": "Salt", - "block.gtceu.limestone_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.limestone_sapphire_ore.prospected": "Sapphire", - "block.gtceu.limestone_scheelite_ore.prospected": "Scheelite", - "block.gtceu.limestone_silver_ore.prospected": "Silver", - "block.gtceu.limestone_soapstone_ore.prospected": "Soapstone", - "block.gtceu.limestone_sodalite_ore.prospected": "Sodalite", - "block.gtceu.limestone_spessartine_ore.prospected": "Spessartine", - "block.gtceu.limestone_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.limestone_spodumene_ore.prospected": "Spodumene", - "block.gtceu.limestone_stibnite_ore.prospected": "Stibnite", - "block.gtceu.limestone_sulfur_ore.prospected": "Sulfur", - "block.gtceu.limestone_sylvite_ore.prospected": "Sylvite", - "block.gtceu.limestone_talc_ore.prospected": "Talc", - "block.gtceu.limestone_tantalite_ore.prospected": "Tantalite", - "block.gtceu.limestone_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.limestone_thorium_ore.prospected": "Thorium", - "block.gtceu.limestone_tin_ore.prospected": "Tin", - "block.gtceu.limestone_topaz_ore.prospected": "Topaz", - "block.gtceu.limestone_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.limestone_trona_ore.prospected": "Trona", - "block.gtceu.limestone_tungstate_ore.prospected": "Tungstate", - "block.gtceu.limestone_uraninite_ore.prospected": "Uraninite", - "block.gtceu.limestone_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.limestone_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.limestone_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.limestone_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.limestone_zeolite_ore.prospected": "Zeolite", - "block.gtceu.marble_almandine_ore.prospected": "Almandine", - "block.gtceu.marble_aluminium_ore.prospected": "Aluminium", - "block.gtceu.marble_alunite_ore.prospected": "Alunite", - "block.gtceu.marble_amethyst_ore.prospected": "Amethyst", - "block.gtceu.marble_apatite_ore.prospected": "Apatite", - "block.gtceu.marble_asbestos_ore.prospected": "Asbestos", - "block.gtceu.marble_barite_ore.prospected": "Barite", - "block.gtceu.marble_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.marble_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.marble_bauxite_ore.prospected": "Bauxite", - "block.gtceu.marble_bentonite_ore.prospected": "Bentonite", - "block.gtceu.marble_beryllium_ore.prospected": "Beryllium", - "block.gtceu.marble_bismuth_ore.prospected": "Bismuth", - "block.gtceu.marble_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.marble_borax_ore.prospected": "Borax", - "block.gtceu.marble_bornite_ore.prospected": "Bornite", - "block.gtceu.marble_calcite_ore.prospected": "Calcite", - "block.gtceu.marble_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.marble_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.marble_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.marble_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.marble_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.marble_chromite_ore.prospected": "Chromite", - "block.gtceu.marble_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.marble_coal_ore.prospected": "Coal", - "block.gtceu.marble_cobalt_ore.prospected": "Cobalt", - "block.gtceu.marble_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.marble_cooperite_ore.prospected": "Cooperite", - "block.gtceu.marble_copper_ore.prospected": "Copper", - "block.gtceu.marble_diamond_ore.prospected": "Diamond", - "block.gtceu.marble_diatomite_ore.prospected": "Diatomite", - "block.gtceu.marble_electrotine_ore.prospected": "Electrotine", - "block.gtceu.marble_emerald_ore.prospected": "Emerald", - "block.gtceu.marble_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.marble_galena_ore.prospected": "Galena", - "block.gtceu.marble_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.marble_garnierite_ore.prospected": "Garnierite", - "block.gtceu.marble_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.marble_goethite_ore.prospected": "Goethite", - "block.gtceu.marble_gold_ore.prospected": "Gold", - "block.gtceu.marble_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.marble_graphite_ore.prospected": "Graphite", - "block.gtceu.marble_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.marble_grossular_ore.prospected": "Grossular", - "block.gtceu.marble_gypsum_ore.prospected": "Gypsum", - "block.gtceu.marble_hematite_ore.prospected": "Hematite", - "block.gtceu.marble_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.marble_iron_ore.prospected": "Iron", - "block.gtceu.marble_kyanite_ore.prospected": "Kyanite", - "block.gtceu.marble_lapis_ore.prospected": "Lapis", - "block.gtceu.marble_lazurite_ore.prospected": "Lazurite", - "block.gtceu.marble_lead_ore.prospected": "Lead", - "block.gtceu.marble_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.marble_lithium_ore.prospected": "Lithium", - "block.gtceu.marble_magnesite_ore.prospected": "Magnesite", - "block.gtceu.marble_magnetite_ore.prospected": "Magnetite", - "block.gtceu.marble_malachite_ore.prospected": "Malachite", - "block.gtceu.marble_mica_ore.prospected": "Mica", - "block.gtceu.marble_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.marble_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.marble_monazite_ore.prospected": "Monazite", - "block.gtceu.marble_naquadah_ore.prospected": "Naquadah", - "block.gtceu.marble_neodymium_ore.prospected": "Neodymium", - "block.gtceu.marble_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.marble_nickel_ore.prospected": "Nickel", - "block.gtceu.marble_oilsands_ore.prospected": "Oilsands", - "block.gtceu.marble_olivine_ore.prospected": "Olivine", - "block.gtceu.marble_opal_ore.prospected": "Opal", - "block.gtceu.marble_palladium_ore.prospected": "Palladium", - "block.gtceu.marble_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.marble_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.marble_platinum_ore.prospected": "Platinum", - "block.gtceu.marble_plutonium_ore.prospected": "Plutonium", - "block.gtceu.marble_pollucite_ore.prospected": "Pollucite", - "block.gtceu.marble_powellite_ore.prospected": "Powellite", - "block.gtceu.marble_pyrite_ore.prospected": "Pyrite", - "block.gtceu.marble_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.marble_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.marble_pyrope_ore.prospected": "Pyrope", - "block.gtceu.marble_quartzite_ore.prospected": "Quartzite", - "block.gtceu.marble_realgar_ore.prospected": "Realgar", - "block.gtceu.marble_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.marble_redstone_ore.prospected": "Redstone", - "block.gtceu.marble_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.marble_ruby_ore.prospected": "Ruby", - "block.gtceu.marble_salt_ore.prospected": "Salt", - "block.gtceu.marble_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.marble_sapphire_ore.prospected": "Sapphire", - "block.gtceu.marble_scheelite_ore.prospected": "Scheelite", - "block.gtceu.marble_silver_ore.prospected": "Silver", - "block.gtceu.marble_soapstone_ore.prospected": "Soapstone", - "block.gtceu.marble_sodalite_ore.prospected": "Sodalite", - "block.gtceu.marble_spessartine_ore.prospected": "Spessartine", - "block.gtceu.marble_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.marble_spodumene_ore.prospected": "Spodumene", - "block.gtceu.marble_stibnite_ore.prospected": "Stibnite", - "block.gtceu.marble_sulfur_ore.prospected": "Sulfur", - "block.gtceu.marble_sylvite_ore.prospected": "Sylvite", - "block.gtceu.marble_talc_ore.prospected": "Talc", - "block.gtceu.marble_tantalite_ore.prospected": "Tantalite", - "block.gtceu.marble_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.marble_thorium_ore.prospected": "Thorium", - "block.gtceu.marble_tin_ore.prospected": "Tin", - "block.gtceu.marble_topaz_ore.prospected": "Topaz", - "block.gtceu.marble_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.marble_trona_ore.prospected": "Trona", - "block.gtceu.marble_tungstate_ore.prospected": "Tungstate", - "block.gtceu.marble_uraninite_ore.prospected": "Uraninite", - "block.gtceu.marble_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.marble_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.marble_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.marble_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.marble_zeolite_ore.prospected": "Zeolite", - "block.gtceu.phyllite_almandine_ore.prospected": "Almandine", - "block.gtceu.phyllite_aluminium_ore.prospected": "Aluminium", - "block.gtceu.phyllite_alunite_ore.prospected": "Alunite", - "block.gtceu.phyllite_amethyst_ore.prospected": "Amethyst", - "block.gtceu.phyllite_apatite_ore.prospected": "Apatite", - "block.gtceu.phyllite_asbestos_ore.prospected": "Asbestos", - "block.gtceu.phyllite_barite_ore.prospected": "Barite", - "block.gtceu.phyllite_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.phyllite_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.phyllite_bauxite_ore.prospected": "Bauxite", - "block.gtceu.phyllite_bentonite_ore.prospected": "Bentonite", - "block.gtceu.phyllite_beryllium_ore.prospected": "Beryllium", - "block.gtceu.phyllite_bismuth_ore.prospected": "Bismuth", - "block.gtceu.phyllite_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.phyllite_borax_ore.prospected": "Borax", - "block.gtceu.phyllite_bornite_ore.prospected": "Bornite", - "block.gtceu.phyllite_calcite_ore.prospected": "Calcite", - "block.gtceu.phyllite_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.phyllite_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.phyllite_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.phyllite_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.phyllite_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.phyllite_chromite_ore.prospected": "Chromite", - "block.gtceu.phyllite_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.phyllite_coal_ore.prospected": "Coal", - "block.gtceu.phyllite_cobalt_ore.prospected": "Cobalt", - "block.gtceu.phyllite_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.phyllite_cooperite_ore.prospected": "Cooperite", - "block.gtceu.phyllite_copper_ore.prospected": "Copper", - "block.gtceu.phyllite_diamond_ore.prospected": "Diamond", - "block.gtceu.phyllite_diatomite_ore.prospected": "Diatomite", - "block.gtceu.phyllite_electrotine_ore.prospected": "Electrotine", - "block.gtceu.phyllite_emerald_ore.prospected": "Emerald", - "block.gtceu.phyllite_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.phyllite_galena_ore.prospected": "Galena", - "block.gtceu.phyllite_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.phyllite_garnierite_ore.prospected": "Garnierite", - "block.gtceu.phyllite_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.phyllite_goethite_ore.prospected": "Goethite", - "block.gtceu.phyllite_gold_ore.prospected": "Gold", - "block.gtceu.phyllite_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.phyllite_graphite_ore.prospected": "Graphite", - "block.gtceu.phyllite_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.phyllite_grossular_ore.prospected": "Grossular", - "block.gtceu.phyllite_gypsum_ore.prospected": "Gypsum", - "block.gtceu.phyllite_hematite_ore.prospected": "Hematite", - "block.gtceu.phyllite_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.phyllite_iron_ore.prospected": "Iron", - "block.gtceu.phyllite_kyanite_ore.prospected": "Kyanite", - "block.gtceu.phyllite_lapis_ore.prospected": "Lapis", - "block.gtceu.phyllite_lazurite_ore.prospected": "Lazurite", - "block.gtceu.phyllite_lead_ore.prospected": "Lead", - "block.gtceu.phyllite_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.phyllite_lithium_ore.prospected": "Lithium", - "block.gtceu.phyllite_magnesite_ore.prospected": "Magnesite", - "block.gtceu.phyllite_magnetite_ore.prospected": "Magnetite", - "block.gtceu.phyllite_malachite_ore.prospected": "Malachite", - "block.gtceu.phyllite_mica_ore.prospected": "Mica", - "block.gtceu.phyllite_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.phyllite_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.phyllite_monazite_ore.prospected": "Monazite", - "block.gtceu.phyllite_naquadah_ore.prospected": "Naquadah", - "block.gtceu.phyllite_neodymium_ore.prospected": "Neodymium", - "block.gtceu.phyllite_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.phyllite_nickel_ore.prospected": "Nickel", - "block.gtceu.phyllite_oilsands_ore.prospected": "Oilsands", - "block.gtceu.phyllite_olivine_ore.prospected": "Olivine", - "block.gtceu.phyllite_opal_ore.prospected": "Opal", - "block.gtceu.phyllite_palladium_ore.prospected": "Palladium", - "block.gtceu.phyllite_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.phyllite_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.phyllite_platinum_ore.prospected": "Platinum", - "block.gtceu.phyllite_plutonium_ore.prospected": "Plutonium", - "block.gtceu.phyllite_pollucite_ore.prospected": "Pollucite", - "block.gtceu.phyllite_powellite_ore.prospected": "Powellite", - "block.gtceu.phyllite_pyrite_ore.prospected": "Pyrite", - "block.gtceu.phyllite_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.phyllite_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.phyllite_pyrope_ore.prospected": "Pyrope", - "block.gtceu.phyllite_quartzite_ore.prospected": "Quartzite", - "block.gtceu.phyllite_realgar_ore.prospected": "Realgar", - "block.gtceu.phyllite_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.phyllite_redstone_ore.prospected": "Redstone", - "block.gtceu.phyllite_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.phyllite_ruby_ore.prospected": "Ruby", - "block.gtceu.phyllite_salt_ore.prospected": "Salt", - "block.gtceu.phyllite_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.phyllite_sapphire_ore.prospected": "Sapphire", - "block.gtceu.phyllite_scheelite_ore.prospected": "Scheelite", - "block.gtceu.phyllite_silver_ore.prospected": "Silver", - "block.gtceu.phyllite_soapstone_ore.prospected": "Soapstone", - "block.gtceu.phyllite_sodalite_ore.prospected": "Sodalite", - "block.gtceu.phyllite_spessartine_ore.prospected": "Spessartine", - "block.gtceu.phyllite_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.phyllite_spodumene_ore.prospected": "Spodumene", - "block.gtceu.phyllite_stibnite_ore.prospected": "Stibnite", - "block.gtceu.phyllite_sulfur_ore.prospected": "Sulfur", - "block.gtceu.phyllite_sylvite_ore.prospected": "Sylvite", - "block.gtceu.phyllite_talc_ore.prospected": "Talc", - "block.gtceu.phyllite_tantalite_ore.prospected": "Tantalite", - "block.gtceu.phyllite_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.phyllite_thorium_ore.prospected": "Thorium", - "block.gtceu.phyllite_tin_ore.prospected": "Tin", - "block.gtceu.phyllite_topaz_ore.prospected": "Topaz", - "block.gtceu.phyllite_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.phyllite_trona_ore.prospected": "Trona", - "block.gtceu.phyllite_tungstate_ore.prospected": "Tungstate", - "block.gtceu.phyllite_uraninite_ore.prospected": "Uraninite", - "block.gtceu.phyllite_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.phyllite_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.phyllite_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.phyllite_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.phyllite_zeolite_ore.prospected": "Zeolite", - "block.gtceu.quartzite_almandine_ore.prospected": "Almandine", - "block.gtceu.quartzite_aluminium_ore.prospected": "Aluminium", - "block.gtceu.quartzite_alunite_ore.prospected": "Alunite", - "block.gtceu.quartzite_amethyst_ore.prospected": "Amethyst", - "block.gtceu.quartzite_apatite_ore.prospected": "Apatite", - "block.gtceu.quartzite_asbestos_ore.prospected": "Asbestos", - "block.gtceu.quartzite_barite_ore.prospected": "Barite", - "block.gtceu.quartzite_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.quartzite_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.quartzite_bauxite_ore.prospected": "Bauxite", - "block.gtceu.quartzite_bentonite_ore.prospected": "Bentonite", - "block.gtceu.quartzite_beryllium_ore.prospected": "Beryllium", - "block.gtceu.quartzite_bismuth_ore.prospected": "Bismuth", - "block.gtceu.quartzite_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.quartzite_borax_ore.prospected": "Borax", - "block.gtceu.quartzite_bornite_ore.prospected": "Bornite", - "block.gtceu.quartzite_calcite_ore.prospected": "Calcite", - "block.gtceu.quartzite_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.quartzite_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.quartzite_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.quartzite_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.quartzite_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.quartzite_chromite_ore.prospected": "Chromite", - "block.gtceu.quartzite_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.quartzite_coal_ore.prospected": "Coal", - "block.gtceu.quartzite_cobalt_ore.prospected": "Cobalt", - "block.gtceu.quartzite_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.quartzite_cooperite_ore.prospected": "Cooperite", - "block.gtceu.quartzite_copper_ore.prospected": "Copper", - "block.gtceu.quartzite_diamond_ore.prospected": "Diamond", - "block.gtceu.quartzite_diatomite_ore.prospected": "Diatomite", - "block.gtceu.quartzite_electrotine_ore.prospected": "Electrotine", - "block.gtceu.quartzite_emerald_ore.prospected": "Emerald", - "block.gtceu.quartzite_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.quartzite_galena_ore.prospected": "Galena", - "block.gtceu.quartzite_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.quartzite_garnierite_ore.prospected": "Garnierite", - "block.gtceu.quartzite_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.quartzite_goethite_ore.prospected": "Goethite", - "block.gtceu.quartzite_gold_ore.prospected": "Gold", - "block.gtceu.quartzite_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.quartzite_graphite_ore.prospected": "Graphite", - "block.gtceu.quartzite_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.quartzite_grossular_ore.prospected": "Grossular", - "block.gtceu.quartzite_gypsum_ore.prospected": "Gypsum", - "block.gtceu.quartzite_hematite_ore.prospected": "Hematite", - "block.gtceu.quartzite_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.quartzite_iron_ore.prospected": "Iron", - "block.gtceu.quartzite_kyanite_ore.prospected": "Kyanite", - "block.gtceu.quartzite_lapis_ore.prospected": "Lapis", - "block.gtceu.quartzite_lazurite_ore.prospected": "Lazurite", - "block.gtceu.quartzite_lead_ore.prospected": "Lead", - "block.gtceu.quartzite_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.quartzite_lithium_ore.prospected": "Lithium", - "block.gtceu.quartzite_magnesite_ore.prospected": "Magnesite", - "block.gtceu.quartzite_magnetite_ore.prospected": "Magnetite", - "block.gtceu.quartzite_malachite_ore.prospected": "Malachite", - "block.gtceu.quartzite_mica_ore.prospected": "Mica", - "block.gtceu.quartzite_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.quartzite_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.quartzite_monazite_ore.prospected": "Monazite", - "block.gtceu.quartzite_naquadah_ore.prospected": "Naquadah", - "block.gtceu.quartzite_neodymium_ore.prospected": "Neodymium", - "block.gtceu.quartzite_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.quartzite_nickel_ore.prospected": "Nickel", - "block.gtceu.quartzite_oilsands_ore.prospected": "Oilsands", - "block.gtceu.quartzite_olivine_ore.prospected": "Olivine", - "block.gtceu.quartzite_opal_ore.prospected": "Opal", - "block.gtceu.quartzite_palladium_ore.prospected": "Palladium", - "block.gtceu.quartzite_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.quartzite_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.quartzite_platinum_ore.prospected": "Platinum", - "block.gtceu.quartzite_plutonium_ore.prospected": "Plutonium", - "block.gtceu.quartzite_pollucite_ore.prospected": "Pollucite", - "block.gtceu.quartzite_powellite_ore.prospected": "Powellite", - "block.gtceu.quartzite_pyrite_ore.prospected": "Pyrite", - "block.gtceu.quartzite_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.quartzite_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.quartzite_pyrope_ore.prospected": "Pyrope", - "block.gtceu.quartzite_quartzite_ore.prospected": "Quartzite", - "block.gtceu.quartzite_realgar_ore.prospected": "Realgar", - "block.gtceu.quartzite_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.quartzite_redstone_ore.prospected": "Redstone", - "block.gtceu.quartzite_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.quartzite_ruby_ore.prospected": "Ruby", - "block.gtceu.quartzite_salt_ore.prospected": "Salt", - "block.gtceu.quartzite_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.quartzite_sapphire_ore.prospected": "Sapphire", - "block.gtceu.quartzite_scheelite_ore.prospected": "Scheelite", - "block.gtceu.quartzite_silver_ore.prospected": "Silver", - "block.gtceu.quartzite_soapstone_ore.prospected": "Soapstone", - "block.gtceu.quartzite_sodalite_ore.prospected": "Sodalite", - "block.gtceu.quartzite_spessartine_ore.prospected": "Spessartine", - "block.gtceu.quartzite_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.quartzite_spodumene_ore.prospected": "Spodumene", - "block.gtceu.quartzite_stibnite_ore.prospected": "Stibnite", - "block.gtceu.quartzite_sulfur_ore.prospected": "Sulfur", - "block.gtceu.quartzite_sylvite_ore.prospected": "Sylvite", - "block.gtceu.quartzite_talc_ore.prospected": "Talc", - "block.gtceu.quartzite_tantalite_ore.prospected": "Tantalite", - "block.gtceu.quartzite_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.quartzite_thorium_ore.prospected": "Thorium", - "block.gtceu.quartzite_tin_ore.prospected": "Tin", - "block.gtceu.quartzite_topaz_ore.prospected": "Topaz", - "block.gtceu.quartzite_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.quartzite_trona_ore.prospected": "Trona", - "block.gtceu.quartzite_tungstate_ore.prospected": "Tungstate", - "block.gtceu.quartzite_uraninite_ore.prospected": "Uraninite", - "block.gtceu.quartzite_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.quartzite_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.quartzite_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.quartzite_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.quartzite_zeolite_ore.prospected": "Zeolite", - "block.gtceu.rhyolite_almandine_ore.prospected": "Almandine", - "block.gtceu.rhyolite_aluminium_ore.prospected": "Aluminium", - "block.gtceu.rhyolite_alunite_ore.prospected": "Alunite", - "block.gtceu.rhyolite_amethyst_ore.prospected": "Amethyst", - "block.gtceu.rhyolite_apatite_ore.prospected": "Apatite", - "block.gtceu.rhyolite_asbestos_ore.prospected": "Asbestos", - "block.gtceu.rhyolite_barite_ore.prospected": "Barite", - "block.gtceu.rhyolite_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.rhyolite_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.rhyolite_bauxite_ore.prospected": "Bauxite", - "block.gtceu.rhyolite_bentonite_ore.prospected": "Bentonite", - "block.gtceu.rhyolite_beryllium_ore.prospected": "Beryllium", - "block.gtceu.rhyolite_bismuth_ore.prospected": "Bismuth", - "block.gtceu.rhyolite_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.rhyolite_borax_ore.prospected": "Borax", - "block.gtceu.rhyolite_bornite_ore.prospected": "Bornite", - "block.gtceu.rhyolite_calcite_ore.prospected": "Calcite", - "block.gtceu.rhyolite_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.rhyolite_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.rhyolite_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.rhyolite_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.rhyolite_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.rhyolite_chromite_ore.prospected": "Chromite", - "block.gtceu.rhyolite_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.rhyolite_coal_ore.prospected": "Coal", - "block.gtceu.rhyolite_cobalt_ore.prospected": "Cobalt", - "block.gtceu.rhyolite_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.rhyolite_cooperite_ore.prospected": "Cooperite", - "block.gtceu.rhyolite_copper_ore.prospected": "Copper", - "block.gtceu.rhyolite_diamond_ore.prospected": "Diamond", - "block.gtceu.rhyolite_diatomite_ore.prospected": "Diatomite", - "block.gtceu.rhyolite_electrotine_ore.prospected": "Electrotine", - "block.gtceu.rhyolite_emerald_ore.prospected": "Emerald", - "block.gtceu.rhyolite_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.rhyolite_galena_ore.prospected": "Galena", - "block.gtceu.rhyolite_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.rhyolite_garnierite_ore.prospected": "Garnierite", - "block.gtceu.rhyolite_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.rhyolite_goethite_ore.prospected": "Goethite", - "block.gtceu.rhyolite_gold_ore.prospected": "Gold", - "block.gtceu.rhyolite_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.rhyolite_graphite_ore.prospected": "Graphite", - "block.gtceu.rhyolite_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.rhyolite_grossular_ore.prospected": "Grossular", - "block.gtceu.rhyolite_gypsum_ore.prospected": "Gypsum", - "block.gtceu.rhyolite_hematite_ore.prospected": "Hematite", - "block.gtceu.rhyolite_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.rhyolite_iron_ore.prospected": "Iron", - "block.gtceu.rhyolite_kyanite_ore.prospected": "Kyanite", - "block.gtceu.rhyolite_lapis_ore.prospected": "Lapis", - "block.gtceu.rhyolite_lazurite_ore.prospected": "Lazurite", - "block.gtceu.rhyolite_lead_ore.prospected": "Lead", - "block.gtceu.rhyolite_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.rhyolite_lithium_ore.prospected": "Lithium", - "block.gtceu.rhyolite_magnesite_ore.prospected": "Magnesite", - "block.gtceu.rhyolite_magnetite_ore.prospected": "Magnetite", - "block.gtceu.rhyolite_malachite_ore.prospected": "Malachite", - "block.gtceu.rhyolite_mica_ore.prospected": "Mica", - "block.gtceu.rhyolite_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.rhyolite_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.rhyolite_monazite_ore.prospected": "Monazite", - "block.gtceu.rhyolite_naquadah_ore.prospected": "Naquadah", - "block.gtceu.rhyolite_neodymium_ore.prospected": "Neodymium", - "block.gtceu.rhyolite_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.rhyolite_nickel_ore.prospected": "Nickel", - "block.gtceu.rhyolite_oilsands_ore.prospected": "Oilsands", - "block.gtceu.rhyolite_olivine_ore.prospected": "Olivine", - "block.gtceu.rhyolite_opal_ore.prospected": "Opal", - "block.gtceu.rhyolite_palladium_ore.prospected": "Palladium", - "block.gtceu.rhyolite_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.rhyolite_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.rhyolite_platinum_ore.prospected": "Platinum", - "block.gtceu.rhyolite_plutonium_ore.prospected": "Plutonium", - "block.gtceu.rhyolite_pollucite_ore.prospected": "Pollucite", - "block.gtceu.rhyolite_powellite_ore.prospected": "Powellite", - "block.gtceu.rhyolite_pyrite_ore.prospected": "Pyrite", - "block.gtceu.rhyolite_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.rhyolite_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.rhyolite_pyrope_ore.prospected": "Pyrope", - "block.gtceu.rhyolite_quartzite_ore.prospected": "Quartzite", - "block.gtceu.rhyolite_realgar_ore.prospected": "Realgar", - "block.gtceu.rhyolite_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.rhyolite_redstone_ore.prospected": "Redstone", - "block.gtceu.rhyolite_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.rhyolite_ruby_ore.prospected": "Ruby", - "block.gtceu.rhyolite_salt_ore.prospected": "Salt", - "block.gtceu.rhyolite_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.rhyolite_sapphire_ore.prospected": "Sapphire", - "block.gtceu.rhyolite_scheelite_ore.prospected": "Scheelite", - "block.gtceu.rhyolite_silver_ore.prospected": "Silver", - "block.gtceu.rhyolite_soapstone_ore.prospected": "Soapstone", - "block.gtceu.rhyolite_sodalite_ore.prospected": "Sodalite", - "block.gtceu.rhyolite_spessartine_ore.prospected": "Spessartine", - "block.gtceu.rhyolite_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.rhyolite_spodumene_ore.prospected": "Spodumene", - "block.gtceu.rhyolite_stibnite_ore.prospected": "Stibnite", - "block.gtceu.rhyolite_sulfur_ore.prospected": "Sulfur", - "block.gtceu.rhyolite_sylvite_ore.prospected": "Sylvite", - "block.gtceu.rhyolite_talc_ore.prospected": "Talc", - "block.gtceu.rhyolite_tantalite_ore.prospected": "Tantalite", - "block.gtceu.rhyolite_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.rhyolite_thorium_ore.prospected": "Thorium", - "block.gtceu.rhyolite_tin_ore.prospected": "Tin", - "block.gtceu.rhyolite_topaz_ore.prospected": "Topaz", - "block.gtceu.rhyolite_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.rhyolite_trona_ore.prospected": "Trona", - "block.gtceu.rhyolite_tungstate_ore.prospected": "Tungstate", - "block.gtceu.rhyolite_uraninite_ore.prospected": "Uraninite", - "block.gtceu.rhyolite_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.rhyolite_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.rhyolite_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.rhyolite_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.rhyolite_zeolite_ore.prospected": "Zeolite", - "block.gtceu.schist_almandine_ore.prospected": "Almandine", - "block.gtceu.schist_aluminium_ore.prospected": "Aluminium", - "block.gtceu.schist_alunite_ore.prospected": "Alunite", - "block.gtceu.schist_amethyst_ore.prospected": "Amethyst", - "block.gtceu.schist_apatite_ore.prospected": "Apatite", - "block.gtceu.schist_asbestos_ore.prospected": "Asbestos", - "block.gtceu.schist_barite_ore.prospected": "Barite", - "block.gtceu.schist_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.schist_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.schist_bauxite_ore.prospected": "Bauxite", - "block.gtceu.schist_bentonite_ore.prospected": "Bentonite", - "block.gtceu.schist_beryllium_ore.prospected": "Beryllium", - "block.gtceu.schist_bismuth_ore.prospected": "Bismuth", - "block.gtceu.schist_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.schist_borax_ore.prospected": "Borax", - "block.gtceu.schist_bornite_ore.prospected": "Bornite", - "block.gtceu.schist_calcite_ore.prospected": "Calcite", - "block.gtceu.schist_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.schist_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.schist_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.schist_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.schist_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.schist_chromite_ore.prospected": "Chromite", - "block.gtceu.schist_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.schist_coal_ore.prospected": "Coal", - "block.gtceu.schist_cobalt_ore.prospected": "Cobalt", - "block.gtceu.schist_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.schist_cooperite_ore.prospected": "Cooperite", - "block.gtceu.schist_copper_ore.prospected": "Copper", - "block.gtceu.schist_diamond_ore.prospected": "Diamond", - "block.gtceu.schist_diatomite_ore.prospected": "Diatomite", - "block.gtceu.schist_electrotine_ore.prospected": "Electrotine", - "block.gtceu.schist_emerald_ore.prospected": "Emerald", - "block.gtceu.schist_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.schist_galena_ore.prospected": "Galena", - "block.gtceu.schist_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.schist_garnierite_ore.prospected": "Garnierite", - "block.gtceu.schist_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.schist_goethite_ore.prospected": "Goethite", - "block.gtceu.schist_gold_ore.prospected": "Gold", - "block.gtceu.schist_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.schist_graphite_ore.prospected": "Graphite", - "block.gtceu.schist_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.schist_grossular_ore.prospected": "Grossular", - "block.gtceu.schist_gypsum_ore.prospected": "Gypsum", - "block.gtceu.schist_hematite_ore.prospected": "Hematite", - "block.gtceu.schist_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.schist_iron_ore.prospected": "Iron", - "block.gtceu.schist_kyanite_ore.prospected": "Kyanite", - "block.gtceu.schist_lapis_ore.prospected": "Lapis", - "block.gtceu.schist_lazurite_ore.prospected": "Lazurite", - "block.gtceu.schist_lead_ore.prospected": "Lead", - "block.gtceu.schist_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.schist_lithium_ore.prospected": "Lithium", - "block.gtceu.schist_magnesite_ore.prospected": "Magnesite", - "block.gtceu.schist_magnetite_ore.prospected": "Magnetite", - "block.gtceu.schist_malachite_ore.prospected": "Malachite", - "block.gtceu.schist_mica_ore.prospected": "Mica", - "block.gtceu.schist_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.schist_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.schist_monazite_ore.prospected": "Monazite", - "block.gtceu.schist_naquadah_ore.prospected": "Naquadah", - "block.gtceu.schist_neodymium_ore.prospected": "Neodymium", - "block.gtceu.schist_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.schist_nickel_ore.prospected": "Nickel", - "block.gtceu.schist_oilsands_ore.prospected": "Oilsands", - "block.gtceu.schist_olivine_ore.prospected": "Olivine", - "block.gtceu.schist_opal_ore.prospected": "Opal", - "block.gtceu.schist_palladium_ore.prospected": "Palladium", - "block.gtceu.schist_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.schist_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.schist_platinum_ore.prospected": "Platinum", - "block.gtceu.schist_plutonium_ore.prospected": "Plutonium", - "block.gtceu.schist_pollucite_ore.prospected": "Pollucite", - "block.gtceu.schist_powellite_ore.prospected": "Powellite", - "block.gtceu.schist_pyrite_ore.prospected": "Pyrite", - "block.gtceu.schist_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.schist_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.schist_pyrope_ore.prospected": "Pyrope", - "block.gtceu.schist_quartzite_ore.prospected": "Quartzite", - "block.gtceu.schist_realgar_ore.prospected": "Realgar", - "block.gtceu.schist_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.schist_redstone_ore.prospected": "Redstone", - "block.gtceu.schist_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.schist_ruby_ore.prospected": "Ruby", - "block.gtceu.schist_salt_ore.prospected": "Salt", - "block.gtceu.schist_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.schist_sapphire_ore.prospected": "Sapphire", - "block.gtceu.schist_scheelite_ore.prospected": "Scheelite", - "block.gtceu.schist_silver_ore.prospected": "Silver", - "block.gtceu.schist_soapstone_ore.prospected": "Soapstone", - "block.gtceu.schist_sodalite_ore.prospected": "Sodalite", - "block.gtceu.schist_spessartine_ore.prospected": "Spessartine", - "block.gtceu.schist_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.schist_spodumene_ore.prospected": "Spodumene", - "block.gtceu.schist_stibnite_ore.prospected": "Stibnite", - "block.gtceu.schist_sulfur_ore.prospected": "Sulfur", - "block.gtceu.schist_sylvite_ore.prospected": "Sylvite", - "block.gtceu.schist_talc_ore.prospected": "Talc", - "block.gtceu.schist_tantalite_ore.prospected": "Tantalite", - "block.gtceu.schist_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.schist_thorium_ore.prospected": "Thorium", - "block.gtceu.schist_tin_ore.prospected": "Tin", - "block.gtceu.schist_topaz_ore.prospected": "Topaz", - "block.gtceu.schist_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.schist_trona_ore.prospected": "Trona", - "block.gtceu.schist_tungstate_ore.prospected": "Tungstate", - "block.gtceu.schist_uraninite_ore.prospected": "Uraninite", - "block.gtceu.schist_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.schist_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.schist_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.schist_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.schist_zeolite_ore.prospected": "Zeolite", - "block.gtceu.shale_almandine_ore.prospected": "Almandine", - "block.gtceu.shale_aluminium_ore.prospected": "Aluminium", - "block.gtceu.shale_alunite_ore.prospected": "Alunite", - "block.gtceu.shale_amethyst_ore.prospected": "Amethyst", - "block.gtceu.shale_apatite_ore.prospected": "Apatite", - "block.gtceu.shale_asbestos_ore.prospected": "Asbestos", - "block.gtceu.shale_barite_ore.prospected": "Barite", - "block.gtceu.shale_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.shale_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.shale_bauxite_ore.prospected": "Bauxite", - "block.gtceu.shale_bentonite_ore.prospected": "Bentonite", - "block.gtceu.shale_beryllium_ore.prospected": "Beryllium", - "block.gtceu.shale_bismuth_ore.prospected": "Bismuth", - "block.gtceu.shale_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.shale_borax_ore.prospected": "Borax", - "block.gtceu.shale_bornite_ore.prospected": "Bornite", - "block.gtceu.shale_calcite_ore.prospected": "Calcite", - "block.gtceu.shale_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.shale_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.shale_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.shale_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.shale_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.shale_chromite_ore.prospected": "Chromite", - "block.gtceu.shale_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.shale_coal_ore.prospected": "Coal", - "block.gtceu.shale_cobalt_ore.prospected": "Cobalt", - "block.gtceu.shale_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.shale_cooperite_ore.prospected": "Cooperite", - "block.gtceu.shale_copper_ore.prospected": "Copper", - "block.gtceu.shale_diamond_ore.prospected": "Diamond", - "block.gtceu.shale_diatomite_ore.prospected": "Diatomite", - "block.gtceu.shale_electrotine_ore.prospected": "Electrotine", - "block.gtceu.shale_emerald_ore.prospected": "Emerald", - "block.gtceu.shale_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.shale_galena_ore.prospected": "Galena", - "block.gtceu.shale_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.shale_garnierite_ore.prospected": "Garnierite", - "block.gtceu.shale_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.shale_goethite_ore.prospected": "Goethite", - "block.gtceu.shale_gold_ore.prospected": "Gold", - "block.gtceu.shale_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.shale_graphite_ore.prospected": "Graphite", - "block.gtceu.shale_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.shale_grossular_ore.prospected": "Grossular", - "block.gtceu.shale_gypsum_ore.prospected": "Gypsum", - "block.gtceu.shale_hematite_ore.prospected": "Hematite", - "block.gtceu.shale_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.shale_iron_ore.prospected": "Iron", - "block.gtceu.shale_kyanite_ore.prospected": "Kyanite", - "block.gtceu.shale_lapis_ore.prospected": "Lapis", - "block.gtceu.shale_lazurite_ore.prospected": "Lazurite", - "block.gtceu.shale_lead_ore.prospected": "Lead", - "block.gtceu.shale_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.shale_lithium_ore.prospected": "Lithium", - "block.gtceu.shale_magnesite_ore.prospected": "Magnesite", - "block.gtceu.shale_magnetite_ore.prospected": "Magnetite", - "block.gtceu.shale_malachite_ore.prospected": "Malachite", - "block.gtceu.shale_mica_ore.prospected": "Mica", - "block.gtceu.shale_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.shale_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.shale_monazite_ore.prospected": "Monazite", - "block.gtceu.shale_naquadah_ore.prospected": "Naquadah", - "block.gtceu.shale_neodymium_ore.prospected": "Neodymium", - "block.gtceu.shale_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.shale_nickel_ore.prospected": "Nickel", - "block.gtceu.shale_oilsands_ore.prospected": "Oilsands", - "block.gtceu.shale_olivine_ore.prospected": "Olivine", - "block.gtceu.shale_opal_ore.prospected": "Opal", - "block.gtceu.shale_palladium_ore.prospected": "Palladium", - "block.gtceu.shale_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.shale_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.shale_platinum_ore.prospected": "Platinum", - "block.gtceu.shale_plutonium_ore.prospected": "Plutonium", - "block.gtceu.shale_pollucite_ore.prospected": "Pollucite", - "block.gtceu.shale_powellite_ore.prospected": "Powellite", - "block.gtceu.shale_pyrite_ore.prospected": "Pyrite", - "block.gtceu.shale_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.shale_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.shale_pyrope_ore.prospected": "Pyrope", - "block.gtceu.shale_quartzite_ore.prospected": "Quartzite", - "block.gtceu.shale_realgar_ore.prospected": "Realgar", - "block.gtceu.shale_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.shale_redstone_ore.prospected": "Redstone", - "block.gtceu.shale_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.shale_ruby_ore.prospected": "Ruby", - "block.gtceu.shale_salt_ore.prospected": "Salt", - "block.gtceu.shale_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.shale_sapphire_ore.prospected": "Sapphire", - "block.gtceu.shale_scheelite_ore.prospected": "Scheelite", - "block.gtceu.shale_silver_ore.prospected": "Silver", - "block.gtceu.shale_soapstone_ore.prospected": "Soapstone", - "block.gtceu.shale_sodalite_ore.prospected": "Sodalite", - "block.gtceu.shale_spessartine_ore.prospected": "Spessartine", - "block.gtceu.shale_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.shale_spodumene_ore.prospected": "Spodumene", - "block.gtceu.shale_stibnite_ore.prospected": "Stibnite", - "block.gtceu.shale_sulfur_ore.prospected": "Sulfur", - "block.gtceu.shale_sylvite_ore.prospected": "Sylvite", - "block.gtceu.shale_talc_ore.prospected": "Talc", - "block.gtceu.shale_tantalite_ore.prospected": "Tantalite", - "block.gtceu.shale_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.shale_thorium_ore.prospected": "Thorium", - "block.gtceu.shale_tin_ore.prospected": "Tin", - "block.gtceu.shale_topaz_ore.prospected": "Topaz", - "block.gtceu.shale_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.shale_trona_ore.prospected": "Trona", - "block.gtceu.shale_tungstate_ore.prospected": "Tungstate", - "block.gtceu.shale_uraninite_ore.prospected": "Uraninite", - "block.gtceu.shale_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.shale_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.shale_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.shale_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.shale_zeolite_ore.prospected": "Zeolite", - "block.gtceu.slate_almandine_ore.prospected": "Almandine", - "block.gtceu.slate_aluminium_ore.prospected": "Aluminium", - "block.gtceu.slate_alunite_ore.prospected": "Alunite", - "block.gtceu.slate_amethyst_ore.prospected": "Amethyst", - "block.gtceu.slate_apatite_ore.prospected": "Apatite", - "block.gtceu.slate_asbestos_ore.prospected": "Asbestos", - "block.gtceu.slate_barite_ore.prospected": "Barite", - "block.gtceu.slate_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.slate_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.slate_bauxite_ore.prospected": "Bauxite", - "block.gtceu.slate_bentonite_ore.prospected": "Bentonite", - "block.gtceu.slate_beryllium_ore.prospected": "Beryllium", - "block.gtceu.slate_bismuth_ore.prospected": "Bismuth", - "block.gtceu.slate_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.slate_borax_ore.prospected": "Borax", - "block.gtceu.slate_bornite_ore.prospected": "Bornite", - "block.gtceu.slate_calcite_ore.prospected": "Calcite", - "block.gtceu.slate_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.slate_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.slate_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.slate_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.slate_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.slate_chromite_ore.prospected": "Chromite", - "block.gtceu.slate_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.slate_coal_ore.prospected": "Coal", - "block.gtceu.slate_cobalt_ore.prospected": "Cobalt", - "block.gtceu.slate_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.slate_cooperite_ore.prospected": "Cooperite", - "block.gtceu.slate_copper_ore.prospected": "Copper", - "block.gtceu.slate_diamond_ore.prospected": "Diamond", - "block.gtceu.slate_diatomite_ore.prospected": "Diatomite", - "block.gtceu.slate_electrotine_ore.prospected": "Electrotine", - "block.gtceu.slate_emerald_ore.prospected": "Emerald", - "block.gtceu.slate_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.slate_galena_ore.prospected": "Galena", - "block.gtceu.slate_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.slate_garnierite_ore.prospected": "Garnierite", - "block.gtceu.slate_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.slate_goethite_ore.prospected": "Goethite", - "block.gtceu.slate_gold_ore.prospected": "Gold", - "block.gtceu.slate_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.slate_graphite_ore.prospected": "Graphite", - "block.gtceu.slate_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.slate_grossular_ore.prospected": "Grossular", - "block.gtceu.slate_gypsum_ore.prospected": "Gypsum", - "block.gtceu.slate_hematite_ore.prospected": "Hematite", - "block.gtceu.slate_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.slate_iron_ore.prospected": "Iron", - "block.gtceu.slate_kyanite_ore.prospected": "Kyanite", - "block.gtceu.slate_lapis_ore.prospected": "Lapis", - "block.gtceu.slate_lazurite_ore.prospected": "Lazurite", - "block.gtceu.slate_lead_ore.prospected": "Lead", - "block.gtceu.slate_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.slate_lithium_ore.prospected": "Lithium", - "block.gtceu.slate_magnesite_ore.prospected": "Magnesite", - "block.gtceu.slate_magnetite_ore.prospected": "Magnetite", - "block.gtceu.slate_malachite_ore.prospected": "Malachite", - "block.gtceu.slate_mica_ore.prospected": "Mica", - "block.gtceu.slate_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.slate_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.slate_monazite_ore.prospected": "Monazite", - "block.gtceu.slate_naquadah_ore.prospected": "Naquadah", - "block.gtceu.slate_neodymium_ore.prospected": "Neodymium", - "block.gtceu.slate_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.slate_nickel_ore.prospected": "Nickel", - "block.gtceu.slate_oilsands_ore.prospected": "Oilsands", - "block.gtceu.slate_olivine_ore.prospected": "Olivine", - "block.gtceu.slate_opal_ore.prospected": "Opal", - "block.gtceu.slate_palladium_ore.prospected": "Palladium", - "block.gtceu.slate_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.slate_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.slate_platinum_ore.prospected": "Platinum", - "block.gtceu.slate_plutonium_ore.prospected": "Plutonium", - "block.gtceu.slate_pollucite_ore.prospected": "Pollucite", - "block.gtceu.slate_powellite_ore.prospected": "Powellite", - "block.gtceu.slate_pyrite_ore.prospected": "Pyrite", - "block.gtceu.slate_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.slate_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.slate_pyrope_ore.prospected": "Pyrope", - "block.gtceu.slate_quartzite_ore.prospected": "Quartzite", - "block.gtceu.slate_realgar_ore.prospected": "Realgar", - "block.gtceu.slate_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.slate_redstone_ore.prospected": "Redstone", - "block.gtceu.slate_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.slate_ruby_ore.prospected": "Ruby", - "block.gtceu.slate_salt_ore.prospected": "Salt", - "block.gtceu.slate_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.slate_sapphire_ore.prospected": "Sapphire", - "block.gtceu.slate_scheelite_ore.prospected": "Scheelite", - "block.gtceu.slate_silver_ore.prospected": "Silver", - "block.gtceu.slate_soapstone_ore.prospected": "Soapstone", - "block.gtceu.slate_sodalite_ore.prospected": "Sodalite", - "block.gtceu.slate_spessartine_ore.prospected": "Spessartine", - "block.gtceu.slate_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.slate_spodumene_ore.prospected": "Spodumene", - "block.gtceu.slate_stibnite_ore.prospected": "Stibnite", - "block.gtceu.slate_sulfur_ore.prospected": "Sulfur", - "block.gtceu.slate_sylvite_ore.prospected": "Sylvite", - "block.gtceu.slate_talc_ore.prospected": "Talc", - "block.gtceu.slate_tantalite_ore.prospected": "Tantalite", - "block.gtceu.slate_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.slate_thorium_ore.prospected": "Thorium", - "block.gtceu.slate_tin_ore.prospected": "Tin", - "block.gtceu.slate_topaz_ore.prospected": "Topaz", - "block.gtceu.slate_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.slate_trona_ore.prospected": "Trona", - "block.gtceu.slate_tungstate_ore.prospected": "Tungstate", - "block.gtceu.slate_uraninite_ore.prospected": "Uraninite", - "block.gtceu.slate_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.slate_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.slate_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.slate_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.slate_zeolite_ore.prospected": "Zeolite", - "block.gtceu.deepslate_almandine_ore.prospected": "Almandine", - "block.gtceu.deepslate_aluminium_ore.prospected": "Aluminium", - "block.gtceu.deepslate_alunite_ore.prospected": "Alunite", - "block.gtceu.deepslate_amethyst_ore.prospected": "Amethyst", - "block.gtceu.deepslate_apatite_ore.prospected": "Apatite", - "block.gtceu.deepslate_asbestos_ore.prospected": "Asbestos", - "block.gtceu.deepslate_barite_ore.prospected": "Barite", - "block.gtceu.deepslate_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.deepslate_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.deepslate_bauxite_ore.prospected": "Bauxite", - "block.gtceu.deepslate_bentonite_ore.prospected": "Bentonite", - "block.gtceu.deepslate_beryllium_ore.prospected": "Beryllium", - "block.gtceu.deepslate_bismuth_ore.prospected": "Bismuth", - "block.gtceu.deepslate_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.deepslate_borax_ore.prospected": "Borax", - "block.gtceu.deepslate_bornite_ore.prospected": "Bornite", - "block.gtceu.deepslate_calcite_ore.prospected": "Calcite", - "block.gtceu.deepslate_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.deepslate_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.deepslate_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.deepslate_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.deepslate_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.deepslate_chromite_ore.prospected": "Chromite", - "block.gtceu.deepslate_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.deepslate_coal_ore.prospected": "Coal", - "block.gtceu.deepslate_cobalt_ore.prospected": "Cobalt", - "block.gtceu.deepslate_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.deepslate_cooperite_ore.prospected": "Cooperite", - "block.gtceu.deepslate_copper_ore.prospected": "Copper", - "block.gtceu.deepslate_diamond_ore.prospected": "Diamond", - "block.gtceu.deepslate_diatomite_ore.prospected": "Diatomite", - "block.gtceu.deepslate_electrotine_ore.prospected": "Electrotine", - "block.gtceu.deepslate_emerald_ore.prospected": "Emerald", - "block.gtceu.deepslate_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.deepslate_galena_ore.prospected": "Galena", - "block.gtceu.deepslate_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.deepslate_garnierite_ore.prospected": "Garnierite", - "block.gtceu.deepslate_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.deepslate_goethite_ore.prospected": "Goethite", - "block.gtceu.deepslate_gold_ore.prospected": "Gold", - "block.gtceu.deepslate_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.deepslate_graphite_ore.prospected": "Graphite", - "block.gtceu.deepslate_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.deepslate_grossular_ore.prospected": "Grossular", - "block.gtceu.deepslate_gypsum_ore.prospected": "Gypsum", - "block.gtceu.deepslate_hematite_ore.prospected": "Hematite", - "block.gtceu.deepslate_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.deepslate_iron_ore.prospected": "Iron", - "block.gtceu.deepslate_kyanite_ore.prospected": "Kyanite", - "block.gtceu.deepslate_lapis_ore.prospected": "Lapis", - "block.gtceu.deepslate_lazurite_ore.prospected": "Lazurite", - "block.gtceu.deepslate_lead_ore.prospected": "Lead", - "block.gtceu.deepslate_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.deepslate_lithium_ore.prospected": "Lithium", - "block.gtceu.deepslate_magnesite_ore.prospected": "Magnesite", - "block.gtceu.deepslate_magnetite_ore.prospected": "Magnetite", - "block.gtceu.deepslate_malachite_ore.prospected": "Malachite", - "block.gtceu.deepslate_mica_ore.prospected": "Mica", - "block.gtceu.deepslate_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.deepslate_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.deepslate_monazite_ore.prospected": "Monazite", - "block.gtceu.deepslate_naquadah_ore.prospected": "Naquadah", - "block.gtceu.deepslate_neodymium_ore.prospected": "Neodymium", - "block.gtceu.deepslate_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.deepslate_nickel_ore.prospected": "Nickel", - "block.gtceu.deepslate_oilsands_ore.prospected": "Oilsands", - "block.gtceu.deepslate_olivine_ore.prospected": "Olivine", - "block.gtceu.deepslate_opal_ore.prospected": "Opal", - "block.gtceu.deepslate_palladium_ore.prospected": "Palladium", - "block.gtceu.deepslate_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.deepslate_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.deepslate_platinum_ore.prospected": "Platinum", - "block.gtceu.deepslate_plutonium_ore.prospected": "Plutonium", - "block.gtceu.deepslate_pollucite_ore.prospected": "Pollucite", - "block.gtceu.deepslate_powellite_ore.prospected": "Powellite", - "block.gtceu.deepslate_pyrite_ore.prospected": "Pyrite", - "block.gtceu.deepslate_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.deepslate_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.deepslate_pyrope_ore.prospected": "Pyrope", - "block.gtceu.deepslate_quartzite_ore.prospected": "Quartzite", - "block.gtceu.deepslate_realgar_ore.prospected": "Realgar", - "block.gtceu.deepslate_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.deepslate_redstone_ore.prospected": "Redstone", - "block.gtceu.deepslate_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.deepslate_ruby_ore.prospected": "Ruby", - "block.gtceu.deepslate_salt_ore.prospected": "Salt", - "block.gtceu.deepslate_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.deepslate_sapphire_ore.prospected": "Sapphire", - "block.gtceu.deepslate_scheelite_ore.prospected": "Scheelite", - "block.gtceu.deepslate_silver_ore.prospected": "Silver", - "block.gtceu.deepslate_soapstone_ore.prospected": "Soapstone", - "block.gtceu.deepslate_sodalite_ore.prospected": "Sodalite", - "block.gtceu.deepslate_spessartine_ore.prospected": "Spessartine", - "block.gtceu.deepslate_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.deepslate_spodumene_ore.prospected": "Spodumene", - "block.gtceu.deepslate_stibnite_ore.prospected": "Stibnite", - "block.gtceu.deepslate_sulfur_ore.prospected": "Sulfur", - "block.gtceu.deepslate_sylvite_ore.prospected": "Sylvite", - "block.gtceu.deepslate_talc_ore.prospected": "Talc", - "block.gtceu.deepslate_tantalite_ore.prospected": "Tantalite", - "block.gtceu.deepslate_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.deepslate_thorium_ore.prospected": "Thorium", - "block.gtceu.deepslate_tin_ore.prospected": "Tin", - "block.gtceu.deepslate_topaz_ore.prospected": "Topaz", - "block.gtceu.deepslate_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.deepslate_trona_ore.prospected": "Trona", - "block.gtceu.deepslate_tungstate_ore.prospected": "Tungstate", - "block.gtceu.deepslate_uraninite_ore.prospected": "Uraninite", - "block.gtceu.deepslate_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.deepslate_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.deepslate_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.deepslate_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.deepslate_zeolite_ore.prospected": "Zeolite", - "block.gtceu.pyroxenite_almandine_ore.prospected": "Almandine", - "block.gtceu.pyroxenite_aluminium_ore.prospected": "Aluminium", - "block.gtceu.pyroxenite_alunite_ore.prospected": "Alunite", - "block.gtceu.pyroxenite_amethyst_ore.prospected": "Amethyst", - "block.gtceu.pyroxenite_apatite_ore.prospected": "Apatite", - "block.gtceu.pyroxenite_asbestos_ore.prospected": "Asbestos", - "block.gtceu.pyroxenite_barite_ore.prospected": "Barite", - "block.gtceu.pyroxenite_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.pyroxenite_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.pyroxenite_bauxite_ore.prospected": "Bauxite", - "block.gtceu.pyroxenite_bentonite_ore.prospected": "Bentonite", - "block.gtceu.pyroxenite_beryllium_ore.prospected": "Beryllium", - "block.gtceu.pyroxenite_bismuth_ore.prospected": "Bismuth", - "block.gtceu.pyroxenite_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.pyroxenite_borax_ore.prospected": "Borax", - "block.gtceu.pyroxenite_bornite_ore.prospected": "Bornite", - "block.gtceu.pyroxenite_calcite_ore.prospected": "Calcite", - "block.gtceu.pyroxenite_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.pyroxenite_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.pyroxenite_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.pyroxenite_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.pyroxenite_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.pyroxenite_chromite_ore.prospected": "Chromite", - "block.gtceu.pyroxenite_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.pyroxenite_coal_ore.prospected": "Coal", - "block.gtceu.pyroxenite_cobalt_ore.prospected": "Cobalt", - "block.gtceu.pyroxenite_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.pyroxenite_cooperite_ore.prospected": "Cooperite", - "block.gtceu.pyroxenite_copper_ore.prospected": "Copper", - "block.gtceu.pyroxenite_diamond_ore.prospected": "Diamond", - "block.gtceu.pyroxenite_diatomite_ore.prospected": "Diatomite", - "block.gtceu.pyroxenite_electrotine_ore.prospected": "Electrotine", - "block.gtceu.pyroxenite_emerald_ore.prospected": "Emerald", - "block.gtceu.pyroxenite_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.pyroxenite_galena_ore.prospected": "Galena", - "block.gtceu.pyroxenite_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.pyroxenite_garnierite_ore.prospected": "Garnierite", - "block.gtceu.pyroxenite_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.pyroxenite_goethite_ore.prospected": "Goethite", - "block.gtceu.pyroxenite_gold_ore.prospected": "Gold", - "block.gtceu.pyroxenite_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.pyroxenite_graphite_ore.prospected": "Graphite", - "block.gtceu.pyroxenite_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.pyroxenite_grossular_ore.prospected": "Grossular", - "block.gtceu.pyroxenite_gypsum_ore.prospected": "Gypsum", - "block.gtceu.pyroxenite_hematite_ore.prospected": "Hematite", - "block.gtceu.pyroxenite_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.pyroxenite_iron_ore.prospected": "Iron", - "block.gtceu.pyroxenite_kyanite_ore.prospected": "Kyanite", - "block.gtceu.pyroxenite_lapis_ore.prospected": "Lapis", - "block.gtceu.pyroxenite_lazurite_ore.prospected": "Lazurite", - "block.gtceu.pyroxenite_lead_ore.prospected": "Lead", - "block.gtceu.pyroxenite_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.pyroxenite_lithium_ore.prospected": "Lithium", - "block.gtceu.pyroxenite_magnesite_ore.prospected": "Magnesite", - "block.gtceu.pyroxenite_magnetite_ore.prospected": "Magnetite", - "block.gtceu.pyroxenite_malachite_ore.prospected": "Malachite", - "block.gtceu.pyroxenite_mica_ore.prospected": "Mica", - "block.gtceu.pyroxenite_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.pyroxenite_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.pyroxenite_monazite_ore.prospected": "Monazite", - "block.gtceu.pyroxenite_naquadah_ore.prospected": "Naquadah", - "block.gtceu.pyroxenite_neodymium_ore.prospected": "Neodymium", - "block.gtceu.pyroxenite_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.pyroxenite_nickel_ore.prospected": "Nickel", - "block.gtceu.pyroxenite_oilsands_ore.prospected": "Oilsands", - "block.gtceu.pyroxenite_olivine_ore.prospected": "Olivine", - "block.gtceu.pyroxenite_opal_ore.prospected": "Opal", - "block.gtceu.pyroxenite_palladium_ore.prospected": "Palladium", - "block.gtceu.pyroxenite_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.pyroxenite_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.pyroxenite_platinum_ore.prospected": "Platinum", - "block.gtceu.pyroxenite_plutonium_ore.prospected": "Plutonium", - "block.gtceu.pyroxenite_pollucite_ore.prospected": "Pollucite", - "block.gtceu.pyroxenite_powellite_ore.prospected": "Powellite", - "block.gtceu.pyroxenite_pyrite_ore.prospected": "Pyrite", - "block.gtceu.pyroxenite_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.pyroxenite_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.pyroxenite_pyrope_ore.prospected": "Pyrope", - "block.gtceu.pyroxenite_quartzite_ore.prospected": "Quartzite", - "block.gtceu.pyroxenite_realgar_ore.prospected": "Realgar", - "block.gtceu.pyroxenite_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.pyroxenite_redstone_ore.prospected": "Redstone", - "block.gtceu.pyroxenite_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.pyroxenite_ruby_ore.prospected": "Ruby", - "block.gtceu.pyroxenite_salt_ore.prospected": "Salt", - "block.gtceu.pyroxenite_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.pyroxenite_sapphire_ore.prospected": "Sapphire", - "block.gtceu.pyroxenite_scheelite_ore.prospected": "Scheelite", - "block.gtceu.pyroxenite_silver_ore.prospected": "Silver", - "block.gtceu.pyroxenite_soapstone_ore.prospected": "Soapstone", - "block.gtceu.pyroxenite_sodalite_ore.prospected": "Sodalite", - "block.gtceu.pyroxenite_spessartine_ore.prospected": "Spessartine", - "block.gtceu.pyroxenite_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.pyroxenite_spodumene_ore.prospected": "Spodumene", - "block.gtceu.pyroxenite_stibnite_ore.prospected": "Stibnite", - "block.gtceu.pyroxenite_sulfur_ore.prospected": "Sulfur", - "block.gtceu.pyroxenite_sylvite_ore.prospected": "Sylvite", - "block.gtceu.pyroxenite_talc_ore.prospected": "Talc", - "block.gtceu.pyroxenite_tantalite_ore.prospected": "Tantalite", - "block.gtceu.pyroxenite_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.pyroxenite_thorium_ore.prospected": "Thorium", - "block.gtceu.pyroxenite_tin_ore.prospected": "Tin", - "block.gtceu.pyroxenite_topaz_ore.prospected": "Topaz", - "block.gtceu.pyroxenite_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.pyroxenite_trona_ore.prospected": "Trona", - "block.gtceu.pyroxenite_tungstate_ore.prospected": "Tungstate", - "block.gtceu.pyroxenite_uraninite_ore.prospected": "Uraninite", - "block.gtceu.pyroxenite_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.pyroxenite_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.pyroxenite_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.pyroxenite_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.pyroxenite_zeolite_ore.prospected": "Zeolite", - "block.gtceu.dripstone_almandine_ore.prospected": "Almandine", - "block.gtceu.dripstone_aluminium_ore.prospected": "Aluminium", - "block.gtceu.dripstone_alunite_ore.prospected": "Alunite", - "block.gtceu.dripstone_amethyst_ore.prospected": "Amethyst", - "block.gtceu.dripstone_apatite_ore.prospected": "Apatite", - "block.gtceu.dripstone_asbestos_ore.prospected": "Asbestos", - "block.gtceu.dripstone_barite_ore.prospected": "Barite", - "block.gtceu.dripstone_basaltic_mineral_sand_ore.prospected": "Basaltic Mineral Sand", - "block.gtceu.dripstone_bastnasite_ore.prospected": "Bastnasite", - "block.gtceu.dripstone_bauxite_ore.prospected": "Bauxite", - "block.gtceu.dripstone_bentonite_ore.prospected": "Bentonite", - "block.gtceu.dripstone_beryllium_ore.prospected": "Beryllium", - "block.gtceu.dripstone_bismuth_ore.prospected": "Bismuth", - "block.gtceu.dripstone_blue_topaz_ore.prospected": "Blue Topaz", - "block.gtceu.dripstone_borax_ore.prospected": "Borax", - "block.gtceu.dripstone_bornite_ore.prospected": "Bornite", - "block.gtceu.dripstone_calcite_ore.prospected": "Calcite", - "block.gtceu.dripstone_cassiterite_ore.prospected": "Cassiterite", - "block.gtceu.dripstone_cassiterite_sand_ore.prospected": "Cassiterite Sand", - "block.gtceu.dripstone_certus_quartz_ore.prospected": "Certus Quartz", - "block.gtceu.dripstone_chalcocite_ore.prospected": "Chalcocite", - "block.gtceu.dripstone_chalcopyrite_ore.prospected": "Chalcopyrite", - "block.gtceu.dripstone_chromite_ore.prospected": "Chromite", - "block.gtceu.dripstone_cinnabar_ore.prospected": "Cinnabar", - "block.gtceu.dripstone_coal_ore.prospected": "Coal", - "block.gtceu.dripstone_cobalt_ore.prospected": "Cobalt", - "block.gtceu.dripstone_cobaltite_ore.prospected": "Cobaltite", - "block.gtceu.dripstone_cooperite_ore.prospected": "Cooperite", - "block.gtceu.dripstone_copper_ore.prospected": "Copper", - "block.gtceu.dripstone_diamond_ore.prospected": "Diamond", - "block.gtceu.dripstone_diatomite_ore.prospected": "Diatomite", - "block.gtceu.dripstone_electrotine_ore.prospected": "Electrotine", - "block.gtceu.dripstone_emerald_ore.prospected": "Emerald", - "block.gtceu.dripstone_fullers_earth_ore.prospected": "Fullers Earth", - "block.gtceu.dripstone_galena_ore.prospected": "Galena", - "block.gtceu.dripstone_garnet_sand_ore.prospected": "Garnet Sand", - "block.gtceu.dripstone_garnierite_ore.prospected": "Garnierite", - "block.gtceu.dripstone_glauconite_sand_ore.prospected": "Glauconite Sand", - "block.gtceu.dripstone_goethite_ore.prospected": "Goethite", - "block.gtceu.dripstone_gold_ore.prospected": "Gold", - "block.gtceu.dripstone_granitic_mineral_sand_ore.prospected": "Granitic Mineral Sand", - "block.gtceu.dripstone_graphite_ore.prospected": "Graphite", - "block.gtceu.dripstone_green_sapphire_ore.prospected": "Green Sapphire", - "block.gtceu.dripstone_grossular_ore.prospected": "Grossular", - "block.gtceu.dripstone_gypsum_ore.prospected": "Gypsum", - "block.gtceu.dripstone_hematite_ore.prospected": "Hematite", - "block.gtceu.dripstone_ilmenite_ore.prospected": "Ilmenite", - "block.gtceu.dripstone_iron_ore.prospected": "Iron", - "block.gtceu.dripstone_kyanite_ore.prospected": "Kyanite", - "block.gtceu.dripstone_lapis_ore.prospected": "Lapis", - "block.gtceu.dripstone_lazurite_ore.prospected": "Lazurite", - "block.gtceu.dripstone_lead_ore.prospected": "Lead", - "block.gtceu.dripstone_lepidolite_ore.prospected": "Lepidolite", - "block.gtceu.dripstone_lithium_ore.prospected": "Lithium", - "block.gtceu.dripstone_magnesite_ore.prospected": "Magnesite", - "block.gtceu.dripstone_magnetite_ore.prospected": "Magnetite", - "block.gtceu.dripstone_malachite_ore.prospected": "Malachite", - "block.gtceu.dripstone_mica_ore.prospected": "Mica", - "block.gtceu.dripstone_molybdenite_ore.prospected": "Molybdenite", - "block.gtceu.dripstone_molybdenum_ore.prospected": "Molybdenum", - "block.gtceu.dripstone_monazite_ore.prospected": "Monazite", - "block.gtceu.dripstone_naquadah_ore.prospected": "Naquadah", - "block.gtceu.dripstone_neodymium_ore.prospected": "Neodymium", - "block.gtceu.dripstone_nether_quartz_ore.prospected": "Nether Quartz", - "block.gtceu.dripstone_nickel_ore.prospected": "Nickel", - "block.gtceu.dripstone_oilsands_ore.prospected": "Oilsands", - "block.gtceu.dripstone_olivine_ore.prospected": "Olivine", - "block.gtceu.dripstone_opal_ore.prospected": "Opal", - "block.gtceu.dripstone_palladium_ore.prospected": "Palladium", - "block.gtceu.dripstone_pentlandite_ore.prospected": "Pentlandite", - "block.gtceu.dripstone_pitchblende_ore.prospected": "Pitchblende", - "block.gtceu.dripstone_platinum_ore.prospected": "Platinum", - "block.gtceu.dripstone_plutonium_ore.prospected": "Plutonium", - "block.gtceu.dripstone_pollucite_ore.prospected": "Pollucite", - "block.gtceu.dripstone_powellite_ore.prospected": "Powellite", - "block.gtceu.dripstone_pyrite_ore.prospected": "Pyrite", - "block.gtceu.dripstone_pyrochlore_ore.prospected": "Pyrochlore", - "block.gtceu.dripstone_pyrolusite_ore.prospected": "Pyrolusite", - "block.gtceu.dripstone_pyrope_ore.prospected": "Pyrope", - "block.gtceu.dripstone_quartzite_ore.prospected": "Quartzite", - "block.gtceu.dripstone_realgar_ore.prospected": "Realgar", - "block.gtceu.dripstone_red_garnet_ore.prospected": "Red Garnet", - "block.gtceu.dripstone_redstone_ore.prospected": "Redstone", - "block.gtceu.dripstone_rock_salt_ore.prospected": "Rock Salt", - "block.gtceu.dripstone_ruby_ore.prospected": "Ruby", - "block.gtceu.dripstone_salt_ore.prospected": "Salt", - "block.gtceu.dripstone_saltpeter_ore.prospected": "Saltpeter", - "block.gtceu.dripstone_sapphire_ore.prospected": "Sapphire", - "block.gtceu.dripstone_scheelite_ore.prospected": "Scheelite", - "block.gtceu.dripstone_silver_ore.prospected": "Silver", - "block.gtceu.dripstone_soapstone_ore.prospected": "Soapstone", - "block.gtceu.dripstone_sodalite_ore.prospected": "Sodalite", - "block.gtceu.dripstone_spessartine_ore.prospected": "Spessartine", - "block.gtceu.dripstone_sphalerite_ore.prospected": "Sphalerite", - "block.gtceu.dripstone_spodumene_ore.prospected": "Spodumene", - "block.gtceu.dripstone_stibnite_ore.prospected": "Stibnite", - "block.gtceu.dripstone_sulfur_ore.prospected": "Sulfur", - "block.gtceu.dripstone_sylvite_ore.prospected": "Sylvite", - "block.gtceu.dripstone_talc_ore.prospected": "Talc", - "block.gtceu.dripstone_tantalite_ore.prospected": "Tantalite", - "block.gtceu.dripstone_tetrahedrite_ore.prospected": "Tetrahedrite", - "block.gtceu.dripstone_thorium_ore.prospected": "Thorium", - "block.gtceu.dripstone_tin_ore.prospected": "Tin", - "block.gtceu.dripstone_topaz_ore.prospected": "Topaz", - "block.gtceu.dripstone_tricalcium_phosphate_ore.prospected": "Tricalcium Phosphate", - "block.gtceu.dripstone_trona_ore.prospected": "Trona", - "block.gtceu.dripstone_tungstate_ore.prospected": "Tungstate", - "block.gtceu.dripstone_uraninite_ore.prospected": "Uraninite", - "block.gtceu.dripstone_vanadium_magnetite_ore.prospected": "Vanadium Magnetite", - "block.gtceu.dripstone_wulfenite_ore.prospected": "Wulfenite", - "block.gtceu.dripstone_yellow_garnet_ore.prospected": "Yellow Garnet", - "block.gtceu.dripstone_yellow_limonite_ore.prospected": "Yellow Limonite", - "block.gtceu.dripstone_zeolite_ore.prospected": "Zeolite", - "fluid.tfc.salt_water": "Sea Water", - "item.tfc.bucket.salt_water": "Sea Water Bucket", - "item.tfc.powder.saltpeter": "Saltpeter Powder", - "item.tfc.powder.sulfur": "Sulfur Powder", - "tfc.jei.raw_hide_knapping": "Raw Hide Knapping", - "metal.tfg.redstone": "Redstone", - "metal.tfg.red_alloy": "Red Alloy", - "metal.tfg.tin_alloy": "Tin Alloy", - "metal.tfg.lead": "Lead", - "metal.tfg.invar": "Invar", - "metal.tfg.potin": "Potin", - "metal.tfg.cobalt": "Cobalt", - "metal.tfg.cobalt_brass": "Cobalt Brass", - "metal.tfg.aluminium_silicate": "Aluminium Silicate", - "trim_material.tfc.almandine_tfc": "Almandine", - "trim_material.tfc.andradite_tfc": "Andradite", - "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", - "trim_material.tfc.cinnabar_tfc": "Cinnabar", - "trim_material.tfc.coal_tfc": "Coal", - "trim_material.tfc.diamond_tfc": "Diamond", - "trim_material.tfc.emerald_tfc": "Emerald", - "trim_material.tfc.green_sapphire_tfc": "Green Sapphire", - "trim_material.tfc.grossular_tfc": "Grossular", - "trim_material.tfc.rutile_tfc": "Rutile", - "trim_material.tfc.lazurite_tfc": "Lazurite", - "trim_material.tfc.pyrope_tfc": "Pyrope", - "trim_material.tfc.rock_salt_tfc": "Rock Salt", - "trim_material.tfc.ruby_tfc": "Ruby", - "trim_material.tfc.salt_tfc": "salt", - "trim_material.tfc.sapphire_tfc": "Sapphire", - "trim_material.tfc.sodalite_tfc": "Sodalite", - "trim_material.tfc.coke_tfc": "Coke", - "trim_material.tfc.spessartine_tfc": "Spessartine", - "trim_material.tfc.topaz_tfc": "Topaz", - "trim_material.tfc.uvarovite_tfc": "Uvarovite", - "trim_material.tfc.nether_quartz_tfc": "Nether Quartz", - "trim_material.tfc.certus_quartz_tfc": "Certus Quartz", - "trim_material.tfc.quartzite_tfc": "Quartzite", - "trim_material.tfc.realgar_tfc": "Realgar", - "trim_material.tfc.malachite_tfc": "Malachite", - "trim_material.tfc.glass_tfc": "Glass", - "trim_material.tfc.olivine_tfc": "Olivine", - "trim_material.tfc.opal_tfc": "Opal", - "trim_material.tfc.amethyst_tfc": "Amethyst", - "trim_material.tfc.lapis_tfc": "Lapis", - "trim_material.tfc.apatite_tfc": "Apatite", - "trim_material.tfc.red_garnet_tfc": "Red Garnet", - "trim_material.tfc.yellow_garnet_tfc": "Yellow Garnet", - "trim_material.tfc.monazite_tfc": "Monazite", - "trim_material.tfc.rose_quartz_tfc": "Rose Quartz", - "trim_material.tfc.fluix_tfc": "Fluix", - "trim_material.tfc.silver_tfc": "Silver", - "trim_material.tfc.sterling_silver_tfc": "Sterling Silver", - "trim_material.tfc.gold_tfc": "Gold", - "trim_material.tfc.rose_gold_tfc": "Rose Gold", - "trim_material.tfc.nickel_tfc": "Nickel", - "trim_material.tfc.platinum_tfc": "Platinum", - "trim_material.tfc.titanium_tfc": "Titanium", - "trim_material.tfc.bismuth_tfc": "Bismuth", - "trim_material.tfc.neutronium_tfc": "Neutronium", - "trim_material.tfc.pyrite_tfc": "Pyrite", - "trim_material.tfc.redx_tfc": "RedX" + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.tfc.fluid.salt_water": "Sea Water", + "block.tfc.cauldron.salt_water": "Sea Water Cauldron", + "fluid.tfc.salt_water": "Sea Water", + "item.tfc.bucket.salt_water": "Sea Water Bucket", + "item.tfc.powder.saltpeter": "Saltpeter Powder", + "item.tfc.powder.sulfur": "Sulfur Powder", + "tfc.jei.raw_hide_knapping": "Raw Hide Knapping", + "metal.tfg.redstone": "Redstone", + "metal.tfg.red_alloy": "Red Alloy", + "metal.tfg.tin_alloy": "Tin Alloy", + "metal.tfg.lead": "Lead", + "metal.tfg.invar": "Invar", + "metal.tfg.potin": "Potin", + "metal.tfg.cobalt": "Cobalt", + "metal.tfg.cobalt_brass": "Cobalt Brass", + "metal.tfg.aluminium_silicate": "Aluminium Silicate", + "trim_material.tfc.almandine_tfc": "Almandine", + "trim_material.tfc.andradite_tfc": "Andradite", + "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", + "trim_material.tfc.cinnabar_tfc": "Cinnabar", + "trim_material.tfc.coal_tfc": "Coal", + "trim_material.tfc.diamond_tfc": "Diamond", + "trim_material.tfc.emerald_tfc": "Emerald", + "trim_material.tfc.green_sapphire_tfc": "Green Sapphire", + "trim_material.tfc.grossular_tfc": "Grossular", + "trim_material.tfc.rutile_tfc": "Rutile", + "trim_material.tfc.lazurite_tfc": "Lazurite", + "trim_material.tfc.pyrope_tfc": "Pyrope", + "trim_material.tfc.rock_salt_tfc": "Rock Salt", + "trim_material.tfc.ruby_tfc": "Ruby", + "trim_material.tfc.salt_tfc": "salt", + "trim_material.tfc.sapphire_tfc": "Sapphire", + "trim_material.tfc.sodalite_tfc": "Sodalite", + "trim_material.tfc.coke_tfc": "Coke", + "trim_material.tfc.spessartine_tfc": "Spessartine", + "trim_material.tfc.topaz_tfc": "Topaz", + "trim_material.tfc.uvarovite_tfc": "Uvarovite", + "trim_material.tfc.nether_quartz_tfc": "Nether Quartz", + "trim_material.tfc.certus_quartz_tfc": "Certus Quartz", + "trim_material.tfc.quartzite_tfc": "Quartzite", + "trim_material.tfc.realgar_tfc": "Realgar", + "trim_material.tfc.malachite_tfc": "Malachite", + "trim_material.tfc.glass_tfc": "Glass", + "trim_material.tfc.olivine_tfc": "Olivine", + "trim_material.tfc.opal_tfc": "Opal", + "trim_material.tfc.amethyst_tfc": "Amethyst", + "trim_material.tfc.lapis_tfc": "Lapis", + "trim_material.tfc.apatite_tfc": "Apatite", + "trim_material.tfc.red_garnet_tfc": "Red Garnet", + "trim_material.tfc.yellow_garnet_tfc": "Yellow Garnet", + "trim_material.tfc.monazite_tfc": "Monazite", + "trim_material.tfc.rose_quartz_tfc": "Rose Quartz", + "trim_material.tfc.fluix_tfc": "Fluix", + "trim_material.tfc.silver_tfc": "Silver", + "trim_material.tfc.sterling_silver_tfc": "Sterling Silver", + "trim_material.tfc.gold_tfc": "Gold", + "trim_material.tfc.rose_gold_tfc": "Rose Gold", + "trim_material.tfc.nickel_tfc": "Nickel", + "trim_material.tfc.platinum_tfc": "Platinum", + "trim_material.tfc.titanium_tfc": "Titanium", + "trim_material.tfc.bismuth_tfc": "Bismuth", + "trim_material.tfc.neutronium_tfc": "Neutronium", + "trim_material.tfc.pyrite_tfc": "Pyrite", + "trim_material.tfc.redx_tfc": "RedX" } \ No newline at end of file diff --git a/kubejs/assets/tfc/lang/ru_ru.json b/kubejs/assets/tfc/lang/ru_ru.json index 9bc0f17a5..8a8cf334b 100644 --- a/kubejs/assets/tfc/lang/ru_ru.json +++ b/kubejs/assets/tfc/lang/ru_ru.json @@ -2,2265 +2,5 @@ "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "metal.tfg.redstone": "Красный камень", "metal.tfg.red_alloy": "Красный сплав", - "metal.tfg.tin_alloy": "Оловянный сплав", - "block.gtceu.andesite_almandine_ore.prospected": "Альмандин", - "block.gtceu.andesite_aluminium_ore.prospected": "Алюминий", - "block.gtceu.andesite_alunite_ore.prospected": "Алюнит", - "block.gtceu.andesite_amethyst_ore.prospected": "Аметист", - "block.gtceu.andesite_apatite_ore.prospected": "Апатит", - "block.gtceu.andesite_asbestos_ore.prospected": "Асбест", - "block.gtceu.andesite_barite_ore.prospected": "Барит", - "block.gtceu.andesite_basaltic_mineral_sand_ore.prospected": "Базальтовый минеральный песок", - "block.gtceu.andesite_bastnasite_ore.prospected": "Бастназит", - "block.gtceu.andesite_bauxite_ore.prospected": "Боксит", - "block.gtceu.andesite_bentonite_ore.prospected": "Бентонит", - "block.gtceu.andesite_beryllium_ore.prospected": "Бериллий", - "block.gtceu.andesite_bismuth_ore.prospected": "Висмут", - "block.gtceu.andesite_blue_topaz_ore.prospected": "Голубой топаз", - "block.gtceu.andesite_borax_ore.prospected": "Боракс", - "block.gtceu.andesite_bornite_ore.prospected": "Борнит", - "block.gtceu.andesite_calcite_ore.prospected": "Кальцит", - "block.gtceu.andesite_cassiterite_ore.prospected": "Касситерит", - "block.gtceu.andesite_cassiterite_sand_ore.prospected": "Касситеритовый песок", - "block.gtceu.andesite_certus_quartz_ore.prospected": "Сертус Кварц", - "block.gtceu.andesite_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.andesite_chalcopyrite_ore.prospected": "Халькопирит", - "block.gtceu.andesite_chromite_ore.prospected": "Хромит", - "block.gtceu.andesite_cinnabar_ore.prospected": "Киноварь", - "block.gtceu.andesite_coal_ore.prospected": "Уголь", - "block.gtceu.andesite_cobalt_ore.prospected": "Кобальт", - "block.gtceu.andesite_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.andesite_cooperite_ore.prospected": "Cooperite", - "block.gtceu.andesite_copper_ore.prospected": "Медь", - "block.gtceu.andesite_diamond_ore.prospected": "Алмаз", - "block.gtceu.andesite_diatomite_ore.prospected": "Диатомит", - "block.gtceu.andesite_electrotine_ore.prospected": "Электротин", - "block.gtceu.andesite_emerald_ore.prospected": "Изумруд", - "block.gtceu.andesite_fullers_earth_ore.prospected": "Фулерова земля", - "block.gtceu.andesite_galena_ore.prospected": "Галена", - "block.gtceu.andesite_garnet_sand_ore.prospected": "Гранатовый песок", - "block.gtceu.andesite_garnierite_ore.prospected": "Гарниерит", - "block.gtceu.andesite_glauconite_sand_ore.prospected": "Глауконитовый песок", - "block.gtceu.andesite_goethite_ore.prospected": "Гетит", - "block.gtceu.andesite_gold_ore.prospected": "Золото", - "block.gtceu.andesite_granitic_mineral_sand_ore.prospected": "Гранитный минеральный песок", - "block.gtceu.andesite_graphite_ore.prospected": "Графит", - "block.gtceu.andesite_green_sapphire_ore.prospected": "Зеленый сапфир", - "block.gtceu.andesite_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.andesite_gypsum_ore.prospected": "Гипс", - "block.gtceu.andesite_hematite_ore.prospected": "Гематит", - "block.gtceu.andesite_ilmenite_ore.prospected": "Ильменит", - "block.gtceu.andesite_iron_ore.prospected": "Железо", - "block.gtceu.andesite_kyanite_ore.prospected": "Кианит", - "block.gtceu.andesite_lapis_ore.prospected": "Лазурит", - "block.gtceu.andesite_lazurite_ore.prospected": "Сапожниковец", - "block.gtceu.andesite_lead_ore.prospected": "Свинец", - "block.gtceu.andesite_lepidolite_ore.prospected": "Лепидолит", - "block.gtceu.andesite_lithium_ore.prospected": "Литий", - "block.gtceu.andesite_magnesite_ore.prospected": "Магнезит", - "block.gtceu.andesite_magnetite_ore.prospected": "Магнетит", - "block.gtceu.andesite_malachite_ore.prospected": "Малахит", - "block.gtceu.andesite_mica_ore.prospected": "Слюда", - "block.gtceu.andesite_molybdenite_ore.prospected": "Молибденит", - "block.gtceu.andesite_molybdenum_ore.prospected": "Молибден", - "block.gtceu.andesite_monazite_ore.prospected": "Монацит", - "block.gtceu.andesite_naquadah_ore.prospected": "Наквада", - "block.gtceu.andesite_neodymium_ore.prospected": "Неодим", - "block.gtceu.andesite_nether_quartz_ore.prospected": "Кварц нижнего мира", - "block.gtceu.andesite_nickel_ore.prospected": "Никель", - "block.gtceu.andesite_oilsands_ore.prospected": "Нефтяные пески", - "block.gtceu.andesite_olivine_ore.prospected": "Оливин", - "block.gtceu.andesite_opal_ore.prospected": "Опал", - "block.gtceu.andesite_palladium_ore.prospected": "Палладий", - "block.gtceu.andesite_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.andesite_pitchblende_ore.prospected": "Горный хрусталь", - "block.gtceu.andesite_platinum_ore.prospected": "Платина", - "block.gtceu.andesite_plutonium_ore.prospected": "Плутоний", - "block.gtceu.andesite_pollucite_ore.prospected": "Поллуцит", - "block.gtceu.andesite_powellite_ore.prospected": "Пауэллит", - "block.gtceu.andesite_pyrite_ore.prospected": "Пирит", - "block.gtceu.andesite_pyrochlore_ore.prospected": "Пирохлор", - "block.gtceu.andesite_pyrolusite_ore.prospected": "Пиролюзит", - "block.gtceu.andesite_pyrope_ore.prospected": "Пироп", - "block.gtceu.andesite_quartzite_ore.prospected": "Кварцит", - "block.gtceu.andesite_realgar_ore.prospected": "Реалгар", - "block.gtceu.andesite_red_garnet_ore.prospected": "Красный гранат", - "block.gtceu.andesite_redstone_ore.prospected": "Красный камень", - "block.gtceu.andesite_rock_salt_ore.prospected": "Каменная соль", - "block.gtceu.andesite_ruby_ore.prospected": "Рубин", - "block.gtceu.andesite_salt_ore.prospected": "Соль", - "block.gtceu.andesite_saltpeter_ore.prospected": "Селитра", - "block.gtceu.andesite_sapphire_ore.prospected": "Сапфир", - "block.gtceu.andesite_scheelite_ore.prospected": "Шеелит", - "block.gtceu.andesite_silver_ore.prospected": "Серебро", - "block.gtceu.andesite_soapstone_ore.prospected": "Мыльный камень", - "block.gtceu.andesite_sodalite_ore.prospected": "Содалит", - "block.gtceu.andesite_spessartine_ore.prospected": "Спессартин", - "block.gtceu.andesite_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.andesite_spodumene_ore.prospected": "Сподумен", - "block.gtceu.andesite_stibnite_ore.prospected": "Стибнит", - "block.gtceu.andesite_sulfur_ore.prospected": "Сера", - "block.gtceu.andesite_sylvite_ore.prospected": "Сильвит", - "block.gtceu.andesite_talc_ore.prospected": "Тальк", - "block.gtceu.andesite_tantalite_ore.prospected": "Танталит", - "block.gtceu.andesite_tetrahedrite_ore.prospected": "Тетраэдрит", - "block.gtceu.andesite_thorium_ore.prospected": "Торий", - "block.gtceu.andesite_tin_ore.prospected": "Олово", - "block.gtceu.andesite_topaz_ore.prospected": "Топаз", - "block.gtceu.andesite_tricalcium_phosphate_ore.prospected": "Трикальцийфосфат", - "block.gtceu.andesite_trona_ore.prospected": "Трона", - "block.gtceu.andesite_tungstate_ore.prospected": "Вольфрамат", - "block.gtceu.andesite_uraninite_ore.prospected": "Уранинит", - "block.gtceu.andesite_vanadium_magnetite_ore.prospected": "Ванадиевый магнетит", - "block.gtceu.andesite_wulfenite_ore.prospected": "Вульфенит", - "block.gtceu.andesite_yellow_garnet_ore.prospected": "Желтый гранат", - "block.gtceu.andesite_yellow_limonite_ore.prospected": "Желтый лимонит", - "block.gtceu.andesite_zeolite_ore.prospected": "Цеолит", - "block.gtceu.basalt_almandine_ore.prospected": "Альмандин", - "block.gtceu.basalt_aluminium_ore.prospected": "Алюминий", - "block.gtceu.basalt_alunite_ore.prospected": "Алюнит", - "block.gtceu.basalt_amethyst_ore.prospected": "Аметист", - "block.gtceu.basalt_apatite_ore.prospected": "Апатит", - "block.gtceu.basalt_asbestos_ore.prospected": "Асбест", - "block.gtceu.basalt_barite_ore.prospected": "Барит", - "block.gtceu.basalt_basaltic_mineral_sand_ore.prospected": "Базальтовый минеральный песок", - "block.gtceu.basalt_bastnasite_ore.prospected": "Бастназит", - "block.gtceu.basalt_bauxite_ore.prospected": "Боксит", - "block.gtceu.basalt_bentonite_ore.prospected": "Бентонит", - "block.gtceu.basalt_beryllium_ore.prospected": "Бериллий", - "block.gtceu.basalt_bismuth_ore.prospected": "Висмут", - "block.gtceu.basalt_blue_topaz_ore.prospected": "Голубой топаз", - "block.gtceu.basalt_borax_ore.prospected": "Боракс", - "block.gtceu.basalt_bornite_ore.prospected": "Борнит", - "block.gtceu.basalt_calcite_ore.prospected": "Кальцит", - "block.gtceu.basalt_cassiterite_ore.prospected": "Касситерит", - "block.gtceu.basalt_cassiterite_sand_ore.prospected": "Касситеритовый песок", - "block.gtceu.basalt_certus_quartz_ore.prospected": "Сертус Кварц", - "block.gtceu.basalt_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.basalt_chalcopyrite_ore.prospected": "Халькопирит", - "block.gtceu.basalt_chromite_ore.prospected": "Хромит", - "block.gtceu.basalt_cinnabar_ore.prospected": "Киноварь", - "block.gtceu.basalt_coal_ore.prospected": "Уголь", - "block.gtceu.basalt_cobalt_ore.prospected": "Кобальт", - "block.gtceu.basalt_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.basalt_cooperite_ore.prospected": "Кооперит", - "block.gtceu.basalt_copper_ore.prospected": "Медь", - "block.gtceu.basalt_diamond_ore.prospected": "Алмаз", - "block.gtceu.basalt_diatomite_ore.prospected": "Диатомит", - "block.gtceu.basalt_electrotine_ore.prospected": "Электротин", - "block.gtceu.basalt_emerald_ore.prospected": "Изумруд", - "block.gtceu.basalt_fullers_earth_ore.prospected": "Фулерова земля", - "block.gtceu.basalt_galena_ore.prospected": "Галена", - "block.gtceu.basalt_garnet_sand_ore.prospected": "Гранатовый песок", - "block.gtceu.basalt_garnierite_ore.prospected": "Гарниерит", - "block.gtceu.basalt_glauconite_sand_ore.prospected": "Глауконитовый песок", - "block.gtceu.basalt_goethite_ore.prospected": "Гетит", - "block.gtceu.basalt_gold_ore.prospected": "Золото", - "block.gtceu.basalt_granitic_mineral_sand_ore.prospected": "Гранитный минеральный песок", - "block.gtceu.basalt_graphite_ore.prospected": "Графит", - "block.gtceu.basalt_green_sapphire_ore.prospected": "Зеленый сапфир", - "block.gtceu.basalt_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.basalt_gypsum_ore.prospected": "Гипс", - "block.gtceu.basalt_hematite_ore.prospected": "Гематит", - "block.gtceu.basalt_ilmenite_ore.prospected": "Ильменит", - "block.gtceu.basalt_iron_ore.prospected": "Железо", - "block.gtceu.basalt_kyanite_ore.prospected": "Кианит", - "block.gtceu.basalt_lapis_ore.prospected": "Лазурит", - "block.gtceu.basalt_lazurite_ore.prospected": "Сапожниковец", - "block.gtceu.basalt_lead_ore.prospected": "Свинец", - "block.gtceu.basalt_lepidolite_ore.prospected": "Лепидолит", - "block.gtceu.basalt_lithium_ore.prospected": "Литий", - "block.gtceu.basalt_magnesite_ore.prospected": "Магнезит", - "block.gtceu.basalt_magnetite_ore.prospected": "Магнетит", - "block.gtceu.basalt_malachite_ore.prospected": "Малахит", - "block.gtceu.basalt_mica_ore.prospected": "Слюда", - "block.gtceu.basalt_molybdenite_ore.prospected": "Молибденит", - "block.gtceu.basalt_molybdenum_ore.prospected": "Молибден", - "block.gtceu.basalt_monazite_ore.prospected": "Монацит", - "block.gtceu.basalt_naquadah_ore.prospected": "Наквада", - "block.gtceu.basalt_neodymium_ore.prospected": "Неодим", - "block.gtceu.basalt_nether_quartz_ore.prospected": "Кварц нижнего мира", - "block.gtceu.basalt_nickel_ore.prospected": "Никель", - "block.gtceu.basalt_oilsands_ore.prospected": "Нефтяные пески", - "block.gtceu.basalt_olivine_ore.prospected": "Оливин", - "block.gtceu.basalt_opal_ore.prospected": "Опал", - "block.gtceu.basalt_palladium_ore.prospected": "Палладий", - "block.gtceu.basalt_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.basalt_pitchblende_ore.prospected": "Горный хрусталь", - "block.gtceu.basalt_platinum_ore.prospected": "Платина", - "block.gtceu.basalt_plutonium_ore.prospected": "Плутоний", - "block.gtceu.basalt_pollucite_ore.prospected": "Поллуцит", - "block.gtceu.basalt_powellite_ore.prospected": "Пауэллит", - "block.gtceu.basalt_pyrite_ore.prospected": "Пирит", - "block.gtceu.basalt_pyrochlore_ore.prospected": "Пирохлор", - "block.gtceu.basalt_pyrolusite_ore.prospected": "Пиролюзит", - "block.gtceu.basalt_pyrope_ore.prospected": "Пироп", - "block.gtceu.basalt_quartzite_ore.prospected": "Кварцит", - "block.gtceu.basalt_realgar_ore.prospected": "Реалгар", - "block.gtceu.basalt_red_garnet_ore.prospected": "Красный гранат", - "block.gtceu.basalt_redstone_ore.prospected": "Красный камень", - "block.gtceu.basalt_rock_salt_ore.prospected": "Каменная соль", - "block.gtceu.basalt_ruby_ore.prospected": "Рубин", - "block.gtceu.basalt_salt_ore.prospected": "Соль", - "block.gtceu.basalt_saltpeter_ore.prospected": "Селитра", - "block.gtceu.basalt_sapphire_ore.prospected": "Сапфир", - "block.gtceu.basalt_scheelite_ore.prospected": "Шеелит", - "block.gtceu.basalt_silver_ore.prospected": "Серебро", - "block.gtceu.basalt_soapstone_ore.prospected": "Мыльный камень", - "block.gtceu.basalt_sodalite_ore.prospected": "Содалит", - "block.gtceu.basalt_spessartine_ore.prospected": "Спессартин", - "block.gtceu.basalt_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.basalt_spodumene_ore.prospected": "Сподумен", - "block.gtceu.basalt_stibnite_ore.prospected": "Стибнит", - "block.gtceu.basalt_sulfur_ore.prospected": "Сера", - "block.gtceu.basalt_sylvite_ore.prospected": "Сильвит", - "block.gtceu.basalt_talc_ore.prospected": "Тальк", - "block.gtceu.basalt_tantalite_ore.prospected": "Танталит", - "block.gtceu.basalt_tetrahedrite_ore.prospected": "Тетраэдрит", - "block.gtceu.basalt_thorium_ore.prospected": "Торий", - "block.gtceu.basalt_tin_ore.prospected": "Олово", - "block.gtceu.basalt_topaz_ore.prospected": "Топаз", - "block.gtceu.basalt_tricalcium_phosphate_ore.prospected": "Трикальцийфосфат", - "block.gtceu.basalt_trona_ore.prospected": "Трона", - "block.gtceu.basalt_tungstate_ore.prospected": "Вольфрамат", - "block.gtceu.basalt_uraninite_ore.prospected": "Уранинит", - "block.gtceu.basalt_vanadium_magnetite_ore.prospected": "Ванадиевый магнетит", - "block.gtceu.basalt_wulfenite_ore.prospected": "Вульфенит", - "block.gtceu.basalt_yellow_garnet_ore.prospected": "Желтый гранат", - "block.gtceu.basalt_yellow_limonite_ore.prospected": "Желтый лимонит", - "block.gtceu.basalt_zeolite_ore.prospected": "Цеолит", - "block.gtceu.chalk_almandine_ore.prospected": "Альмандин", - "block.gtceu.chalk_aluminium_ore.prospected": "Алюминий", - "block.gtceu.chalk_alunite_ore.prospected": "Алюнит", - "block.gtceu.chalk_amethyst_ore.prospected": "Аметист", - "block.gtceu.chalk_apatite_ore.prospected": "Апатит", - "block.gtceu.chalk_asbestos_ore.prospected": "Асбест", - "block.gtceu.chalk_barite_ore.prospected": "Барит", - "block.gtceu.chalk_basaltic_mineral_sand_ore.prospected": "Базальтовый минеральный песок", - "block.gtceu.chalk_bastnasite_ore.prospected": "Бастназит", - "block.gtceu.chalk_bauxite_ore.prospected": "Боксит", - "block.gtceu.chalk_bentonite_ore.prospected": "Бентонит", - "block.gtceu.chalk_beryllium_ore.prospected": "Бериллий", - "block.gtceu.chalk_bismuth_ore.prospected": "Висмут", - "block.gtceu.chalk_blue_topaz_ore.prospected": "Голубой топаз", - "block.gtceu.chalk_borax_ore.prospected": "Боракс", - "block.gtceu.chalk_bornite_ore.prospected": "Борнит", - "block.gtceu.chalk_calcite_ore.prospected": "Кальцит", - "block.gtceu.chalk_cassiterite_ore.prospected": "Касситерит", - "block.gtceu.chalk_cassiterite_sand_ore.prospected": "Касситеритовый песок", - "block.gtceu.chalk_certus_quartz_ore.prospected": "Сертус Кварц", - "block.gtceu.chalk_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.chalk_chalcopyrite_ore.prospected": "Халькопирит", - "block.gtceu.chalk_chromite_ore.prospected": "Хромит", - "block.gtceu.chalk_cinnabar_ore.prospected": "Киноварь", - "block.gtceu.chalk_coal_ore.prospected": "Уголь", - "block.gtceu.chalk_cobalt_ore.prospected": "Кобальт", - "block.gtceu.chalk_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.chalk_cooperite_ore.prospected": "Кооперит", - "block.gtceu.chalk_copper_ore.prospected": "Медь", - "block.gtceu.chalk_diamond_ore.prospected": "Алмаз", - "block.gtceu.chalk_diatomite_ore.prospected": "Диатомит", - "block.gtceu.chalk_electrotine_ore.prospected": "Электротин", - "block.gtceu.chalk_emerald_ore.prospected": "Изумруд", - "block.gtceu.chalk_fullers_earth_ore.prospected": "Фулерова земля", - "block.gtceu.chalk_galena_ore.prospected": "Галена", - "block.gtceu.chalk_garnet_sand_ore.prospected": "Гранатовый песок", - "block.gtceu.chalk_garnierite_ore.prospected": "Гарниерит", - "block.gtceu.chalk_glauconite_sand_ore.prospected": "Глауконитовый песок", - "block.gtceu.chalk_goethite_ore.prospected": "Гетит", - "block.gtceu.chalk_gold_ore.prospected": "Золото", - "block.gtceu.chalk_granitic_mineral_sand_ore.prospected": "Гранитный минеральный песок", - "block.gtceu.chalk_graphite_ore.prospected": "Графит", - "block.gtceu.chalk_green_sapphire_ore.prospected": "Зеленый сапфир", - "block.gtceu.chalk_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.chalk_gypsum_ore.prospected": "Гипс", - "block.gtceu.chalk_hematite_ore.prospected": "Гематит", - "block.gtceu.chalk_ilmenite_ore.prospected": "Ильменит", - "block.gtceu.chalk_iron_ore.prospected": "Железо", - "block.gtceu.chalk_kyanite_ore.prospected": "Кианит", - "block.gtceu.chalk_lapis_ore.prospected": "Лазурит", - "block.gtceu.chalk_lazurite_ore.prospected": "Сапожниковец", - "block.gtceu.chalk_lead_ore.prospected": "Свинец", - "block.gtceu.chalk_lepidolite_ore.prospected": "Лепидолит", - "block.gtceu.chalk_lithium_ore.prospected": "Литий", - "block.gtceu.chalk_magnesite_ore.prospected": "Магнезит", - "block.gtceu.chalk_magnetite_ore.prospected": "Магнетит", - "block.gtceu.chalk_malachite_ore.prospected": "Малахит", - "block.gtceu.chalk_mica_ore.prospected": "Слюда", - "block.gtceu.chalk_molybdenite_ore.prospected": "Молибденит", - "block.gtceu.chalk_molybdenum_ore.prospected": "Молибден", - "block.gtceu.chalk_monazite_ore.prospected": "Монацит", - "block.gtceu.chalk_naquadah_ore.prospected": "Наквада", - "block.gtceu.chalk_neodymium_ore.prospected": "Неодим", - "block.gtceu.chalk_nether_quartz_ore.prospected": "Кварц нижнего мира", - "block.gtceu.chalk_nickel_ore.prospected": "Никель", - "block.gtceu.chalk_oilsands_ore.prospected": "Нефтяные пески", - "block.gtceu.chalk_olivine_ore.prospected": "Оливин", - "block.gtceu.chalk_opal_ore.prospected": "Опал", - "block.gtceu.chalk_palladium_ore.prospected": "Палладий", - "block.gtceu.chalk_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.chalk_pitchblende_ore.prospected": "Горный хрусталь", - "block.gtceu.chalk_platinum_ore.prospected": "Платина", - "block.gtceu.chalk_plutonium_ore.prospected": "Плутоний", - "block.gtceu.chalk_pollucite_ore.prospected": "Поллуцит", - "block.gtceu.chalk_powellite_ore.prospected": "Пауэллит", - "block.gtceu.chalk_pyrite_ore.prospected": "Пирит", - "block.gtceu.chalk_pyrochlore_ore.prospected": "Пирохлор", - "block.gtceu.chalk_pyrolusite_ore.prospected": "Пиролюзит", - "block.gtceu.chalk_pyrope_ore.prospected": "Пироп", - "block.gtceu.chalk_quartzite_ore.prospected": "Кварцит", - "block.gtceu.chalk_realgar_ore.prospected": "Реалгар", - "block.gtceu.chalk_red_garnet_ore.prospected": "Красный гранат", - "block.gtceu.chalk_redstone_ore.prospected": "Красный камень", - "block.gtceu.chalk_rock_salt_ore.prospected": "Каменная соль", - "block.gtceu.chalk_ruby_ore.prospected": "Рубин", - "block.gtceu.chalk_salt_ore.prospected": "Соль", - "block.gtceu.chalk_saltpeter_ore.prospected": "Селитра", - "block.gtceu.chalk_sapphire_ore.prospected": "Сапфир", - "block.gtceu.chalk_scheelite_ore.prospected": "Шеелит", - "block.gtceu.chalk_silver_ore.prospected": "Серебро", - "block.gtceu.chalk_soapstone_ore.prospected": "Мыльный камень", - "block.gtceu.chalk_sodalite_ore.prospected": "Содалит", - "block.gtceu.chalk_spessartine_ore.prospected": "Спессартин", - "block.gtceu.chalk_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.chalk_spodumene_ore.prospected": "Сподумен", - "block.gtceu.chalk_stibnite_ore.prospected": "Стибнит", - "block.gtceu.chalk_sulfur_ore.prospected": "Сера", - "block.gtceu.chalk_sylvite_ore.prospected": "Сильвит", - "block.gtceu.chalk_talc_ore.prospected": "Тальк", - "block.gtceu.chalk_tantalite_ore.prospected": "Танталит", - "block.gtceu.chalk_tetrahedrite_ore.prospected": "Тетраэдрит", - "block.gtceu.chalk_thorium_ore.prospected": "Торий", - "block.gtceu.chalk_tin_ore.prospected": "Олово", - "block.gtceu.chalk_topaz_ore.prospected": "Топаз", - "block.gtceu.chalk_tricalcium_phosphate_ore.prospected": "Трикальцийфосфат", - "block.gtceu.chalk_trona_ore.prospected": "Трона", - "block.gtceu.chalk_tungstate_ore.prospected": "Вольфрамат", - "block.gtceu.chalk_uraninite_ore.prospected": "Уранинит", - "block.gtceu.chalk_vanadium_magnetite_ore.prospected": "Ванадиевый магнетит", - "block.gtceu.chalk_wulfenite_ore.prospected": "Вульфенит", - "block.gtceu.chalk_yellow_garnet_ore.prospected": "Желтый гранат", - "block.gtceu.chalk_yellow_limonite_ore.prospected": "Желтый лимонит", - "block.gtceu.chalk_zeolite_ore.prospected": "Цеолит", - "block.gtceu.chert_almandine_ore.prospected": "Альмандин", - "block.gtceu.chert_aluminium_ore.prospected": "Алюминий", - "block.gtceu.chert_alunite_ore.prospected": "Алюнит", - "block.gtceu.chert_amethyst_ore.prospected": "Аметист", - "block.gtceu.chert_apatite_ore.prospected": "Апатит", - "block.gtceu.chert_asbestos_ore.prospected": "Асбест", - "block.gtceu.chert_barite_ore.prospected": "Барит", - "block.gtceu.chert_basaltic_mineral_sand_ore.prospected": "Базальтовый минеральный песок", - "block.gtceu.chert_bastnasite_ore.prospected": "Бастназит", - "block.gtceu.chert_bauxite_ore.prospected": "Боксит", - "block.gtceu.chert_bentonite_ore.prospected": "Бентонит", - "block.gtceu.chert_beryllium_ore.prospected": "Бериллий", - "block.gtceu.chert_bismuth_ore.prospected": "Висмут", - "block.gtceu.chert_blue_topaz_ore.prospected": "Голубой топаз", - "block.gtceu.chert_borax_ore.prospected": "Боракс", - "block.gtceu.chert_bornite_ore.prospected": "Борнит", - "block.gtceu.chert_calcite_ore.prospected": "Кальцит", - "block.gtceu.chert_cassiterite_ore.prospected": "Касситерит", - "block.gtceu.chert_cassiterite_sand_ore.prospected": "Касситеритовый песок", - "block.gtceu.chert_certus_quartz_ore.prospected": "Сертус Кварц", - "block.gtceu.chert_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.chert_chalcopyrite_ore.prospected": "Халькопирит", - "block.gtceu.chert_chromite_ore.prospected": "Хромит", - "block.gtceu.chert_cinnabar_ore.prospected": "Киноварь", - "block.gtceu.chert_coal_ore.prospected": "Уголь", - "block.gtceu.chert_cobalt_ore.prospected": "Кобальт", - "block.gtceu.chert_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.chert_cooperite_ore.prospected": "Кооперит", - "block.gtceu.chert_copper_ore.prospected": "Медь", - "block.gtceu.chert_diamond_ore.prospected": "Алмаз", - "block.gtceu.chert_diatomite_ore.prospected": "Диатомит", - "block.gtceu.chert_electrotine_ore.prospected": "Электротин", - "block.gtceu.chert_emerald_ore.prospected": "Изумруд", - "block.gtceu.chert_fullers_earth_ore.prospected": "Фулерова земля", - "block.gtceu.chert_galena_ore.prospected": "Галена", - "block.gtceu.chert_garnet_sand_ore.prospected": "Гранатовый песок", - "block.gtceu.chert_garnierite_ore.prospected": "Гарниерит", - "block.gtceu.chert_glauconite_sand_ore.prospected": "Глауконитовый песок", - "block.gtceu.chert_goethite_ore.prospected": "Гетит", - "block.gtceu.chert_gold_ore.prospected": "Золото", - "block.gtceu.chert_granitic_mineral_sand_ore.prospected": "Гранитный минеральный песок", - "block.gtceu.chert_graphite_ore.prospected": "Графит", - "block.gtceu.chert_green_sapphire_ore.prospected": "Зеленый сапфир", - "block.gtceu.chert_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.chert_gypsum_ore.prospected": "Гипс", - "block.gtceu.chert_hematite_ore.prospected": "Гематит", - "block.gtceu.chert_ilmenite_ore.prospected": "Ильменит", - "block.gtceu.chert_iron_ore.prospected": "Железо", - "block.gtceu.chert_kyanite_ore.prospected": "Кианит", - "block.gtceu.chert_lapis_ore.prospected": "Лазурит", - "block.gtceu.chert_lazurite_ore.prospected": "Сапожниковец", - "block.gtceu.chert_lead_ore.prospected": "Свинец", - "block.gtceu.chert_lepidolite_ore.prospected": "Лепидолит", - "block.gtceu.chert_lithium_ore.prospected": "Литий", - "block.gtceu.chert_magnesite_ore.prospected": "Магнезит", - "block.gtceu.chert_magnetite_ore.prospected": "Магнетит", - "block.gtceu.chert_malachite_ore.prospected": "Малахит", - "block.gtceu.chert_mica_ore.prospected": "Слюда", - "block.gtceu.chert_molybdenite_ore.prospected": "Молибденит", - "block.gtceu.chert_molybdenum_ore.prospected": "Молибден", - "block.gtceu.chert_monazite_ore.prospected": "Монацит", - "block.gtceu.chert_naquadah_ore.prospected": "Наквада", - "block.gtceu.chert_neodymium_ore.prospected": "Неодим", - "block.gtceu.chert_nether_quartz_ore.prospected": "Кварц нижнего мира", - "block.gtceu.chert_nickel_ore.prospected": "Никель", - "block.gtceu.chert_oilsands_ore.prospected": "Нефтяные пески", - "block.gtceu.chert_olivine_ore.prospected": "Оливин", - "block.gtceu.chert_opal_ore.prospected": "Опал", - "block.gtceu.chert_palladium_ore.prospected": "Палладий", - "block.gtceu.chert_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.chert_pitchblende_ore.prospected": "Горный хрусталь", - "block.gtceu.chert_platinum_ore.prospected": "Платина", - "block.gtceu.chert_plutonium_ore.prospected": "Плутоний", - "block.gtceu.chert_pollucite_ore.prospected": "Поллуцит", - "block.gtceu.chert_powellite_ore.prospected": "Пауэллит", - "block.gtceu.chert_pyrite_ore.prospected": "Пирит", - "block.gtceu.chert_pyrochlore_ore.prospected": "Пирохлор", - "block.gtceu.chert_pyrolusite_ore.prospected": "Пиролюзит", - "block.gtceu.chert_pyrope_ore.prospected": "Пироп", - "block.gtceu.chert_quartzite_ore.prospected": "Кварцит", - "block.gtceu.chert_realgar_ore.prospected": "Реалгар", - "block.gtceu.chert_red_garnet_ore.prospected": "Красный гранат", - "block.gtceu.chert_redstone_ore.prospected": "Красный камень", - "block.gtceu.chert_rock_salt_ore.prospected": "Каменная соль", - "block.gtceu.chert_ruby_ore.prospected": "Рубин", - "block.gtceu.chert_salt_ore.prospected": "Соль", - "block.gtceu.chert_saltpeter_ore.prospected": "Селитра", - "block.gtceu.chert_sapphire_ore.prospected": "Сапфир", - "block.gtceu.chert_scheelite_ore.prospected": "Шеелит", - "block.gtceu.chert_silver_ore.prospected": "Серебро", - "block.gtceu.chert_soapstone_ore.prospected": "Мыльный камень", - "block.gtceu.chert_sodalite_ore.prospected": "Содалит", - "block.gtceu.chert_spessartine_ore.prospected": "Спессартин", - "block.gtceu.chert_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.chert_spodumene_ore.prospected": "Сподумен", - "block.gtceu.chert_stibnite_ore.prospected": "Стибнит", - "block.gtceu.chert_sulfur_ore.prospected": "Сера", - "block.gtceu.chert_sylvite_ore.prospected": "Сильвит", - "block.gtceu.chert_talc_ore.prospected": "Тальк", - "block.gtceu.chert_tantalite_ore.prospected": "Танталит", - "block.gtceu.chert_tetrahedrite_ore.prospected": "Тетраэдрит", - "block.gtceu.chert_thorium_ore.prospected": "Торий", - "block.gtceu.chert_tin_ore.prospected": "Олово", - "block.gtceu.chert_topaz_ore.prospected": "Топаз", - "block.gtceu.chert_tricalcium_phosphate_ore.prospected": "Трикальцийфосфат", - "block.gtceu.chert_trona_ore.prospected": "Трона", - "block.gtceu.chert_tungstate_ore.prospected": "Вольфрамат", - "block.gtceu.chert_uraninite_ore.prospected": "Уранинит", - "block.gtceu.chert_vanadium_magnetite_ore.prospected": "Ванадиевый магнетит", - "block.gtceu.chert_wulfenite_ore.prospected": "Вульфенит", - "block.gtceu.chert_yellow_garnet_ore.prospected": "Желтый гранат", - "block.gtceu.chert_yellow_limonite_ore.prospected": "Желтый лимонит", - "block.gtceu.chert_zeolite_ore.prospected": "Цеолит", - "block.gtceu.claystone_almandine_ore.prospected": "Альмандин", - "block.gtceu.claystone_aluminium_ore.prospected": "Алюминий", - "block.gtceu.claystone_alunite_ore.prospected": "Алюнит", - "block.gtceu.claystone_amethyst_ore.prospected": "Аметист", - "block.gtceu.claystone_apatite_ore.prospected": "Апатит", - "block.gtceu.claystone_asbestos_ore.prospected": "Асбест", - "block.gtceu.claystone_barite_ore.prospected": "Барит", - "block.gtceu.claystone_basaltic_mineral_sand_ore.prospected": "Базальтовый минеральный песок", - "block.gtceu.claystone_bastnasite_ore.prospected": "Бастназит", - "block.gtceu.claystone_bauxite_ore.prospected": "Боксит", - "block.gtceu.claystone_bentonite_ore.prospected": "Бентонит", - "block.gtceu.claystone_beryllium_ore.prospected": "Бериллий", - "block.gtceu.claystone_bismuth_ore.prospected": "Висмут", - "block.gtceu.claystone_blue_topaz_ore.prospected": "Голубой топаз", - "block.gtceu.claystone_borax_ore.prospected": "Боракс", - "block.gtceu.claystone_bornite_ore.prospected": "Борнит", - "block.gtceu.claystone_calcite_ore.prospected": "Кальцит", - "block.gtceu.claystone_cassiterite_ore.prospected": "Касситерит", - "block.gtceu.claystone_cassiterite_sand_ore.prospected": "Касситеритовый песок", - "block.gtceu.claystone_certus_quartz_ore.prospected": "Сертус Кварц", - "block.gtceu.claystone_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.claystone_chalcopyrite_ore.prospected": "Халькопирит", - "block.gtceu.claystone_chromite_ore.prospected": "Хромит", - "block.gtceu.claystone_cinnabar_ore.prospected": "Киноварь", - "block.gtceu.claystone_coal_ore.prospected": "Уголь", - "block.gtceu.claystone_cobalt_ore.prospected": "Кобальт", - "block.gtceu.claystone_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.claystone_cooperite_ore.prospected": "Кооперит", - "block.gtceu.claystone_copper_ore.prospected": "Медь", - "block.gtceu.claystone_diamond_ore.prospected": "Алмаз", - "block.gtceu.claystone_diatomite_ore.prospected": "Диатомит", - "block.gtceu.claystone_electrotine_ore.prospected": "Электротин", - "block.gtceu.claystone_emerald_ore.prospected": "Изумруд", - "block.gtceu.claystone_fullers_earth_ore.prospected": "Фулерова земля", - "block.gtceu.claystone_galena_ore.prospected": "Галена", - "block.gtceu.claystone_garnet_sand_ore.prospected": "Гранатовый песок", - "block.gtceu.claystone_garnierite_ore.prospected": "Гарниерит", - "block.gtceu.claystone_glauconite_sand_ore.prospected": "Глауконитовый песок", - "block.gtceu.claystone_goethite_ore.prospected": "Гетит", - "block.gtceu.claystone_gold_ore.prospected": "Золото", - "block.gtceu.claystone_granitic_mineral_sand_ore.prospected": "Гранитный минеральный песок", - "block.gtceu.claystone_graphite_ore.prospected": "Графит", - "block.gtceu.claystone_green_sapphire_ore.prospected": "Зеленый сапфир", - "block.gtceu.claystone_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.claystone_gypsum_ore.prospected": "Гипс", - "block.gtceu.claystone_hematite_ore.prospected": "Гематит", - "block.gtceu.claystone_ilmenite_ore.prospected": "Ильменит", - "block.gtceu.claystone_iron_ore.prospected": "Железо", - "block.gtceu.claystone_kyanite_ore.prospected": "Кианит", - "block.gtceu.claystone_lapis_ore.prospected": "Лазурит", - "block.gtceu.claystone_lazurite_ore.prospected": "Сапожниковец", - "block.gtceu.claystone_lead_ore.prospected": "Свинец", - "block.gtceu.claystone_lepidolite_ore.prospected": "Лепидолит", - "block.gtceu.claystone_lithium_ore.prospected": "Литий", - "block.gtceu.claystone_magnesite_ore.prospected": "Магнезит", - "block.gtceu.claystone_magnetite_ore.prospected": "Магнетит", - "block.gtceu.claystone_malachite_ore.prospected": "Малахит", - "block.gtceu.claystone_mica_ore.prospected": "Слюда", - "block.gtceu.claystone_molybdenite_ore.prospected": "Молибденит", - "block.gtceu.claystone_molybdenum_ore.prospected": "Молибден", - "block.gtceu.claystone_monazite_ore.prospected": "Монацит", - "block.gtceu.claystone_naquadah_ore.prospected": "Наквада", - "block.gtceu.claystone_neodymium_ore.prospected": "Неодим", - "block.gtceu.claystone_nether_quartz_ore.prospected": "Кварц нижнего мира", - "block.gtceu.claystone_nickel_ore.prospected": "Никель", - "block.gtceu.claystone_oilsands_ore.prospected": "Нефтяные пески", - "block.gtceu.claystone_olivine_ore.prospected": "Оливин", - "block.gtceu.claystone_opal_ore.prospected": "Опал", - "block.gtceu.claystone_palladium_ore.prospected": "Палладий", - "block.gtceu.claystone_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.claystone_pitchblende_ore.prospected": "Горный хрусталь", - "block.gtceu.claystone_platinum_ore.prospected": "Платина", - "block.gtceu.claystone_plutonium_ore.prospected": "Плутоний", - "block.gtceu.claystone_pollucite_ore.prospected": "Поллуцит", - "block.gtceu.claystone_powellite_ore.prospected": "Пауэллит", - "block.gtceu.claystone_pyrite_ore.prospected": "Пирит", - "block.gtceu.claystone_pyrochlore_ore.prospected": "Пирохлор", - "block.gtceu.claystone_pyrolusite_ore.prospected": "Пиролюзит", - "block.gtceu.claystone_pyrope_ore.prospected": "Пироп", - "block.gtceu.claystone_quartzite_ore.prospected": "Кварцит", - "block.gtceu.claystone_realgar_ore.prospected": "Реалгар", - "block.gtceu.claystone_red_garnet_ore.prospected": "Красный гранат", - "block.gtceu.claystone_redstone_ore.prospected": "Красный камень", - "block.gtceu.claystone_rock_salt_ore.prospected": "Каменная соль", - "block.gtceu.claystone_ruby_ore.prospected": "Рубин", - "block.gtceu.claystone_salt_ore.prospected": "Соль", - "block.gtceu.claystone_saltpeter_ore.prospected": "Селитра", - "block.gtceu.claystone_sapphire_ore.prospected": "Сапфир", - "block.gtceu.claystone_scheelite_ore.prospected": "Шеелит", - "block.gtceu.claystone_silver_ore.prospected": "Серебро", - "block.gtceu.claystone_soapstone_ore.prospected": "Мыльный камень", - "block.gtceu.claystone_sodalite_ore.prospected": "Содалит", - "block.gtceu.claystone_spessartine_ore.prospected": "Спессартин", - "block.gtceu.claystone_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.claystone_spodumene_ore.prospected": "Сподумен", - "block.gtceu.claystone_stibnite_ore.prospected": "Стибнит", - "block.gtceu.claystone_sulfur_ore.prospected": "Сера", - "block.gtceu.claystone_sylvite_ore.prospected": "Сильвит", - "block.gtceu.claystone_talc_ore.prospected": "Тальк", - "block.gtceu.claystone_tantalite_ore.prospected": "Танталит", - "block.gtceu.claystone_tetrahedrite_ore.prospected": "Тетраэдрит", - "block.gtceu.claystone_thorium_ore.prospected": "Торий", - "block.gtceu.claystone_tin_ore.prospected": "Олово", - "block.gtceu.claystone_topaz_ore.prospected": "Топаз", - "block.gtceu.claystone_tricalcium_phosphate_ore.prospected": "Трикальцийфосфат", - "block.gtceu.claystone_trona_ore.prospected": "Трона", - "block.gtceu.claystone_tungstate_ore.prospected": "Вольфрамат", - "block.gtceu.claystone_uraninite_ore.prospected": "Уранинит", - "block.gtceu.claystone_vanadium_magnetite_ore.prospected": "Ванадиевый магнетит", - "block.gtceu.claystone_wulfenite_ore.prospected": "Вульфенит", - "block.gtceu.claystone_yellow_garnet_ore.prospected": "Желтый гранат", - "block.gtceu.claystone_yellow_limonite_ore.prospected": "Желтый лимонит", - "block.gtceu.claystone_zeolite_ore.prospected": "Цеолит", - "block.gtceu.conglomerate_almandine_ore.prospected": "Альмандин", - "block.gtceu.conglomerate_aluminium_ore.prospected": "Алюминий", - "block.gtceu.conglomerate_alunite_ore.prospected": "Алюнит", - "block.gtceu.conglomerate_amethyst_ore.prospected": "Аметист", - "block.gtceu.conglomerate_apatite_ore.prospected": "Апатит", - "block.gtceu.conglomerate_asbestos_ore.prospected": "Асбест", - "block.gtceu.conglomerate_barite_ore.prospected": "Барит", - "block.gtceu.conglomerate_basaltic_mineral_sand_ore.prospected": "Базальтовый минеральный песок", - "block.gtceu.conglomerate_bastnasite_ore.prospected": "Бастназит", - "block.gtceu.conglomerate_bauxite_ore.prospected": "Боксит", - "block.gtceu.conglomerate_bentonite_ore.prospected": "Бентонит", - "block.gtceu.conglomerate_beryllium_ore.prospected": "Бериллий", - "block.gtceu.conglomerate_bismuth_ore.prospected": "Висмут", - "block.gtceu.conglomerate_blue_topaz_ore.prospected": "Голубой топаз", - "block.gtceu.conglomerate_borax_ore.prospected": "Боракс", - "block.gtceu.conglomerate_bornite_ore.prospected": "Борнит", - "block.gtceu.conglomerate_calcite_ore.prospected": "Кальцит", - "block.gtceu.conglomerate_cassiterite_ore.prospected": "Касситерит", - "block.gtceu.conglomerate_cassiterite_sand_ore.prospected": "Касситеритовый песок", - "block.gtceu.conglomerate_certus_quartz_ore.prospected": "Сертус Кварц", - "block.gtceu.conglomerate_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.conglomerate_chalcopyrite_ore.prospected": "Халькопирит", - "block.gtceu.conglomerate_chromite_ore.prospected": "Хромит", - "block.gtceu.conglomerate_cinnabar_ore.prospected": "Киноварь", - "block.gtceu.conglomerate_coal_ore.prospected": "Уголь", - "block.gtceu.conglomerate_cobalt_ore.prospected": "Кобальт", - "block.gtceu.conglomerate_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.conglomerate_cooperite_ore.prospected": "Кооперит", - "block.gtceu.conglomerate_copper_ore.prospected": "Медь", - "block.gtceu.conglomerate_diamond_ore.prospected": "Алмаз", - "block.gtceu.conglomerate_diatomite_ore.prospected": "Диатомит", - "block.gtceu.conglomerate_electrotine_ore.prospected": "Электротин", - "block.gtceu.conglomerate_emerald_ore.prospected": "Изумруд", - "block.gtceu.conglomerate_fullers_earth_ore.prospected": "Фулерова земля", - "block.gtceu.conglomerate_galena_ore.prospected": "Галена", - "block.gtceu.conglomerate_garnet_sand_ore.prospected": "Гранатовый песок", - "block.gtceu.conglomerate_garnierite_ore.prospected": "Гарниерит", - "block.gtceu.conglomerate_glauconite_sand_ore.prospected": "Глауконитовый песок", - "block.gtceu.conglomerate_goethite_ore.prospected": "Гетит", - "block.gtceu.conglomerate_gold_ore.prospected": "Золото", - "block.gtceu.conglomerate_granitic_mineral_sand_ore.prospected": "Гранитный минеральный песок", - "block.gtceu.conglomerate_graphite_ore.prospected": "Графит", - "block.gtceu.conglomerate_green_sapphire_ore.prospected": "Зеленый сапфир", - "block.gtceu.conglomerate_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.conglomerate_gypsum_ore.prospected": "Гипс", - "block.gtceu.conglomerate_hematite_ore.prospected": "Гематит", - "block.gtceu.conglomerate_ilmenite_ore.prospected": "Ильменит", - "block.gtceu.conglomerate_iron_ore.prospected": "Железо", - "block.gtceu.conglomerate_kyanite_ore.prospected": "Кианит", - "block.gtceu.conglomerate_lapis_ore.prospected": "Лазурит", - "block.gtceu.conglomerate_lazurite_ore.prospected": "Сапожниковец", - "block.gtceu.conglomerate_lead_ore.prospected": "Свинец", - "block.gtceu.conglomerate_lepidolite_ore.prospected": "Лепидолит", - "block.gtceu.conglomerate_lithium_ore.prospected": "Литий", - "block.gtceu.conglomerate_magnesite_ore.prospected": "Магнезит", - "block.gtceu.conglomerate_magnetite_ore.prospected": "Магнетит", - "block.gtceu.conglomerate_malachite_ore.prospected": "Малахит", - "block.gtceu.conglomerate_mica_ore.prospected": "Слюда", - "block.gtceu.conglomerate_molybdenite_ore.prospected": "Молибденит", - "block.gtceu.conglomerate_molybdenum_ore.prospected": "Молибден", - "block.gtceu.conglomerate_monazite_ore.prospected": "Монацит", - "block.gtceu.conglomerate_naquadah_ore.prospected": "Наквада", - "block.gtceu.conglomerate_neodymium_ore.prospected": "Неодим", - "block.gtceu.conglomerate_nether_quartz_ore.prospected": "Кварц нижнего мира", - "block.gtceu.conglomerate_nickel_ore.prospected": "Никель", - "block.gtceu.conglomerate_oilsands_ore.prospected": "Нефтяные пески", - "block.gtceu.conglomerate_olivine_ore.prospected": "Оливин", - "block.gtceu.conglomerate_opal_ore.prospected": "Опал", - "block.gtceu.conglomerate_palladium_ore.prospected": "Палладий", - "block.gtceu.conglomerate_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.conglomerate_pitchblende_ore.prospected": "Горный хрусталь", - "block.gtceu.conglomerate_platinum_ore.prospected": "Платина", - "block.gtceu.conglomerate_plutonium_ore.prospected": "Плутоний", - "block.gtceu.conglomerate_pollucite_ore.prospected": "Поллуцит", - "block.gtceu.conglomerate_powellite_ore.prospected": "Пауэллит", - "block.gtceu.conglomerate_pyrite_ore.prospected": "Пирит", - "block.gtceu.conglomerate_pyrochlore_ore.prospected": "Пирохлор", - "block.gtceu.conglomerate_pyrolusite_ore.prospected": "Пиролюзит", - "block.gtceu.conglomerate_pyrope_ore.prospected": "Пироп", - "block.gtceu.conglomerate_quartzite_ore.prospected": "Кварцит", - "block.gtceu.conglomerate_realgar_ore.prospected": "Реалгар", - "block.gtceu.conglomerate_red_garnet_ore.prospected": "Красный гранат", - "block.gtceu.conglomerate_redstone_ore.prospected": "Красный камень", - "block.gtceu.conglomerate_rock_salt_ore.prospected": "Каменная соль", - "block.gtceu.conglomerate_ruby_ore.prospected": "Рубин", - "block.gtceu.conglomerate_salt_ore.prospected": "Соль", - "block.gtceu.conglomerate_saltpeter_ore.prospected": "Селитра", - "block.gtceu.conglomerate_sapphire_ore.prospected": "Сапфир", - "block.gtceu.conglomerate_scheelite_ore.prospected": "Шеелит", - "block.gtceu.conglomerate_silver_ore.prospected": "Серебро", - "block.gtceu.conglomerate_soapstone_ore.prospected": "Мыльный камень", - "block.gtceu.conglomerate_sodalite_ore.prospected": "Содалит", - "block.gtceu.conglomerate_spessartine_ore.prospected": "Спессартин", - "block.gtceu.conglomerate_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.conglomerate_spodumene_ore.prospected": "Сподумен", - "block.gtceu.conglomerate_stibnite_ore.prospected": "Стибнит", - "block.gtceu.conglomerate_sulfur_ore.prospected": "Сера", - "block.gtceu.conglomerate_sylvite_ore.prospected": "Сильвит", - "block.gtceu.conglomerate_talc_ore.prospected": "Тальк", - "block.gtceu.conglomerate_tantalite_ore.prospected": "Танталит", - "block.gtceu.conglomerate_tetrahedrite_ore.prospected": "Тетраэдрит", - "block.gtceu.conglomerate_thorium_ore.prospected": "Торий", - "block.gtceu.conglomerate_tin_ore.prospected": "Олово", - "block.gtceu.conglomerate_topaz_ore.prospected": "Топаз", - "block.gtceu.conglomerate_tricalcium_phosphate_ore.prospected": "Трикальцийфосфат", - "block.gtceu.conglomerate_trona_ore.prospected": "Трона", - "block.gtceu.conglomerate_tungstate_ore.prospected": "Вольфрамат", - "block.gtceu.conglomerate_uraninite_ore.prospected": "Уранинит", - "block.gtceu.conglomerate_vanadium_magnetite_ore.prospected": "Ванадиевый магнетит", - "block.gtceu.conglomerate_wulfenite_ore.prospected": "Вульфенит", - "block.gtceu.conglomerate_yellow_garnet_ore.prospected": "Желтый гранат", - "block.gtceu.conglomerate_yellow_limonite_ore.prospected": "Желтый лимонит", - "block.gtceu.conglomerate_zeolite_ore.prospected": "Цеолит", - "block.gtceu.dacite_almandine_ore.prospected": "Альмандин", - "block.gtceu.dacite_aluminium_ore.prospected": "Алюминий", - "block.gtceu.dacite_alunite_ore.prospected": "Алюнит", - "block.gtceu.dacite_amethyst_ore.prospected": "Аметист", - "block.gtceu.dacite_apatite_ore.prospected": "Апатит", - "block.gtceu.dacite_asbestos_ore.prospected": "Асбест", - "block.gtceu.dacite_barite_ore.prospected": "Барит", - "block.gtceu.dacite_basaltic_mineral_sand_ore.prospected": "Базальтовый минеральный песок", - "block.gtceu.dacite_bastnasite_ore.prospected": "Бастназит", - "block.gtceu.dacite_bauxite_ore.prospected": "Боксит", - "block.gtceu.dacite_bentonite_ore.prospected": "Бентонит", - "block.gtceu.dacite_beryllium_ore.prospected": "Бериллий", - "block.gtceu.dacite_bismuth_ore.prospected": "Висмут", - "block.gtceu.dacite_blue_topaz_ore.prospected": "Голубой топаз", - "block.gtceu.dacite_borax_ore.prospected": "Боракс", - "block.gtceu.dacite_bornite_ore.prospected": "Борнит", - "block.gtceu.dacite_calcite_ore.prospected": "Кальцит", - "block.gtceu.dacite_cassiterite_ore.prospected": "Касситерит", - "block.gtceu.dacite_cassiterite_sand_ore.prospected": "Касситеритовый песок", - "block.gtceu.dacite_certus_quartz_ore.prospected": "Сертус Кварц", - "block.gtceu.dacite_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.dacite_chalcopyrite_ore.prospected": "Халькопирит", - "block.gtceu.dacite_chromite_ore.prospected": "Хромит", - "block.gtceu.dacite_cinnabar_ore.prospected": "Киноварь", - "block.gtceu.dacite_coal_ore.prospected": "Уголь", - "block.gtceu.dacite_cobalt_ore.prospected": "Кобальт", - "block.gtceu.dacite_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.dacite_cooperite_ore.prospected": "Кооперит", - "block.gtceu.dacite_copper_ore.prospected": "Медь", - "block.gtceu.dacite_diamond_ore.prospected": "Алмаз", - "block.gtceu.dacite_diatomite_ore.prospected": "Диатомит", - "block.gtceu.dacite_electrotine_ore.prospected": "Электротин", - "block.gtceu.dacite_emerald_ore.prospected": "Изумруд", - "block.gtceu.dacite_fullers_earth_ore.prospected": "Фулерова земля", - "block.gtceu.dacite_galena_ore.prospected": "Галена", - "block.gtceu.dacite_garnet_sand_ore.prospected": "Гранатовый песок", - "block.gtceu.dacite_garnierite_ore.prospected": "Гарниерит", - "block.gtceu.dacite_glauconite_sand_ore.prospected": "Глауконитовый песок", - "block.gtceu.dacite_goethite_ore.prospected": "Гетит", - "block.gtceu.dacite_gold_ore.prospected": "Золото", - "block.gtceu.dacite_granitic_mineral_sand_ore.prospected": "Гранитный минеральный песок", - "block.gtceu.dacite_graphite_ore.prospected": "Графит", - "block.gtceu.dacite_green_sapphire_ore.prospected": "Зеленый сапфир", - "block.gtceu.dacite_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.dacite_gypsum_ore.prospected": "Гипс", - "block.gtceu.dacite_hematite_ore.prospected": "Гематит", - "block.gtceu.dacite_ilmenite_ore.prospected": "Ильменит", - "block.gtceu.dacite_iron_ore.prospected": "Железо", - "block.gtceu.dacite_kyanite_ore.prospected": "Кианит", - "block.gtceu.dacite_lapis_ore.prospected": "Лазурит", - "block.gtceu.dacite_lazurite_ore.prospected": "Сапожниковец", - "block.gtceu.dacite_lead_ore.prospected": "Свинец", - "block.gtceu.dacite_lepidolite_ore.prospected": "Лепидолит", - "block.gtceu.dacite_lithium_ore.prospected": "Литий", - "block.gtceu.dacite_magnesite_ore.prospected": "Магнезит", - "block.gtceu.dacite_magnetite_ore.prospected": "Магнетит", - "block.gtceu.dacite_malachite_ore.prospected": "Малахит", - "block.gtceu.dacite_mica_ore.prospected": "Слюда", - "block.gtceu.dacite_molybdenite_ore.prospected": "Молибденит", - "block.gtceu.dacite_molybdenum_ore.prospected": "Молибден", - "block.gtceu.dacite_monazite_ore.prospected": "Монацит", - "block.gtceu.dacite_naquadah_ore.prospected": "Наквада", - "block.gtceu.dacite_neodymium_ore.prospected": "Неодим", - "block.gtceu.dacite_nether_quartz_ore.prospected": "Кварц нижнего мира", - "block.gtceu.dacite_nickel_ore.prospected": "Никель", - "block.gtceu.dacite_oilsands_ore.prospected": "Нефтяные пески", - "block.gtceu.dacite_olivine_ore.prospected": "Оливин", - "block.gtceu.dacite_opal_ore.prospected": "Опал", - "block.gtceu.dacite_palladium_ore.prospected": "Палладий", - "block.gtceu.dacite_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.dacite_pitchblende_ore.prospected": "Горный хрусталь", - "block.gtceu.dacite_platinum_ore.prospected": "Платина", - "block.gtceu.dacite_plutonium_ore.prospected": "Плутоний", - "block.gtceu.dacite_pollucite_ore.prospected": "Поллуцит", - "block.gtceu.dacite_powellite_ore.prospected": "Пауэллит", - "block.gtceu.dacite_pyrite_ore.prospected": "Пирит", - "block.gtceu.dacite_pyrochlore_ore.prospected": "Пирохлор", - "block.gtceu.dacite_pyrolusite_ore.prospected": "Пиролюзит", - "block.gtceu.dacite_pyrope_ore.prospected": "Пироп", - "block.gtceu.dacite_quartzite_ore.prospected": "Кварцит", - "block.gtceu.dacite_realgar_ore.prospected": "Реалгар", - "block.gtceu.dacite_red_garnet_ore.prospected": "Красный гранат", - "block.gtceu.dacite_redstone_ore.prospected": "Красный камень", - "block.gtceu.dacite_rock_salt_ore.prospected": "Каменная соль", - "block.gtceu.dacite_ruby_ore.prospected": "Рубин", - "block.gtceu.dacite_salt_ore.prospected": "Соль", - "block.gtceu.dacite_saltpeter_ore.prospected": "Селитра", - "block.gtceu.dacite_sapphire_ore.prospected": "Сапфир", - "block.gtceu.dacite_scheelite_ore.prospected": "Шеелит", - "block.gtceu.dacite_silver_ore.prospected": "Серебро", - "block.gtceu.dacite_soapstone_ore.prospected": "Мыльный камень", - "block.gtceu.dacite_sodalite_ore.prospected": "Содалит", - "block.gtceu.dacite_spessartine_ore.prospected": "Спессартин", - "block.gtceu.dacite_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.dacite_spodumene_ore.prospected": "Сподумен", - "block.gtceu.dacite_stibnite_ore.prospected": "Стибнит", - "block.gtceu.dacite_sulfur_ore.prospected": "Сера", - "block.gtceu.dacite_sylvite_ore.prospected": "Сильвит", - "block.gtceu.dacite_talc_ore.prospected": "Тальк", - "block.gtceu.dacite_tantalite_ore.prospected": "Танталит", - "block.gtceu.dacite_tetrahedrite_ore.prospected": "Тетраэдрит", - "block.gtceu.dacite_thorium_ore.prospected": "Торий", - "block.gtceu.dacite_tin_ore.prospected": "Олово", - "block.gtceu.dacite_topaz_ore.prospected": "Топаз", - "block.gtceu.dacite_tricalcium_phosphate_ore.prospected": "Трикальцийфосфат", - "block.gtceu.dacite_trona_ore.prospected": "Трона", - "block.gtceu.dacite_tungstate_ore.prospected": "Вольфрамат", - "block.gtceu.dacite_uraninite_ore.prospected": "Уранинит", - "block.gtceu.dacite_vanadium_magnetite_ore.prospected": "Ванадиевый магнетит", - "block.gtceu.dacite_wulfenite_ore.prospected": "Вульфенит", - "block.gtceu.dacite_yellow_garnet_ore.prospected": "Желтый гранат", - "block.gtceu.dacite_yellow_limonite_ore.prospected": "Желтый лимонит", - "block.gtceu.dacite_zeolite_ore.prospected": "Цеолит", - "block.gtceu.diorite_almandine_ore.prospected": "Альмандин", - "block.gtceu.diorite_aluminium_ore.prospected": "Алюминий", - "block.gtceu.diorite_alunite_ore.prospected": "Алюнит", - "block.gtceu.diorite_amethyst_ore.prospected": "Аметист", - "block.gtceu.diorite_apatite_ore.prospected": "Апатит", - "block.gtceu.diorite_asbestos_ore.prospected": "Асбест", - "block.gtceu.diorite_barite_ore.prospected": "Барит", - "block.gtceu.diorite_basaltic_mineral_sand_ore.prospected": "Базальтовый минеральный песок", - "block.gtceu.diorite_bastnasite_ore.prospected": "Бастназит", - "block.gtceu.diorite_bauxite_ore.prospected": "Боксит", - "block.gtceu.diorite_bentonite_ore.prospected": "Бентонит", - "block.gtceu.diorite_beryllium_ore.prospected": "Бериллий", - "block.gtceu.diorite_bismuth_ore.prospected": "Висмут", - "block.gtceu.diorite_blue_topaz_ore.prospected": "Голубой топаз", - "block.gtceu.diorite_borax_ore.prospected": "Боракс", - "block.gtceu.diorite_bornite_ore.prospected": "Борнит", - "block.gtceu.diorite_calcite_ore.prospected": "Кальцит", - "block.gtceu.diorite_cassiterite_ore.prospected": "Касситерит", - "block.gtceu.diorite_cassiterite_sand_ore.prospected": "Касситеритовый песок", - "block.gtceu.diorite_certus_quartz_ore.prospected": "Сертус Кварц", - "block.gtceu.diorite_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.diorite_chalcopyrite_ore.prospected": "Халькопирит", - "block.gtceu.diorite_chromite_ore.prospected": "Хромит", - "block.gtceu.diorite_cinnabar_ore.prospected": "Киноварь", - "block.gtceu.diorite_coal_ore.prospected": "Уголь", - "block.gtceu.diorite_cobalt_ore.prospected": "Кобальт", - "block.gtceu.diorite_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.diorite_cooperite_ore.prospected": "Кооперит", - "block.gtceu.diorite_copper_ore.prospected": "Медь", - "block.gtceu.diorite_diamond_ore.prospected": "Алмаз", - "block.gtceu.diorite_diatomite_ore.prospected": "Диатомит", - "block.gtceu.diorite_electrotine_ore.prospected": "Электротин", - "block.gtceu.diorite_emerald_ore.prospected": "Изумруд", - "block.gtceu.diorite_fullers_earth_ore.prospected": "Фулерова земля", - "block.gtceu.diorite_galena_ore.prospected": "Галена", - "block.gtceu.diorite_garnet_sand_ore.prospected": "Гранатовый песок", - "block.gtceu.diorite_garnierite_ore.prospected": "Гарниерит", - "block.gtceu.diorite_glauconite_sand_ore.prospected": "Глауконитовый песок", - "block.gtceu.diorite_goethite_ore.prospected": "Гетит", - "block.gtceu.diorite_gold_ore.prospected": "Золото", - "block.gtceu.diorite_granitic_mineral_sand_ore.prospected": "Гранитный минеральный песок", - "block.gtceu.diorite_graphite_ore.prospected": "Графит", - "block.gtceu.diorite_green_sapphire_ore.prospected": "Зеленый сапфир", - "block.gtceu.diorite_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.diorite_gypsum_ore.prospected": "Гипс", - "block.gtceu.diorite_hematite_ore.prospected": "Гематит", - "block.gtceu.diorite_ilmenite_ore.prospected": "Ильменит", - "block.gtceu.diorite_iron_ore.prospected": "Железо", - "block.gtceu.diorite_kyanite_ore.prospected": "Кианит", - "block.gtceu.diorite_lapis_ore.prospected": "Лазурит", - "block.gtceu.diorite_lazurite_ore.prospected": "Сапожниковец", - "block.gtceu.diorite_lead_ore.prospected": "Свинец", - "block.gtceu.diorite_lepidolite_ore.prospected": "Лепидолит", - "block.gtceu.diorite_lithium_ore.prospected": "Литий", - "block.gtceu.diorite_magnesite_ore.prospected": "Магнезит", - "block.gtceu.diorite_magnetite_ore.prospected": "Магнетит", - "block.gtceu.diorite_malachite_ore.prospected": "Малахит", - "block.gtceu.diorite_mica_ore.prospected": "Слюда", - "block.gtceu.diorite_molybdenite_ore.prospected": "Молибденит", - "block.gtceu.diorite_molybdenum_ore.prospected": "Молибден", - "block.gtceu.diorite_monazite_ore.prospected": "Монацит", - "block.gtceu.diorite_naquadah_ore.prospected": "Наквада", - "block.gtceu.diorite_neodymium_ore.prospected": "Неодим", - "block.gtceu.diorite_nether_quartz_ore.prospected": "Кварц нижнего мира", - "block.gtceu.diorite_nickel_ore.prospected": "Никель", - "block.gtceu.diorite_oilsands_ore.prospected": "Нефтяные пески", - "block.gtceu.diorite_olivine_ore.prospected": "Оливин", - "block.gtceu.diorite_opal_ore.prospected": "Опал", - "block.gtceu.diorite_palladium_ore.prospected": "Палладий", - "block.gtceu.diorite_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.diorite_pitchblende_ore.prospected": "Горный хрусталь", - "block.gtceu.diorite_platinum_ore.prospected": "Платина", - "block.gtceu.diorite_plutonium_ore.prospected": "Плутоний", - "block.gtceu.diorite_pollucite_ore.prospected": "Поллуцит", - "block.gtceu.diorite_powellite_ore.prospected": "Пауэллит", - "block.gtceu.diorite_pyrite_ore.prospected": "Пирит", - "block.gtceu.diorite_pyrochlore_ore.prospected": "Пирохлор", - "block.gtceu.diorite_pyrolusite_ore.prospected": "Пиролюзит", - "block.gtceu.diorite_pyrope_ore.prospected": "Пироп", - "block.gtceu.diorite_quartzite_ore.prospected": "Кварцит", - "block.gtceu.diorite_realgar_ore.prospected": "Реалгар", - "block.gtceu.diorite_red_garnet_ore.prospected": "Красный гранат", - "block.gtceu.diorite_redstone_ore.prospected": "Красный камень", - "block.gtceu.diorite_rock_salt_ore.prospected": "Каменная соль", - "block.gtceu.diorite_ruby_ore.prospected": "Рубин", - "block.gtceu.diorite_salt_ore.prospected": "Соль", - "block.gtceu.diorite_saltpeter_ore.prospected": "Селитра", - "block.gtceu.diorite_sapphire_ore.prospected": "Сапфир", - "block.gtceu.diorite_scheelite_ore.prospected": "Шеелит", - "block.gtceu.diorite_silver_ore.prospected": "Серебро", - "block.gtceu.diorite_soapstone_ore.prospected": "Мыльный камень", - "block.gtceu.diorite_sodalite_ore.prospected": "Содалит", - "block.gtceu.diorite_spessartine_ore.prospected": "Спессартин", - "block.gtceu.diorite_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.diorite_spodumene_ore.prospected": "Сподумен", - "block.gtceu.diorite_stibnite_ore.prospected": "Стибнит", - "block.gtceu.diorite_sulfur_ore.prospected": "Сера", - "block.gtceu.diorite_sylvite_ore.prospected": "Сильвит", - "block.gtceu.diorite_talc_ore.prospected": "Тальк", - "block.gtceu.diorite_tantalite_ore.prospected": "Танталит", - "block.gtceu.diorite_tetrahedrite_ore.prospected": "Тетраэдрит", - "block.gtceu.diorite_thorium_ore.prospected": "Торий", - "block.gtceu.diorite_tin_ore.prospected": "Олово", - "block.gtceu.diorite_topaz_ore.prospected": "Топаз", - "block.gtceu.diorite_tricalcium_phosphate_ore.prospected": "Трикальцийфосфат", - "block.gtceu.diorite_trona_ore.prospected": "Трона", - "block.gtceu.diorite_tungstate_ore.prospected": "Вольфрамат", - "block.gtceu.diorite_uraninite_ore.prospected": "Уранинит", - "block.gtceu.diorite_vanadium_magnetite_ore.prospected": "Ванадиевый магнетит", - "block.gtceu.diorite_wulfenite_ore.prospected": "Вульфенит", - "block.gtceu.diorite_yellow_garnet_ore.prospected": "Желтый гранат", - "block.gtceu.diorite_yellow_limonite_ore.prospected": "Желтый лимонит", - "block.gtceu.diorite_zeolite_ore.prospected": "Цеолит", - "block.gtceu.dolomite_almandine_ore.prospected": "Альмандин", - "block.gtceu.dolomite_aluminium_ore.prospected": "Алюминий", - "block.gtceu.dolomite_alunite_ore.prospected": "Алюнит", - "block.gtceu.dolomite_amethyst_ore.prospected": "Аметист", - "block.gtceu.dolomite_apatite_ore.prospected": "Апатит", - "block.gtceu.dolomite_asbestos_ore.prospected": "Асбест", - "block.gtceu.dolomite_barite_ore.prospected": "Барит", - "block.gtceu.dolomite_basaltic_mineral_sand_ore.prospected": "Базальтовый минеральный песок", - "block.gtceu.dolomite_bastnasite_ore.prospected": "Бастназит", - "block.gtceu.dolomite_bauxite_ore.prospected": "Боксит", - "block.gtceu.dolomite_bentonite_ore.prospected": "Бентонит", - "block.gtceu.dolomite_beryllium_ore.prospected": "Бериллий", - "block.gtceu.dolomite_bismuth_ore.prospected": "Висмут", - "block.gtceu.dolomite_blue_topaz_ore.prospected": "Голубой топаз", - "block.gtceu.dolomite_borax_ore.prospected": "Боракс", - "block.gtceu.dolomite_bornite_ore.prospected": "Борнит", - "block.gtceu.dolomite_calcite_ore.prospected": "Кальцит", - "block.gtceu.dolomite_cassiterite_ore.prospected": "Касситерит", - "block.gtceu.dolomite_cassiterite_sand_ore.prospected": "Касситеритовый песок", - "block.gtceu.dolomite_certus_quartz_ore.prospected": "Сертус Кварц", - "block.gtceu.dolomite_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.dolomite_chalcopyrite_ore.prospected": "Халькопирит", - "block.gtceu.dolomite_chromite_ore.prospected": "Хромит", - "block.gtceu.dolomite_cinnabar_ore.prospected": "Киноварь", - "block.gtceu.dolomite_coal_ore.prospected": "Уголь", - "block.gtceu.dolomite_cobalt_ore.prospected": "Кобальт", - "block.gtceu.dolomite_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.dolomite_cooperite_ore.prospected": "Кооперит", - "block.gtceu.dolomite_copper_ore.prospected": "Медь", - "block.gtceu.dolomite_diamond_ore.prospected": "Алмаз", - "block.gtceu.dolomite_diatomite_ore.prospected": "Диатомит", - "block.gtceu.dolomite_electrotine_ore.prospected": "Электротин", - "block.gtceu.dolomite_emerald_ore.prospected": "Изумруд", - "block.gtceu.dolomite_fullers_earth_ore.prospected": "Фулерова земля", - "block.gtceu.dolomite_galena_ore.prospected": "Галена", - "block.gtceu.dolomite_garnet_sand_ore.prospected": "Гранатовый песок", - "block.gtceu.dolomite_garnierite_ore.prospected": "Гарниерит", - "block.gtceu.dolomite_glauconite_sand_ore.prospected": "Глауконитовый песок", - "block.gtceu.dolomite_goethite_ore.prospected": "Гетит", - "block.gtceu.dolomite_gold_ore.prospected": "Золото", - "block.gtceu.dolomite_granitic_mineral_sand_ore.prospected": "Гранитный минеральный песок", - "block.gtceu.dolomite_graphite_ore.prospected": "Графит", - "block.gtceu.dolomite_green_sapphire_ore.prospected": "Зеленый сапфир", - "block.gtceu.dolomite_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.dolomite_gypsum_ore.prospected": "Гипс", - "block.gtceu.dolomite_hematite_ore.prospected": "Гематит", - "block.gtceu.dolomite_ilmenite_ore.prospected": "Ильменит", - "block.gtceu.dolomite_iron_ore.prospected": "Железо", - "block.gtceu.dolomite_kyanite_ore.prospected": "Кианит", - "block.gtceu.dolomite_lapis_ore.prospected": "Лазурит", - "block.gtceu.dolomite_lazurite_ore.prospected": "Сапожниковец", - "block.gtceu.dolomite_lead_ore.prospected": "Свинец", - "block.gtceu.dolomite_lepidolite_ore.prospected": "Лепидолит", - "block.gtceu.dolomite_lithium_ore.prospected": "Литий", - "block.gtceu.dolomite_magnesite_ore.prospected": "Магнезит", - "block.gtceu.dolomite_magnetite_ore.prospected": "Магнетит", - "block.gtceu.dolomite_malachite_ore.prospected": "Малахит", - "block.gtceu.dolomite_mica_ore.prospected": "Слюда", - "block.gtceu.dolomite_molybdenite_ore.prospected": "Молибденит", - "block.gtceu.dolomite_molybdenum_ore.prospected": "Молибден", - "block.gtceu.dolomite_monazite_ore.prospected": "Монацит", - "block.gtceu.dolomite_naquadah_ore.prospected": "Наквада", - "block.gtceu.dolomite_neodymium_ore.prospected": "Неодим", - "block.gtceu.dolomite_nether_quartz_ore.prospected": "Кварц нижнего мира", - "block.gtceu.dolomite_nickel_ore.prospected": "Никель", - "block.gtceu.dolomite_oilsands_ore.prospected": "Нефтяные пески", - "block.gtceu.dolomite_olivine_ore.prospected": "Оливин", - "block.gtceu.dolomite_opal_ore.prospected": "Опал", - "block.gtceu.dolomite_palladium_ore.prospected": "Палладий", - "block.gtceu.dolomite_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.dolomite_pitchblende_ore.prospected": "Горный хрусталь", - "block.gtceu.dolomite_platinum_ore.prospected": "Платина", - "block.gtceu.dolomite_plutonium_ore.prospected": "Плутоний", - "block.gtceu.dolomite_pollucite_ore.prospected": "Поллуцит", - "block.gtceu.dolomite_powellite_ore.prospected": "Пауэллит", - "block.gtceu.dolomite_pyrite_ore.prospected": "Пирит", - "block.gtceu.dolomite_pyrochlore_ore.prospected": "Пирохлор", - "block.gtceu.dolomite_pyrolusite_ore.prospected": "Пиролюзит", - "block.gtceu.dolomite_pyrope_ore.prospected": "Пироп", - "block.gtceu.dolomite_quartzite_ore.prospected": "Кварцит", - "block.gtceu.dolomite_realgar_ore.prospected": "Реалгар", - "block.gtceu.dolomite_red_garnet_ore.prospected": "Красный гранат", - "block.gtceu.dolomite_redstone_ore.prospected": "Красный камень", - "block.gtceu.dolomite_rock_salt_ore.prospected": "Каменная соль", - "block.gtceu.dolomite_ruby_ore.prospected": "Рубин", - "block.gtceu.dolomite_salt_ore.prospected": "Соль", - "block.gtceu.dolomite_saltpeter_ore.prospected": "Селитра", - "block.gtceu.dolomite_sapphire_ore.prospected": "Сапфир", - "block.gtceu.dolomite_scheelite_ore.prospected": "Шеелит", - "block.gtceu.dolomite_silver_ore.prospected": "Серебро", - "block.gtceu.dolomite_soapstone_ore.prospected": "Мыльный камень", - "block.gtceu.dolomite_sodalite_ore.prospected": "Содалит", - "block.gtceu.dolomite_spessartine_ore.prospected": "Спессартин", - "block.gtceu.dolomite_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.dolomite_spodumene_ore.prospected": "Сподумен", - "block.gtceu.dolomite_stibnite_ore.prospected": "Стибнит", - "block.gtceu.dolomite_sulfur_ore.prospected": "Сера", - "block.gtceu.dolomite_sylvite_ore.prospected": "Сильвит", - "block.gtceu.dolomite_talc_ore.prospected": "Тальк", - "block.gtceu.dolomite_tantalite_ore.prospected": "Танталит", - "block.gtceu.dolomite_tetrahedrite_ore.prospected": "Тетраэдрит", - "block.gtceu.dolomite_thorium_ore.prospected": "Торий", - "block.gtceu.dolomite_tin_ore.prospected": "Олово", - "block.gtceu.dolomite_topaz_ore.prospected": "Топаз", - "block.gtceu.dolomite_tricalcium_phosphate_ore.prospected": "Трикальцийфосфат", - "block.gtceu.dolomite_trona_ore.prospected": "Трона", - "block.gtceu.dolomite_tungstate_ore.prospected": "Вольфрамат", - "block.gtceu.dolomite_uraninite_ore.prospected": "Уранинит", - "block.gtceu.dolomite_vanadium_magnetite_ore.prospected": "Ванадиевый магнетит", - "block.gtceu.dolomite_wulfenite_ore.prospected": "Вульфенит", - "block.gtceu.dolomite_yellow_garnet_ore.prospected": "Желтый гранат", - "block.gtceu.dolomite_yellow_limonite_ore.prospected": "Желтый лимонит", - "block.gtceu.dolomite_zeolite_ore.prospected": "Цеолит", - "block.gtceu.gabbro_almandine_ore.prospected": "Альмандин", - "block.gtceu.gabbro_aluminium_ore.prospected": "Алюминий", - "block.gtceu.gabbro_alunite_ore.prospected": "Алюнит", - "block.gtceu.gabbro_amethyst_ore.prospected": "Аметист", - "block.gtceu.gabbro_apatite_ore.prospected": "Апатит", - "block.gtceu.gabbro_asbestos_ore.prospected": "Асбест", - "block.gtceu.gabbro_barite_ore.prospected": "Барит", - "block.gtceu.gabbro_basaltic_mineral_sand_ore.prospected": "Базальтовый минеральный песок", - "block.gtceu.gabbro_bastnasite_ore.prospected": "Бастназит", - "block.gtceu.gabbro_bauxite_ore.prospected": "Боксит", - "block.gtceu.gabbro_bentonite_ore.prospected": "Бентонит", - "block.gtceu.gabbro_beryllium_ore.prospected": "Бериллий", - "block.gtceu.gabbro_bismuth_ore.prospected": "Висмут", - "block.gtceu.gabbro_blue_topaz_ore.prospected": "Голубой топаз", - "block.gtceu.gabbro_borax_ore.prospected": "Боракс", - "block.gtceu.gabbro_bornite_ore.prospected": "Борнит", - "block.gtceu.gabbro_calcite_ore.prospected": "Кальцит", - "block.gtceu.gabbro_cassiterite_ore.prospected": "Касситерит", - "block.gtceu.gabbro_cassiterite_sand_ore.prospected": "Касситеритовый песок", - "block.gtceu.gabbro_certus_quartz_ore.prospected": "Сертус Кварц", - "block.gtceu.gabbro_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.gabbro_chalcopyrite_ore.prospected": "Халькопирит", - "block.gtceu.gabbro_chromite_ore.prospected": "Хромит", - "block.gtceu.gabbro_cinnabar_ore.prospected": "Киноварь", - "block.gtceu.gabbro_coal_ore.prospected": "Уголь", - "block.gtceu.gabbro_cobalt_ore.prospected": "Кобальт", - "block.gtceu.gabbro_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.gabbro_cooperite_ore.prospected": "Кооперит", - "block.gtceu.gabbro_copper_ore.prospected": "Медь", - "block.gtceu.gabbro_diamond_ore.prospected": "Алмаз", - "block.gtceu.gabbro_diatomite_ore.prospected": "Диатомит", - "block.gtceu.gabbro_electrotine_ore.prospected": "Электротин", - "block.gtceu.gabbro_emerald_ore.prospected": "Изумруд", - "block.gtceu.gabbro_fullers_earth_ore.prospected": "Фулерова земля", - "block.gtceu.gabbro_galena_ore.prospected": "Галена", - "block.gtceu.gabbro_garnet_sand_ore.prospected": "Гранатовый песок", - "block.gtceu.gabbro_garnierite_ore.prospected": "Гарниерит", - "block.gtceu.gabbro_glauconite_sand_ore.prospected": "Глауконитовый песок", - "block.gtceu.gabbro_goethite_ore.prospected": "Гетит", - "block.gtceu.gabbro_gold_ore.prospected": "Золото", - "block.gtceu.gabbro_granitic_mineral_sand_ore.prospected": "Гранитный минеральный песок", - "block.gtceu.gabbro_graphite_ore.prospected": "Графит", - "block.gtceu.gabbro_green_sapphire_ore.prospected": "Зеленый сапфир", - "block.gtceu.gabbro_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.gabbro_gypsum_ore.prospected": "Гипс", - "block.gtceu.gabbro_hematite_ore.prospected": "Гематит", - "block.gtceu.gabbro_ilmenite_ore.prospected": "Ильменит", - "block.gtceu.gabbro_iron_ore.prospected": "Железо", - "block.gtceu.gabbro_kyanite_ore.prospected": "Кианит", - "block.gtceu.gabbro_lapis_ore.prospected": "Лазурит", - "block.gtceu.gabbro_lazurite_ore.prospected": "Сапожниковец", - "block.gtceu.gabbro_lead_ore.prospected": "Свинец", - "block.gtceu.gabbro_lepidolite_ore.prospected": "Лепидолит", - "block.gtceu.gabbro_lithium_ore.prospected": "Литий", - "block.gtceu.gabbro_magnesite_ore.prospected": "Магнезит", - "block.gtceu.gabbro_magnetite_ore.prospected": "Магнетит", - "block.gtceu.gabbro_malachite_ore.prospected": "Малахит", - "block.gtceu.gabbro_mica_ore.prospected": "Слюда", - "block.gtceu.gabbro_molybdenite_ore.prospected": "Молибденит", - "block.gtceu.gabbro_molybdenum_ore.prospected": "Молибден", - "block.gtceu.gabbro_monazite_ore.prospected": "Монацит", - "block.gtceu.gabbro_naquadah_ore.prospected": "Наквада", - "block.gtceu.gabbro_neodymium_ore.prospected": "Неодим", - "block.gtceu.gabbro_nether_quartz_ore.prospected": "Кварц нижнего мира", - "block.gtceu.gabbro_nickel_ore.prospected": "Никель", - "block.gtceu.gabbro_oilsands_ore.prospected": "Нефтяные пески", - "block.gtceu.gabbro_olivine_ore.prospected": "Оливин", - "block.gtceu.gabbro_opal_ore.prospected": "Опал", - "block.gtceu.gabbro_palladium_ore.prospected": "Палладий", - "block.gtceu.gabbro_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.gabbro_pitchblende_ore.prospected": "Горный хрусталь", - "block.gtceu.gabbro_platinum_ore.prospected": "Платина", - "block.gtceu.gabbro_plutonium_ore.prospected": "Плутоний", - "block.gtceu.gabbro_pollucite_ore.prospected": "Поллуцит", - "block.gtceu.gabbro_powellite_ore.prospected": "Пауэллит", - "block.gtceu.gabbro_pyrite_ore.prospected": "Пирит", - "block.gtceu.gabbro_pyrochlore_ore.prospected": "Пирохлор", - "block.gtceu.gabbro_pyrolusite_ore.prospected": "Пиролюзит", - "block.gtceu.gabbro_pyrope_ore.prospected": "Пироп", - "block.gtceu.gabbro_quartzite_ore.prospected": "Кварцит", - "block.gtceu.gabbro_realgar_ore.prospected": "Реалгар", - "block.gtceu.gabbro_red_garnet_ore.prospected": "Красный гранат", - "block.gtceu.gabbro_redstone_ore.prospected": "Красный камень", - "block.gtceu.gabbro_rock_salt_ore.prospected": "Каменная соль", - "block.gtceu.gabbro_ruby_ore.prospected": "Рубин", - "block.gtceu.gabbro_salt_ore.prospected": "Соль", - "block.gtceu.gabbro_saltpeter_ore.prospected": "Селитра", - "block.gtceu.gabbro_sapphire_ore.prospected": "Сапфир", - "block.gtceu.gabbro_scheelite_ore.prospected": "Шеелит", - "block.gtceu.gabbro_silver_ore.prospected": "Серебро", - "block.gtceu.gabbro_soapstone_ore.prospected": "Мыльный камень", - "block.gtceu.gabbro_sodalite_ore.prospected": "Содалит", - "block.gtceu.gabbro_spessartine_ore.prospected": "Спессартин", - "block.gtceu.gabbro_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.gabbro_spodumene_ore.prospected": "Сподумен", - "block.gtceu.gabbro_stibnite_ore.prospected": "Стибнит", - "block.gtceu.gabbro_sulfur_ore.prospected": "Сера", - "block.gtceu.gabbro_sylvite_ore.prospected": "Сильвит", - "block.gtceu.gabbro_talc_ore.prospected": "Тальк", - "block.gtceu.gabbro_tantalite_ore.prospected": "Танталит", - "block.gtceu.gabbro_tetrahedrite_ore.prospected": "Тетраэдрит", - "block.gtceu.gabbro_thorium_ore.prospected": "Торий", - "block.gtceu.gabbro_tin_ore.prospected": "Олово", - "block.gtceu.gabbro_topaz_ore.prospected": "Топаз", - "block.gtceu.gabbro_tricalcium_phosphate_ore.prospected": "Трикальцийфосфат", - "block.gtceu.gabbro_trona_ore.prospected": "Трона", - "block.gtceu.gabbro_tungstate_ore.prospected": "Вольфрамат", - "block.gtceu.gabbro_uraninite_ore.prospected": "Уранинит", - "block.gtceu.gabbro_vanadium_magnetite_ore.prospected": "Ванадиевый магнетит", - "block.gtceu.gabbro_wulfenite_ore.prospected": "Вульфенит", - "block.gtceu.gabbro_yellow_garnet_ore.prospected": "Желтый гранат", - "block.gtceu.gabbro_yellow_limonite_ore.prospected": "Желтый лимонит", - "block.gtceu.gabbro_zeolite_ore.prospected": "Цеолит", - "block.gtceu.gneiss_almandine_ore.prospected": "Альмандин", - "block.gtceu.gneiss_aluminium_ore.prospected": "Алюминий", - "block.gtceu.gneiss_alunite_ore.prospected": "Алюнит", - "block.gtceu.gneiss_amethyst_ore.prospected": "Аметист", - "block.gtceu.gneiss_apatite_ore.prospected": "Апатит", - "block.gtceu.gneiss_asbestos_ore.prospected": "Асбест", - "block.gtceu.gneiss_barite_ore.prospected": "Барит", - "block.gtceu.gneiss_basaltic_mineral_sand_ore.prospected": "Базальтовый минеральный песок", - "block.gtceu.gneiss_bastnasite_ore.prospected": "Бастназит", - "block.gtceu.gneiss_bauxite_ore.prospected": "Боксит", - "block.gtceu.gneiss_bentonite_ore.prospected": "Бентонит", - "block.gtceu.gneiss_beryllium_ore.prospected": "Бериллий", - "block.gtceu.gneiss_bismuth_ore.prospected": "Висмут", - "block.gtceu.gneiss_blue_topaz_ore.prospected": "Голубой топаз", - "block.gtceu.gneiss_borax_ore.prospected": "Боракс", - "block.gtceu.gneiss_bornite_ore.prospected": "Борнит", - "block.gtceu.gneiss_calcite_ore.prospected": "Кальцит", - "block.gtceu.gneiss_cassiterite_ore.prospected": "Касситерит", - "block.gtceu.gneiss_cassiterite_sand_ore.prospected": "Касситеритовый песок", - "block.gtceu.gneiss_certus_quartz_ore.prospected": "Сертус Кварц", - "block.gtceu.gneiss_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.gneiss_chalcopyrite_ore.prospected": "Халькопирит", - "block.gtceu.gneiss_chromite_ore.prospected": "Хромит", - "block.gtceu.gneiss_cinnabar_ore.prospected": "Киноварь", - "block.gtceu.gneiss_coal_ore.prospected": "Уголь", - "block.gtceu.gneiss_cobalt_ore.prospected": "Кобальт", - "block.gtceu.gneiss_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.gneiss_cooperite_ore.prospected": "Кооперит", - "block.gtceu.gneiss_copper_ore.prospected": "Медь", - "block.gtceu.gneiss_diamond_ore.prospected": "Алмаз", - "block.gtceu.gneiss_diatomite_ore.prospected": "Диатомит", - "block.gtceu.gneiss_electrotine_ore.prospected": "Электротин", - "block.gtceu.gneiss_emerald_ore.prospected": "Изумруд", - "block.gtceu.gneiss_fullers_earth_ore.prospected": "Фулерова земля", - "block.gtceu.gneiss_galena_ore.prospected": "Галена", - "block.gtceu.gneiss_garnet_sand_ore.prospected": "Гранатовый песок", - "block.gtceu.gneiss_garnierite_ore.prospected": "Гарниерит", - "block.gtceu.gneiss_glauconite_sand_ore.prospected": "Глауконитовый песок", - "block.gtceu.gneiss_goethite_ore.prospected": "Гетит", - "block.gtceu.gneiss_gold_ore.prospected": "Золото", - "block.gtceu.gneiss_granitic_mineral_sand_ore.prospected": "Гранитный минеральный песок", - "block.gtceu.gneiss_graphite_ore.prospected": "Графит", - "block.gtceu.gneiss_green_sapphire_ore.prospected": "Зеленый сапфир", - "block.gtceu.gneiss_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.gneiss_gypsum_ore.prospected": "Гипс", - "block.gtceu.gneiss_hematite_ore.prospected": "Гематит", - "block.gtceu.gneiss_ilmenite_ore.prospected": "Ильменит", - "block.gtceu.gneiss_iron_ore.prospected": "Железо", - "block.gtceu.gneiss_kyanite_ore.prospected": "Кианит", - "block.gtceu.gneiss_lapis_ore.prospected": "Лазурит", - "block.gtceu.gneiss_lazurite_ore.prospected": "Сапожниковец", - "block.gtceu.gneiss_lead_ore.prospected": "Свинец", - "block.gtceu.gneiss_lepidolite_ore.prospected": "Лепидолит", - "block.gtceu.gneiss_lithium_ore.prospected": "Литий", - "block.gtceu.gneiss_magnesite_ore.prospected": "Магнезит", - "block.gtceu.gneiss_magnetite_ore.prospected": "Магнетит", - "block.gtceu.gneiss_malachite_ore.prospected": "Малахит", - "block.gtceu.gneiss_mica_ore.prospected": "Слюда", - "block.gtceu.gneiss_molybdenite_ore.prospected": "Молибденит", - "block.gtceu.gneiss_molybdenum_ore.prospected": "Молибден", - "block.gtceu.gneiss_monazite_ore.prospected": "Монацит", - "block.gtceu.gneiss_naquadah_ore.prospected": "Наквада", - "block.gtceu.gneiss_neodymium_ore.prospected": "Неодим", - "block.gtceu.gneiss_nether_quartz_ore.prospected": "Кварц нижнего мира", - "block.gtceu.gneiss_nickel_ore.prospected": "Никель", - "block.gtceu.gneiss_oilsands_ore.prospected": "Нефтяные пески", - "block.gtceu.gneiss_olivine_ore.prospected": "Оливин", - "block.gtceu.gneiss_opal_ore.prospected": "Опал", - "block.gtceu.gneiss_palladium_ore.prospected": "Палладий", - "block.gtceu.gneiss_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.gneiss_pitchblende_ore.prospected": "Горный хрусталь", - "block.gtceu.gneiss_platinum_ore.prospected": "Платина", - "block.gtceu.gneiss_plutonium_ore.prospected": "Плутоний", - "block.gtceu.gneiss_pollucite_ore.prospected": "Поллуцит", - "block.gtceu.gneiss_powellite_ore.prospected": "Пауэллит", - "block.gtceu.gneiss_pyrite_ore.prospected": "Пирит", - "block.gtceu.gneiss_pyrochlore_ore.prospected": "Пирохлор", - "block.gtceu.gneiss_pyrolusite_ore.prospected": "Пиролюзит", - "block.gtceu.gneiss_pyrope_ore.prospected": "Пироп", - "block.gtceu.gneiss_quartzite_ore.prospected": "Кварцит", - "block.gtceu.gneiss_realgar_ore.prospected": "Реалгар", - "block.gtceu.gneiss_red_garnet_ore.prospected": "Красный гранат", - "block.gtceu.gneiss_redstone_ore.prospected": "Красный камень", - "block.gtceu.gneiss_rock_salt_ore.prospected": "Каменная соль", - "block.gtceu.gneiss_ruby_ore.prospected": "Рубин", - "block.gtceu.gneiss_salt_ore.prospected": "Соль", - "block.gtceu.gneiss_saltpeter_ore.prospected": "Селитра", - "block.gtceu.gneiss_sapphire_ore.prospected": "Сапфир", - "block.gtceu.gneiss_scheelite_ore.prospected": "Шеелит", - "block.gtceu.gneiss_silver_ore.prospected": "Серебро", - "block.gtceu.gneiss_soapstone_ore.prospected": "Мыльный камень", - "block.gtceu.gneiss_sodalite_ore.prospected": "Содалит", - "block.gtceu.gneiss_spessartine_ore.prospected": "Спессартин", - "block.gtceu.gneiss_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.gneiss_spodumene_ore.prospected": "Сподумен", - "block.gtceu.gneiss_stibnite_ore.prospected": "Стибнит", - "block.gtceu.gneiss_sulfur_ore.prospected": "Сера", - "block.gtceu.gneiss_sylvite_ore.prospected": "Сильвит", - "block.gtceu.gneiss_talc_ore.prospected": "Тальк", - "block.gtceu.gneiss_tantalite_ore.prospected": "Танталит", - "block.gtceu.gneiss_tetrahedrite_ore.prospected": "Тетраэдрит", - "block.gtceu.gneiss_thorium_ore.prospected": "Торий", - "block.gtceu.gneiss_tin_ore.prospected": "Олово", - "block.gtceu.gneiss_topaz_ore.prospected": "Топаз", - "block.gtceu.gneiss_tricalcium_phosphate_ore.prospected": "Трикальцийфосфат", - "block.gtceu.gneiss_trona_ore.prospected": "Трона", - "block.gtceu.gneiss_tungstate_ore.prospected": "Вольфрамат", - "block.gtceu.gneiss_uraninite_ore.prospected": "Уранинит", - "block.gtceu.gneiss_vanadium_magnetite_ore.prospected": "Ванадиевый магнетит", - "block.gtceu.gneiss_wulfenite_ore.prospected": "Вульфенит", - "block.gtceu.gneiss_yellow_garnet_ore.prospected": "Желтый гранат", - "block.gtceu.gneiss_yellow_limonite_ore.prospected": "Желтый лимонит", - "block.gtceu.gneiss_zeolite_ore.prospected": "Цеолит", - "block.gtceu.granite_almandine_ore.prospected": "Альмандин", - "block.gtceu.granite_aluminium_ore.prospected": "Алюминий", - "block.gtceu.granite_alunite_ore.prospected": "Алюнит", - "block.gtceu.granite_amethyst_ore.prospected": "Аметист", - "block.gtceu.granite_apatite_ore.prospected": "Апатит", - "block.gtceu.granite_asbestos_ore.prospected": "Асбест", - "block.gtceu.granite_barite_ore.prospected": "Барит", - "block.gtceu.granite_basaltic_mineral_sand_ore.prospected": "Базальтовый минеральный песок", - "block.gtceu.granite_bastnasite_ore.prospected": "Бастназит", - "block.gtceu.granite_bauxite_ore.prospected": "Боксит", - "block.gtceu.granite_bentonite_ore.prospected": "Бентонит", - "block.gtceu.granite_beryllium_ore.prospected": "Бериллий", - "block.gtceu.granite_bismuth_ore.prospected": "Висмут", - "block.gtceu.granite_blue_topaz_ore.prospected": "Голубой топаз", - "block.gtceu.granite_borax_ore.prospected": "Боракс", - "block.gtceu.granite_bornite_ore.prospected": "Борнит", - "block.gtceu.granite_calcite_ore.prospected": "Кальцит", - "block.gtceu.granite_cassiterite_ore.prospected": "Касситерит", - "block.gtceu.granite_cassiterite_sand_ore.prospected": "Касситеритовый песок", - "block.gtceu.granite_certus_quartz_ore.prospected": "Сертус Кварц", - "block.gtceu.granite_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.granite_chalcopyrite_ore.prospected": "Халькопирит", - "block.gtceu.granite_chromite_ore.prospected": "Хромит", - "block.gtceu.granite_cinnabar_ore.prospected": "Киноварь", - "block.gtceu.granite_coal_ore.prospected": "Уголь", - "block.gtceu.granite_cobalt_ore.prospected": "Кобальт", - "block.gtceu.granite_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.granite_cooperite_ore.prospected": "Кооперит", - "block.gtceu.granite_copper_ore.prospected": "Медь", - "block.gtceu.granite_diamond_ore.prospected": "Алмаз", - "block.gtceu.granite_diatomite_ore.prospected": "Диатомит", - "block.gtceu.granite_electrotine_ore.prospected": "Электротин", - "block.gtceu.granite_emerald_ore.prospected": "Изумруд", - "block.gtceu.granite_fullers_earth_ore.prospected": "Фулерова земля", - "block.gtceu.granite_galena_ore.prospected": "Галена", - "block.gtceu.granite_garnet_sand_ore.prospected": "Гранатовый песок", - "block.gtceu.granite_garnierite_ore.prospected": "Гарниерит", - "block.gtceu.granite_glauconite_sand_ore.prospected": "Глауконитовый песок", - "block.gtceu.granite_goethite_ore.prospected": "Гетит", - "block.gtceu.granite_gold_ore.prospected": "Золото", - "block.gtceu.granite_granitic_mineral_sand_ore.prospected": "Гранитный минеральный песок", - "block.gtceu.granite_graphite_ore.prospected": "Графит", - "block.gtceu.granite_green_sapphire_ore.prospected": "Зеленый сапфир", - "block.gtceu.granite_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.granite_gypsum_ore.prospected": "Гипс", - "block.gtceu.granite_hematite_ore.prospected": "Гематит", - "block.gtceu.granite_ilmenite_ore.prospected": "Ильменит", - "block.gtceu.granite_iron_ore.prospected": "Железо", - "block.gtceu.granite_kyanite_ore.prospected": "Кианит", - "block.gtceu.granite_lapis_ore.prospected": "Лазурит", - "block.gtceu.granite_lazurite_ore.prospected": "Сапожниковец", - "block.gtceu.granite_lead_ore.prospected": "Свинец", - "block.gtceu.granite_lepidolite_ore.prospected": "Лепидолит", - "block.gtceu.granite_lithium_ore.prospected": "Литий", - "block.gtceu.granite_magnesite_ore.prospected": "Магнезит", - "block.gtceu.granite_magnetite_ore.prospected": "Магнетит", - "block.gtceu.granite_malachite_ore.prospected": "Малахит", - "block.gtceu.granite_mica_ore.prospected": "Слюда", - "block.gtceu.granite_molybdenite_ore.prospected": "Молибденит", - "block.gtceu.granite_molybdenum_ore.prospected": "Молибден", - "block.gtceu.granite_monazite_ore.prospected": "Монацит", - "block.gtceu.granite_naquadah_ore.prospected": "Наквада", - "block.gtceu.granite_neodymium_ore.prospected": "Неодим", - "block.gtceu.granite_nether_quartz_ore.prospected": "Кварц нижнего мира", - "block.gtceu.granite_nickel_ore.prospected": "Никель", - "block.gtceu.granite_oilsands_ore.prospected": "Нефтяные пески", - "block.gtceu.granite_olivine_ore.prospected": "Оливин", - "block.gtceu.granite_opal_ore.prospected": "Опал", - "block.gtceu.granite_palladium_ore.prospected": "Палладий", - "block.gtceu.granite_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.granite_pitchblende_ore.prospected": "Горный хрусталь", - "block.gtceu.granite_platinum_ore.prospected": "Платина", - "block.gtceu.granite_plutonium_ore.prospected": "Плутоний", - "block.gtceu.granite_pollucite_ore.prospected": "Поллуцит", - "block.gtceu.granite_powellite_ore.prospected": "Пауэллит", - "block.gtceu.granite_pyrite_ore.prospected": "Пирит", - "block.gtceu.granite_pyrochlore_ore.prospected": "Пирохлор", - "block.gtceu.granite_pyrolusite_ore.prospected": "Пиролюзит", - "block.gtceu.granite_pyrope_ore.prospected": "Пироп", - "block.gtceu.granite_quartzite_ore.prospected": "Кварцит", - "block.gtceu.granite_realgar_ore.prospected": "Реалгар", - "block.gtceu.granite_red_garnet_ore.prospected": "Красный гранат", - "block.gtceu.granite_redstone_ore.prospected": "Красный камень", - "block.gtceu.granite_rock_salt_ore.prospected": "Каменная соль", - "block.gtceu.granite_ruby_ore.prospected": "Рубин", - "block.gtceu.granite_salt_ore.prospected": "Соль", - "block.gtceu.granite_saltpeter_ore.prospected": "Селитра", - "block.gtceu.granite_sapphire_ore.prospected": "Сапфир", - "block.gtceu.granite_scheelite_ore.prospected": "Шеелит", - "block.gtceu.granite_silver_ore.prospected": "Серебро", - "block.gtceu.granite_soapstone_ore.prospected": "Мыльный камень", - "block.gtceu.granite_sodalite_ore.prospected": "Содалит", - "block.gtceu.granite_spessartine_ore.prospected": "Спессартин", - "block.gtceu.granite_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.granite_spodumene_ore.prospected": "Сподумен", - "block.gtceu.granite_stibnite_ore.prospected": "Стибнит", - "block.gtceu.granite_sulfur_ore.prospected": "Сера", - "block.gtceu.granite_sylvite_ore.prospected": "Сильвит", - "block.gtceu.granite_talc_ore.prospected": "Тальк", - "block.gtceu.granite_tantalite_ore.prospected": "Танталит", - "block.gtceu.granite_tetrahedrite_ore.prospected": "Тетраэдрит", - "block.gtceu.granite_thorium_ore.prospected": "Торий", - "block.gtceu.granite_tin_ore.prospected": "Олово", - "block.gtceu.granite_topaz_ore.prospected": "Топаз", - "block.gtceu.granite_tricalcium_phosphate_ore.prospected": "Трикальцийфосфат", - "block.gtceu.granite_trona_ore.prospected": "Трона", - "block.gtceu.granite_tungstate_ore.prospected": "Вольфрамат", - "block.gtceu.granite_uraninite_ore.prospected": "Уранинит", - "block.gtceu.granite_vanadium_magnetite_ore.prospected": "Ванадиевый магнетит", - "block.gtceu.granite_wulfenite_ore.prospected": "Вульфенит", - "block.gtceu.granite_yellow_garnet_ore.prospected": "Желтый гранат", - "block.gtceu.granite_yellow_limonite_ore.prospected": "Желтый лимонит", - "block.gtceu.granite_zeolite_ore.prospected": "Цеолит", - "block.gtceu.limestone_almandine_ore.prospected": "Альмандин", - "block.gtceu.limestone_aluminium_ore.prospected": "Алюминий", - "block.gtceu.limestone_alunite_ore.prospected": "Алюнит", - "block.gtceu.limestone_amethyst_ore.prospected": "Аметист", - "block.gtceu.limestone_apatite_ore.prospected": "Апатит", - "block.gtceu.limestone_asbestos_ore.prospected": "Асбест", - "block.gtceu.limestone_barite_ore.prospected": "Барит", - "block.gtceu.limestone_basaltic_mineral_sand_ore.prospected": "Базальтовый минеральный песок", - "block.gtceu.limestone_bastnasite_ore.prospected": "Бастназит", - "block.gtceu.limestone_bauxite_ore.prospected": "Боксит", - "block.gtceu.limestone_bentonite_ore.prospected": "Бентонит", - "block.gtceu.limestone_beryllium_ore.prospected": "Бериллий", - "block.gtceu.limestone_bismuth_ore.prospected": "Висмут", - "block.gtceu.limestone_blue_topaz_ore.prospected": "Голубой топаз", - "block.gtceu.limestone_borax_ore.prospected": "Боракс", - "block.gtceu.limestone_bornite_ore.prospected": "Борнит", - "block.gtceu.limestone_calcite_ore.prospected": "Кальцит", - "block.gtceu.limestone_cassiterite_ore.prospected": "Касситерит", - "block.gtceu.limestone_cassiterite_sand_ore.prospected": "Касситеритовый песок", - "block.gtceu.limestone_certus_quartz_ore.prospected": "Сертус Кварц", - "block.gtceu.limestone_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.limestone_chalcopyrite_ore.prospected": "Халькопирит", - "block.gtceu.limestone_chromite_ore.prospected": "Хромит", - "block.gtceu.limestone_cinnabar_ore.prospected": "Киноварь", - "block.gtceu.limestone_coal_ore.prospected": "Уголь", - "block.gtceu.limestone_cobalt_ore.prospected": "Кобальт", - "block.gtceu.limestone_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.limestone_cooperite_ore.prospected": "Кооперит", - "block.gtceu.limestone_copper_ore.prospected": "Медь", - "block.gtceu.limestone_diamond_ore.prospected": "Алмаз", - "block.gtceu.limestone_diatomite_ore.prospected": "Диатомит", - "block.gtceu.limestone_electrotine_ore.prospected": "Электротин", - "block.gtceu.limestone_emerald_ore.prospected": "Изумруд", - "block.gtceu.limestone_fullers_earth_ore.prospected": "Фулерова земля", - "block.gtceu.limestone_galena_ore.prospected": "Галена", - "block.gtceu.limestone_garnet_sand_ore.prospected": "Гранатовый песок", - "block.gtceu.limestone_garnierite_ore.prospected": "Гарниерит", - "block.gtceu.limestone_glauconite_sand_ore.prospected": "Глауконитовый песок", - "block.gtceu.limestone_goethite_ore.prospected": "Гетит", - "block.gtceu.limestone_gold_ore.prospected": "Золото", - "block.gtceu.limestone_granitic_mineral_sand_ore.prospected": "Гранитный минеральный песок", - "block.gtceu.limestone_graphite_ore.prospected": "Графит", - "block.gtceu.limestone_green_sapphire_ore.prospected": "Зеленый сапфир", - "block.gtceu.limestone_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.limestone_gypsum_ore.prospected": "Гипс", - "block.gtceu.limestone_hematite_ore.prospected": "Гематит", - "block.gtceu.limestone_ilmenite_ore.prospected": "Ильменит", - "block.gtceu.limestone_iron_ore.prospected": "Железо", - "block.gtceu.limestone_kyanite_ore.prospected": "Кианит", - "block.gtceu.limestone_lapis_ore.prospected": "Лазурит", - "block.gtceu.limestone_lazurite_ore.prospected": "Сапожниковец", - "block.gtceu.limestone_lead_ore.prospected": "Свинец", - "block.gtceu.limestone_lepidolite_ore.prospected": "Лепидолит", - "block.gtceu.limestone_lithium_ore.prospected": "Литий", - "block.gtceu.limestone_magnesite_ore.prospected": "Магнезит", - "block.gtceu.limestone_magnetite_ore.prospected": "Магнетит", - "block.gtceu.limestone_malachite_ore.prospected": "Малахит", - "block.gtceu.limestone_mica_ore.prospected": "Слюда", - "block.gtceu.limestone_molybdenite_ore.prospected": "Молибденит", - "block.gtceu.limestone_molybdenum_ore.prospected": "Молибден", - "block.gtceu.limestone_monazite_ore.prospected": "Монацит", - "block.gtceu.limestone_naquadah_ore.prospected": "Наквада", - "block.gtceu.limestone_neodymium_ore.prospected": "Неодим", - "block.gtceu.limestone_nether_quartz_ore.prospected": "Кварц нижнего мира", - "block.gtceu.limestone_nickel_ore.prospected": "Никель", - "block.gtceu.limestone_oilsands_ore.prospected": "Нефтяные пески", - "block.gtceu.limestone_olivine_ore.prospected": "Оливин", - "block.gtceu.limestone_opal_ore.prospected": "Опал", - "block.gtceu.limestone_palladium_ore.prospected": "Палладий", - "block.gtceu.limestone_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.limestone_pitchblende_ore.prospected": "Горный хрусталь", - "block.gtceu.limestone_platinum_ore.prospected": "Платина", - "block.gtceu.limestone_plutonium_ore.prospected": "Плутоний", - "block.gtceu.limestone_pollucite_ore.prospected": "Поллуцит", - "block.gtceu.limestone_powellite_ore.prospected": "Пауэллит", - "block.gtceu.limestone_pyrite_ore.prospected": "Пирит", - "block.gtceu.limestone_pyrochlore_ore.prospected": "Пирохлор", - "block.gtceu.limestone_pyrolusite_ore.prospected": "Пиролюзит", - "block.gtceu.limestone_pyrope_ore.prospected": "Пироп", - "block.gtceu.limestone_quartzite_ore.prospected": "Кварцит", - "block.gtceu.limestone_realgar_ore.prospected": "Реалгар", - "block.gtceu.limestone_red_garnet_ore.prospected": "Красный гранат", - "block.gtceu.limestone_redstone_ore.prospected": "Красный камень", - "block.gtceu.limestone_rock_salt_ore.prospected": "Каменная соль", - "block.gtceu.limestone_ruby_ore.prospected": "Рубин", - "block.gtceu.limestone_salt_ore.prospected": "Соль", - "block.gtceu.limestone_saltpeter_ore.prospected": "Селитра", - "block.gtceu.limestone_sapphire_ore.prospected": "Сапфир", - "block.gtceu.limestone_scheelite_ore.prospected": "Шеелит", - "block.gtceu.limestone_silver_ore.prospected": "Серебро", - "block.gtceu.limestone_soapstone_ore.prospected": "Мыльный камень", - "block.gtceu.limestone_sodalite_ore.prospected": "Содалит", - "block.gtceu.limestone_spessartine_ore.prospected": "Спессартин", - "block.gtceu.limestone_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.limestone_spodumene_ore.prospected": "Сподумен", - "block.gtceu.limestone_stibnite_ore.prospected": "Стибнит", - "block.gtceu.limestone_sulfur_ore.prospected": "Сера", - "block.gtceu.limestone_sylvite_ore.prospected": "Сильвит", - "block.gtceu.limestone_talc_ore.prospected": "Тальк", - "block.gtceu.limestone_tantalite_ore.prospected": "Танталит", - "block.gtceu.limestone_tetrahedrite_ore.prospected": "Тетраэдрит", - "block.gtceu.limestone_thorium_ore.prospected": "Торий", - "block.gtceu.limestone_tin_ore.prospected": "Олово", - "block.gtceu.limestone_topaz_ore.prospected": "Топаз", - "block.gtceu.limestone_tricalcium_phosphate_ore.prospected": "Трикальцийфосфат", - "block.gtceu.limestone_trona_ore.prospected": "Трона", - "block.gtceu.limestone_tungstate_ore.prospected": "Вольфрамат", - "block.gtceu.limestone_uraninite_ore.prospected": "Уранинит", - "block.gtceu.limestone_vanadium_magnetite_ore.prospected": "Ванадиевый магнетит", - "block.gtceu.limestone_wulfenite_ore.prospected": "Вульфенит", - "block.gtceu.limestone_yellow_garnet_ore.prospected": "Желтый гранат", - "block.gtceu.limestone_yellow_limonite_ore.prospected": "Желтый лимонит", - "block.gtceu.limestone_zeolite_ore.prospected": "Цеолит", - "block.gtceu.marble_almandine_ore.prospected": "Альмандин", - "block.gtceu.marble_aluminium_ore.prospected": "Алюминий", - "block.gtceu.marble_alunite_ore.prospected": "Алюнит", - "block.gtceu.marble_amethyst_ore.prospected": "Аметист", - "block.gtceu.marble_apatite_ore.prospected": "Апатит", - "block.gtceu.marble_asbestos_ore.prospected": "Асбест", - "block.gtceu.marble_barite_ore.prospected": "Барит", - "block.gtceu.marble_basaltic_mineral_sand_ore.prospected": "Базальтовый минеральный песок", - "block.gtceu.marble_bastnasite_ore.prospected": "Бастназит", - "block.gtceu.marble_bauxite_ore.prospected": "Боксит", - "block.gtceu.marble_bentonite_ore.prospected": "Бентонит", - "block.gtceu.marble_beryllium_ore.prospected": "Бериллий", - "block.gtceu.marble_bismuth_ore.prospected": "Висмут", - "block.gtceu.marble_blue_topaz_ore.prospected": "Голубой топаз", - "block.gtceu.marble_borax_ore.prospected": "Боракс", - "block.gtceu.marble_bornite_ore.prospected": "Борнит", - "block.gtceu.marble_calcite_ore.prospected": "Кальцит", - "block.gtceu.marble_cassiterite_ore.prospected": "Касситерит", - "block.gtceu.marble_cassiterite_sand_ore.prospected": "Касситеритовый песок", - "block.gtceu.marble_certus_quartz_ore.prospected": "Сертус Кварц", - "block.gtceu.marble_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.marble_chalcopyrite_ore.prospected": "Халькопирит", - "block.gtceu.marble_chromite_ore.prospected": "Хромит", - "block.gtceu.marble_cinnabar_ore.prospected": "Киноварь", - "block.gtceu.marble_coal_ore.prospected": "Уголь", - "block.gtceu.marble_cobalt_ore.prospected": "Кобальт", - "block.gtceu.marble_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.marble_cooperite_ore.prospected": "Кооперит", - "block.gtceu.marble_copper_ore.prospected": "Медь", - "block.gtceu.marble_diamond_ore.prospected": "Алмаз", - "block.gtceu.marble_diatomite_ore.prospected": "Диатомит", - "block.gtceu.marble_electrotine_ore.prospected": "Электротин", - "block.gtceu.marble_emerald_ore.prospected": "Изумруд", - "block.gtceu.marble_fullers_earth_ore.prospected": "Фулерова земля", - "block.gtceu.marble_galena_ore.prospected": "Галена", - "block.gtceu.marble_garnet_sand_ore.prospected": "Гранатовый песок", - "block.gtceu.marble_garnierite_ore.prospected": "Гарниерит", - "block.gtceu.marble_glauconite_sand_ore.prospected": "Глауконитовый песок", - "block.gtceu.marble_goethite_ore.prospected": "Гетит", - "block.gtceu.marble_gold_ore.prospected": "Золото", - "block.gtceu.marble_granitic_mineral_sand_ore.prospected": "Гранитный минеральный песок", - "block.gtceu.marble_graphite_ore.prospected": "Графит", - "block.gtceu.marble_green_sapphire_ore.prospected": "Зеленый сапфир", - "block.gtceu.marble_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.marble_gypsum_ore.prospected": "Гипс", - "block.gtceu.marble_hematite_ore.prospected": "Гематит", - "block.gtceu.marble_ilmenite_ore.prospected": "Ильменит", - "block.gtceu.marble_iron_ore.prospected": "Железо", - "block.gtceu.marble_kyanite_ore.prospected": "Кианит", - "block.gtceu.marble_lapis_ore.prospected": "Лазурит", - "block.gtceu.marble_lazurite_ore.prospected": "Сапожниковец", - "block.gtceu.marble_lead_ore.prospected": "Свинец", - "block.gtceu.marble_lepidolite_ore.prospected": "Лепидолит", - "block.gtceu.marble_lithium_ore.prospected": "Литий", - "block.gtceu.marble_magnesite_ore.prospected": "Магнезит", - "block.gtceu.marble_magnetite_ore.prospected": "Магнетит", - "block.gtceu.marble_malachite_ore.prospected": "Малахит", - "block.gtceu.marble_mica_ore.prospected": "Слюда", - "block.gtceu.marble_molybdenite_ore.prospected": "Молибденит", - "block.gtceu.marble_molybdenum_ore.prospected": "Молибден", - "block.gtceu.marble_monazite_ore.prospected": "Монацит", - "block.gtceu.marble_naquadah_ore.prospected": "Наквада", - "block.gtceu.marble_neodymium_ore.prospected": "Неодим", - "block.gtceu.marble_nether_quartz_ore.prospected": "Кварц нижнего мира", - "block.gtceu.marble_nickel_ore.prospected": "Никель", - "block.gtceu.marble_oilsands_ore.prospected": "Нефтяные пески", - "block.gtceu.marble_olivine_ore.prospected": "Оливин", - "block.gtceu.marble_opal_ore.prospected": "Опал", - "block.gtceu.marble_palladium_ore.prospected": "Палладий", - "block.gtceu.marble_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.marble_pitchblende_ore.prospected": "Горный хрусталь", - "block.gtceu.marble_platinum_ore.prospected": "Платина", - "block.gtceu.marble_plutonium_ore.prospected": "Плутоний", - "block.gtceu.marble_pollucite_ore.prospected": "Поллуцит", - "block.gtceu.marble_powellite_ore.prospected": "Пауэллит", - "block.gtceu.marble_pyrite_ore.prospected": "Пирит", - "block.gtceu.marble_pyrochlore_ore.prospected": "Пирохлор", - "block.gtceu.marble_pyrolusite_ore.prospected": "Пиролюзит", - "block.gtceu.marble_pyrope_ore.prospected": "Пироп", - "block.gtceu.marble_quartzite_ore.prospected": "Кварцит", - "block.gtceu.marble_realgar_ore.prospected": "Реалгар", - "block.gtceu.marble_red_garnet_ore.prospected": "Красный гранат", - "block.gtceu.marble_redstone_ore.prospected": "Красный камень", - "block.gtceu.marble_rock_salt_ore.prospected": "Каменная соль", - "block.gtceu.marble_ruby_ore.prospected": "Рубин", - "block.gtceu.marble_salt_ore.prospected": "Соль", - "block.gtceu.marble_saltpeter_ore.prospected": "Селитра", - "block.gtceu.marble_sapphire_ore.prospected": "Сапфир", - "block.gtceu.marble_scheelite_ore.prospected": "Шеелит", - "block.gtceu.marble_silver_ore.prospected": "Серебро", - "block.gtceu.marble_soapstone_ore.prospected": "Мыльный", - "block.gtceu.marble_sodalite_ore.prospected": "Содалит", - "block.gtceu.marble_spessartine_ore.prospected": "Спессартин", - "block.gtceu.marble_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.marble_spodumene_ore.prospected": "Сподумен", - "block.gtceu.marble_stibnite_ore.prospected": "Стибнит", - "block.gtceu.marble_sulfur_ore.prospected": "Сера", - "block.gtceu.marble_sylvite_ore.prospected": "Сильвит", - "block.gtceu.marble_talc_ore.prospected": "Тальк", - "block.gtceu.marble_tantalite_ore.prospected": "Танталит", - "block.gtceu.marble_tetrahedrite_ore.prospected": "Тетраэдрит", - "block.gtceu.marble_thorium_ore.prospected": "Торий", - "block.gtceu.marble_tin_ore.prospected": "Олово", - "block.gtceu.marble_topaz_ore.prospected": "Топаз", - "block.gtceu.marble_tricalcium_phosphate_ore.prospected": "Трикальцийфосфат", - "block.gtceu.marble_trona_ore.prospected": "Трона", - "block.gtceu.marble_tungstate_ore.prospected": "Вольфрамат", - "block.gtceu.marble_uraninite_ore.prospected": "Уранинит", - "block.gtceu.marble_vanadium_magnetite_ore.prospected": "Ванадиевый магнетит", - "block.gtceu.marble_wulfenite_ore.prospected": "Вульфенит", - "block.gtceu.marble_yellow_garnet_ore.prospected": "Желтый гранат", - "block.gtceu.marble_yellow_limonite_ore.prospected": "Желтый лимонит", - "block.gtceu.marble_zeolite_ore.prospected": "Цеолит", - "block.gtceu.phyllite_almandine_ore.prospected": "Альмандин", - "block.gtceu.phyllite_aluminium_ore.prospected": "Алюминий", - "block.gtceu.phyllite_alunite_ore.prospected": "Алюнит", - "block.gtceu.phyllite_amethyst_ore.prospected": "Аметист", - "block.gtceu.phyllite_apatite_ore.prospected": "Апатит", - "block.gtceu.phyllite_asbestos_ore.prospected": "Асбест", - "block.gtceu.phyllite_barite_ore.prospected": "Барит", - "block.gtceu.phyllite_basaltic_mineral_sand_ore.prospected": "Базальтовый минеральный песок", - "block.gtceu.phyllite_bastnasite_ore.prospected": "Бастназит", - "block.gtceu.phyllite_bauxite_ore.prospected": "Боксит", - "block.gtceu.phyllite_bentonite_ore.prospected": "Бентонит", - "block.gtceu.phyllite_beryllium_ore.prospected": "Бериллий", - "block.gtceu.phyllite_bismuth_ore.prospected": "Висмут", - "block.gtceu.phyllite_blue_topaz_ore.prospected": "Голубой топаз", - "block.gtceu.phyllite_borax_ore.prospected": "Боракс", - "block.gtceu.phyllite_bornite_ore.prospected": "Борнит", - "block.gtceu.phyllite_calcite_ore.prospected": "Кальцит", - "block.gtceu.phyllite_cassiterite_ore.prospected": "Касситерит", - "block.gtceu.phyllite_cassiterite_sand_ore.prospected": "Касситеритовый песок", - "block.gtceu.phyllite_certus_quartz_ore.prospected": "Сертус Кварц", - "block.gtceu.phyllite_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.phyllite_chalcopyrite_ore.prospected": "Халькопирит", - "block.gtceu.phyllite_chromite_ore.prospected": "Хромит", - "block.gtceu.phyllite_cinnabar_ore.prospected": "Киноварь", - "block.gtceu.phyllite_coal_ore.prospected": "Уголь", - "block.gtceu.phyllite_cobalt_ore.prospected": "Кобальт", - "block.gtceu.phyllite_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.phyllite_cooperite_ore.prospected": "Кооперит", - "block.gtceu.phyllite_copper_ore.prospected": "Медь", - "block.gtceu.phyllite_diamond_ore.prospected": "Алмаз", - "block.gtceu.phyllite_diatomite_ore.prospected": "Диатомит", - "block.gtceu.phyllite_electrotine_ore.prospected": "Электротин", - "block.gtceu.phyllite_emerald_ore.prospected": "Изумруд", - "block.gtceu.phyllite_fullers_earth_ore.prospected": "Фулерова земля", - "block.gtceu.phyllite_galena_ore.prospected": "Галена", - "block.gtceu.phyllite_garnet_sand_ore.prospected": "Гранатовый песок", - "block.gtceu.phyllite_garnierite_ore.prospected": "Гарниерит", - "block.gtceu.phyllite_glauconite_sand_ore.prospected": "Глауконитовый песок", - "block.gtceu.phyllite_goethite_ore.prospected": "Гетит", - "block.gtceu.phyllite_gold_ore.prospected": "Золото", - "block.gtceu.phyllite_granitic_mineral_sand_ore.prospected": "Гранитный минеральный песок", - "block.gtceu.phyllite_graphite_ore.prospected": "Графит", - "block.gtceu.phyllite_green_sapphire_ore.prospected": "Зеленый сапфир", - "block.gtceu.phyllite_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.phyllite_gypsum_ore.prospected": "Гипс", - "block.gtceu.phyllite_hematite_ore.prospected": "Гематит", - "block.gtceu.phyllite_ilmenite_ore.prospected": "Ильменит", - "block.gtceu.phyllite_iron_ore.prospected": "Железо", - "block.gtceu.phyllite_kyanite_ore.prospected": "Кианит", - "block.gtceu.phyllite_lapis_ore.prospected": "Лазурит", - "block.gtceu.phyllite_lazurite_ore.prospected": "Сапожниковец", - "block.gtceu.phyllite_lead_ore.prospected": "Свинец", - "block.gtceu.phyllite_lepidolite_ore.prospected": "Лепидолит", - "block.gtceu.phyllite_lithium_ore.prospected": "Литий", - "block.gtceu.phyllite_magnesite_ore.prospected": "Магнезит", - "block.gtceu.phyllite_magnetite_ore.prospected": "Магнетит", - "block.gtceu.phyllite_malachite_ore.prospected": "Малахит", - "block.gtceu.phyllite_mica_ore.prospected": "Слюда", - "block.gtceu.phyllite_molybdenite_ore.prospected": "Молибденит", - "block.gtceu.phyllite_molybdenum_ore.prospected": "Молибден", - "block.gtceu.phyllite_monazite_ore.prospected": "Монацит", - "block.gtceu.phyllite_naquadah_ore.prospected": "Наквада", - "block.gtceu.phyllite_neodymium_ore.prospected": "Неодим", - "block.gtceu.phyllite_nether_quartz_ore.prospected": "Кварц нижнего мира", - "block.gtceu.phyllite_nickel_ore.prospected": "Никель", - "block.gtceu.phyllite_oilsands_ore.prospected": "Нефтяные пески", - "block.gtceu.phyllite_olivine_ore.prospected": "Оливин", - "block.gtceu.phyllite_opal_ore.prospected": "Опал", - "block.gtceu.phyllite_palladium_ore.prospected": "Палладий", - "block.gtceu.phyllite_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.phyllite_pitchblende_ore.prospected": "Горный хрусталь", - "block.gtceu.phyllite_platinum_ore.prospected": "Платина", - "block.gtceu.phyllite_plutonium_ore.prospected": "Плутоний", - "block.gtceu.phyllite_pollucite_ore.prospected": "Поллуцит", - "block.gtceu.phyllite_powellite_ore.prospected": "Пауэллит", - "block.gtceu.phyllite_pyrite_ore.prospected": "Пирит", - "block.gtceu.phyllite_pyrochlore_ore.prospected": "Пирохлор", - "block.gtceu.phyllite_pyrolusite_ore.prospected": "Пиролюзит", - "block.gtceu.phyllite_pyrope_ore.prospected": "Пироп", - "block.gtceu.phyllite_quartzite_ore.prospected": "Кварцит", - "block.gtceu.phyllite_realgar_ore.prospected": "Реалгар", - "block.gtceu.phyllite_red_garnet_ore.prospected": "Красный гранат", - "block.gtceu.phyllite_redstone_ore.prospected": "Красный камень", - "block.gtceu.phyllite_rock_salt_ore.prospected": "Каменная соль", - "block.gtceu.phyllite_ruby_ore.prospected": "Рубин", - "block.gtceu.phyllite_salt_ore.prospected": "Соль", - "block.gtceu.phyllite_saltpeter_ore.prospected": "Селитра", - "block.gtceu.phyllite_sapphire_ore.prospected": "Сапфир", - "block.gtceu.phyllite_scheelite_ore.prospected": "Шеелит", - "block.gtceu.phyllite_silver_ore.prospected": "Серебро", - "block.gtceu.phyllite_soapstone_ore.prospected": "Мыльный камень", - "block.gtceu.phyllite_sodalite_ore.prospected": "Содалит", - "block.gtceu.phyllite_spessartine_ore.prospected": "Спессартин", - "block.gtceu.phyllite_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.phyllite_spodumene_ore.prospected": "Сподумен", - "block.gtceu.phyllite_stibnite_ore.prospected": "Стибнит", - "block.gtceu.phyllite_sulfur_ore.prospected": "Сера", - "block.gtceu.phyllite_sylvite_ore.prospected": "Сильвит", - "block.gtceu.phyllite_talc_ore.prospected": "Тальк", - "block.gtceu.phyllite_tantalite_ore.prospected": "Танталит", - "block.gtceu.phyllite_tetrahedrite_ore.prospected": "Тетраэдрит", - "block.gtceu.phyllite_thorium_ore.prospected": "Торий", - "block.gtceu.phyllite_tin_ore.prospected": "Олово", - "block.gtceu.phyllite_topaz_ore.prospected": "Топаз", - "block.gtceu.phyllite_tricalcium_phosphate_ore.prospected": "Трикальцийфосфат", - "block.gtceu.phyllite_trona_ore.prospected": "Трона", - "block.gtceu.phyllite_tungstate_ore.prospected": "Вольфрамат", - "block.gtceu.phyllite_uraninite_ore.prospected": "Уранинит", - "block.gtceu.phyllite_vanadium_magnetite_ore.prospected": "Ванадиевый магнетит", - "block.gtceu.phyllite_wulfenite_ore.prospected": "Вульфенит", - "block.gtceu.phyllite_yellow_garnet_ore.prospected": "Желтый гранат", - "block.gtceu.phyllite_yellow_limonite_ore.prospected": "Желтый лимонит", - "block.gtceu.phyllite_zeolite_ore.prospected": "Цеолит", - "block.gtceu.quartzite_almandine_ore.prospected": "Альмандин", - "block.gtceu.quartzite_aluminium_ore.prospected": "Алюминий", - "block.gtceu.quartzite_alunite_ore.prospected": "Алюнит", - "block.gtceu.quartzite_amethyst_ore.prospected": "Аметист", - "block.gtceu.quartzite_apatite_ore.prospected": "Апатит", - "block.gtceu.quartzite_asbestos_ore.prospected": "Асбест", - "block.gtceu.quartzite_barite_ore.prospected": "Барит", - "block.gtceu.quartzite_basaltic_mineral_sand_ore.prospected": "Базальтовый минеральный песок", - "block.gtceu.quartzite_bastnasite_ore.prospected": "Бастназит", - "block.gtceu.quartzite_bauxite_ore.prospected": "Боксит", - "block.gtceu.quartzite_bentonite_ore.prospected": "Бентонит", - "block.gtceu.quartzite_beryllium_ore.prospected": "Бериллий", - "block.gtceu.quartzite_bismuth_ore.prospected": "Висмут", - "block.gtceu.quartzite_blue_topaz_ore.prospected": "Голубой топаз", - "block.gtceu.quartzite_borax_ore.prospected": "Боракс", - "block.gtceu.quartzite_bornite_ore.prospected": "Борнит", - "block.gtceu.quartzite_calcite_ore.prospected": "Кальцит", - "block.gtceu.quartzite_cassiterite_ore.prospected": "Касситерит", - "block.gtceu.quartzite_cassiterite_sand_ore.prospected": "Касситеритовый песок", - "block.gtceu.quartzite_certus_quartz_ore.prospected": "Сертус Кварц", - "block.gtceu.quartzite_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.quartzite_chalcopyrite_ore.prospected": "Халькопирит", - "block.gtceu.quartzite_chromite_ore.prospected": "Хромит", - "block.gtceu.quartzite_cinnabar_ore.prospected": "Киноварь", - "block.gtceu.quartzite_coal_ore.prospected": "Уголь", - "block.gtceu.quartzite_cobalt_ore.prospected": "Кобальт", - "block.gtceu.quartzite_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.quartzite_cooperite_ore.prospected": "Кооперит", - "block.gtceu.quartzite_copper_ore.prospected": "Медь", - "block.gtceu.quartzite_diamond_ore.prospected": "Алмаз", - "block.gtceu.quartzite_diatomite_ore.prospected": "Диатомит", - "block.gtceu.quartzite_electrotine_ore.prospected": "Электротин", - "block.gtceu.quartzite_emerald_ore.prospected": "Изумруд", - "block.gtceu.quartzite_fullers_earth_ore.prospected": "Фулерова земля", - "block.gtceu.quartzite_galena_ore.prospected": "Галена", - "block.gtceu.quartzite_garnet_sand_ore.prospected": "Гранатовый песок", - "block.gtceu.quartzite_garnierite_ore.prospected": "Гарниерит", - "block.gtceu.quartzite_glauconite_sand_ore.prospected": "Глауконитовый песок", - "block.gtceu.quartzite_goethite_ore.prospected": "Гетит", - "block.gtceu.quartzite_gold_ore.prospected": "Золото", - "block.gtceu.quartzite_granitic_mineral_sand_ore.prospected": "Гранитный минеральный песок", - "block.gtceu.quartzite_graphite_ore.prospected": "Графит", - "block.gtceu.quartzite_green_sapphire_ore.prospected": "Зеленый сапфир", - "block.gtceu.quartzite_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.quartzite_gypsum_ore.prospected": "Гипс", - "block.gtceu.quartzite_hematite_ore.prospected": "Гематит", - "block.gtceu.quartzite_ilmenite_ore.prospected": "Ильменит", - "block.gtceu.quartzite_iron_ore.prospected": "Железо", - "block.gtceu.quartzite_kyanite_ore.prospected": "Кианит", - "block.gtceu.quartzite_lapis_ore.prospected": "Лазурит", - "block.gtceu.quartzite_lazurite_ore.prospected": "Сапожниковец", - "block.gtceu.quartzite_lead_ore.prospected": "Свинец", - "block.gtceu.quartzite_lepidolite_ore.prospected": "Лепидолит", - "block.gtceu.quartzite_lithium_ore.prospected": "Литий", - "block.gtceu.quartzite_magnesite_ore.prospected": "Магнезит", - "block.gtceu.quartzite_magnetite_ore.prospected": "Магнетит", - "block.gtceu.quartzite_malachite_ore.prospected": "Малахит", - "block.gtceu.quartzite_mica_ore.prospected": "Слюда", - "block.gtceu.quartzite_molybdenite_ore.prospected": "Молибденит", - "block.gtceu.quartzite_molybdenum_ore.prospected": "Молибден", - "block.gtceu.quartzite_monazite_ore.prospected": "Монацит", - "block.gtceu.quartzite_naquadah_ore.prospected": "Наквада", - "block.gtceu.quartzite_neodymium_ore.prospected": "Неодим", - "block.gtceu.quartzite_nether_quartz_ore.prospected": "Кварц нижнего мира", - "block.gtceu.quartzite_nickel_ore.prospected": "Никель", - "block.gtceu.quartzite_oilsands_ore.prospected": "Нефтяные пески", - "block.gtceu.quartzite_olivine_ore.prospected": "Оливин", - "block.gtceu.quartzite_opal_ore.prospected": "Опал", - "block.gtceu.quartzite_palladium_ore.prospected": "Палладий", - "block.gtceu.quartzite_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.quartzite_pitchblende_ore.prospected": "Горный хрусталь", - "block.gtceu.quartzite_platinum_ore.prospected": "Платина", - "block.gtceu.quartzite_plutonium_ore.prospected": "Плутоний", - "block.gtceu.quartzite_pollucite_ore.prospected": "Поллуцит", - "block.gtceu.quartzite_powellite_ore.prospected": "Пауэллит", - "block.gtceu.quartzite_pyrite_ore.prospected": "Пирит", - "block.gtceu.quartzite_pyrochlore_ore.prospected": "Пирохлор", - "block.gtceu.quartzite_pyrolusite_ore.prospected": "Пиролюзит", - "block.gtceu.quartzite_pyrope_ore.prospected": "Пироп", - "block.gtceu.quartzite_quartzite_ore.prospected": "Кварцит", - "block.gtceu.quartzite_realgar_ore.prospected": "Реалгар", - "block.gtceu.quartzite_red_garnet_ore.prospected": "Красный гранат", - "block.gtceu.quartzite_redstone_ore.prospected": "Красный камень", - "block.gtceu.quartzite_rock_salt_ore.prospected": "Каменная соль", - "block.gtceu.quartzite_ruby_ore.prospected": "Рубин", - "block.gtceu.quartzite_salt_ore.prospected": "Соль", - "block.gtceu.quartzite_saltpeter_ore.prospected": "Селитра", - "block.gtceu.quartzite_sapphire_ore.prospected": "Сапфир", - "block.gtceu.quartzite_scheelite_ore.prospected": "Шеелит", - "block.gtceu.quartzite_silver_ore.prospected": "Серебро", - "block.gtceu.quartzite_soapstone_ore.prospected": "Мыльный камень", - "block.gtceu.quartzite_sodalite_ore.prospected": "Содалит", - "block.gtceu.quartzite_spessartine_ore.prospected": "Спессартин", - "block.gtceu.quartzite_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.quartzite_spodumene_ore.prospected": "Сподумен", - "block.gtceu.quartzite_stibnite_ore.prospected": "Стибнит", - "block.gtceu.quartzite_sulfur_ore.prospected": "Сера", - "block.gtceu.quartzite_sylvite_ore.prospected": "Сильвит", - "block.gtceu.quartzite_talc_ore.prospected": "Тальк", - "block.gtceu.quartzite_tantalite_ore.prospected": "Танталит", - "block.gtceu.quartzite_tetrahedrite_ore.prospected": "Тетраэдрит", - "block.gtceu.quartzite_thorium_ore.prospected": "Торий", - "block.gtceu.quartzite_tin_ore.prospected": "Олово", - "block.gtceu.quartzite_topaz_ore.prospected": "Топаз", - "block.gtceu.quartzite_tricalcium_phosphate_ore.prospected": "Трикальцийфосфат", - "block.gtceu.quartzite_trona_ore.prospected": "Трона", - "block.gtceu.quartzite_tungstate_ore.prospected": "Вольфрамат", - "block.gtceu.quartzite_uraninite_ore.prospected": "Уранинит", - "block.gtceu.quartzite_vanadium_magnetite_ore.prospected": "Ванадиевый магнетит", - "block.gtceu.quartzite_wulfenite_ore.prospected": "Вульфенит", - "block.gtceu.quartzite_yellow_garnet_ore.prospected": "Желтый гранат", - "block.gtceu.quartzite_yellow_limonite_ore.prospected": "Желтый лимонит", - "block.gtceu.quartzite_zeolite_ore.prospected": "Цеолит", - "block.gtceu.rhyolite_almandine_ore.prospected": "Альмандин", - "block.gtceu.rhyolite_aluminium_ore.prospected": "Алюминий", - "block.gtceu.rhyolite_alunite_ore.prospected": "Алюнит", - "block.gtceu.rhyolite_amethyst_ore.prospected": "Аметист", - "block.gtceu.rhyolite_apatite_ore.prospected": "Апатит", - "block.gtceu.rhyolite_asbestos_ore.prospected": "Асбест", - "block.gtceu.rhyolite_barite_ore.prospected": "Барит", - "block.gtceu.rhyolite_basaltic_mineral_sand_ore.prospected": "Базальтовый минеральный песок", - "block.gtceu.rhyolite_bastnasite_ore.prospected": "Бастназит", - "block.gtceu.rhyolite_bauxite_ore.prospected": "Боксит", - "block.gtceu.rhyolite_bentonite_ore.prospected": "Бентонит", - "block.gtceu.rhyolite_beryllium_ore.prospected": "Бериллий", - "block.gtceu.rhyolite_bismuth_ore.prospected": "Висмут", - "block.gtceu.rhyolite_blue_topaz_ore.prospected": "Голубой топаз", - "block.gtceu.rhyolite_borax_ore.prospected": "Боракс", - "block.gtceu.rhyolite_bornite_ore.prospected": "Борнит", - "block.gtceu.rhyolite_calcite_ore.prospected": "Кальцит", - "block.gtceu.rhyolite_cassiterite_ore.prospected": "Касситерит", - "block.gtceu.rhyolite_cassiterite_sand_ore.prospected": "Касситеритовый песок", - "block.gtceu.rhyolite_certus_quartz_ore.prospected": "Сертус Кварц", - "block.gtceu.rhyolite_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.rhyolite_chalcopyrite_ore.prospected": "Халькопирит", - "block.gtceu.rhyolite_chromite_ore.prospected": "Хромит", - "block.gtceu.rhyolite_cinnabar_ore.prospected": "Киноварь", - "block.gtceu.rhyolite_coal_ore.prospected": "Уголь", - "block.gtceu.rhyolite_cobalt_ore.prospected": "Кобальт", - "block.gtceu.rhyolite_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.rhyolite_cooperite_ore.prospected": "Кооперит", - "block.gtceu.rhyolite_copper_ore.prospected": "Медь", - "block.gtceu.rhyolite_diamond_ore.prospected": "Алмаз", - "block.gtceu.rhyolite_diatomite_ore.prospected": "Диатомит", - "block.gtceu.rhyolite_electrotine_ore.prospected": "Электротин", - "block.gtceu.rhyolite_emerald_ore.prospected": "Изумруд", - "block.gtceu.rhyolite_fullers_earth_ore.prospected": "Фулерова земля", - "block.gtceu.rhyolite_galena_ore.prospected": "Галена", - "block.gtceu.rhyolite_garnet_sand_ore.prospected": "Гранатовый песок", - "block.gtceu.rhyolite_garnierite_ore.prospected": "Гарниерит", - "block.gtceu.rhyolite_glauconite_sand_ore.prospected": "Глауконитовый песок", - "block.gtceu.rhyolite_goethite_ore.prospected": "Гетит", - "block.gtceu.rhyolite_gold_ore.prospected": "Золото", - "block.gtceu.rhyolite_granitic_mineral_sand_ore.prospected": "Гранитный минеральный песок", - "block.gtceu.rhyolite_graphite_ore.prospected": "Графит", - "block.gtceu.rhyolite_green_sapphire_ore.prospected": "Зеленый сапфир", - "block.gtceu.rhyolite_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.rhyolite_gypsum_ore.prospected": "Гипс", - "block.gtceu.rhyolite_hematite_ore.prospected": "Гематит", - "block.gtceu.rhyolite_ilmenite_ore.prospected": "Ильменит", - "block.gtceu.rhyolite_iron_ore.prospected": "Железо", - "block.gtceu.rhyolite_kyanite_ore.prospected": "Кианит", - "block.gtceu.rhyolite_lapis_ore.prospected": "Лазурит", - "block.gtceu.rhyolite_lazurite_ore.prospected": "Сапожниковец", - "block.gtceu.rhyolite_lead_ore.prospected": "Свинец", - "block.gtceu.rhyolite_lepidolite_ore.prospected": "Лепидолит", - "block.gtceu.rhyolite_lithium_ore.prospected": "Литий", - "block.gtceu.rhyolite_magnesite_ore.prospected": "Магнезит", - "block.gtceu.rhyolite_magnetite_ore.prospected": "Магнетит", - "block.gtceu.rhyolite_malachite_ore.prospected": "Малахит", - "block.gtceu.rhyolite_mica_ore.prospected": "Слюда", - "block.gtceu.rhyolite_molybdenite_ore.prospected": "Молибденит", - "block.gtceu.rhyolite_molybdenum_ore.prospected": "Молибден", - "block.gtceu.rhyolite_monazite_ore.prospected": "Монацит", - "block.gtceu.rhyolite_naquadah_ore.prospected": "Наквада", - "block.gtceu.rhyolite_neodymium_ore.prospected": "Неодим", - "block.gtceu.rhyolite_nether_quartz_ore.prospected": "Кварц нижнего мира", - "block.gtceu.rhyolite_nickel_ore.prospected": "Никель", - "block.gtceu.rhyolite_oilsands_ore.prospected": "Нефтяные пески", - "block.gtceu.rhyolite_olivine_ore.prospected": "Оливин", - "block.gtceu.rhyolite_opal_ore.prospected": "Опал", - "block.gtceu.rhyolite_palladium_ore.prospected": "Палладий", - "block.gtceu.rhyolite_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.rhyolite_pitchblende_ore.prospected": "Горный хрусталь", - "block.gtceu.rhyolite_platinum_ore.prospected": "Платина", - "block.gtceu.rhyolite_plutonium_ore.prospected": "Плутоний", - "block.gtceu.rhyolite_pollucite_ore.prospected": "Поллуцит", - "block.gtceu.rhyolite_powellite_ore.prospected": "Пауэллит", - "block.gtceu.rhyolite_pyrite_ore.prospected": "Пирит", - "block.gtceu.rhyolite_pyrochlore_ore.prospected": "Пирохлор", - "block.gtceu.rhyolite_pyrolusite_ore.prospected": "Пиролюзит", - "block.gtceu.rhyolite_pyrope_ore.prospected": "Пироп", - "block.gtceu.rhyolite_quartzite_ore.prospected": "Кварцит", - "block.gtceu.rhyolite_realgar_ore.prospected": "Реалгар", - "block.gtceu.rhyolite_red_garnet_ore.prospected": "Красный гранат", - "block.gtceu.rhyolite_redstone_ore.prospected": "Красный камень", - "block.gtceu.rhyolite_rock_salt_ore.prospected": "Каменная соль", - "block.gtceu.rhyolite_ruby_ore.prospected": "Рубин", - "block.gtceu.rhyolite_salt_ore.prospected": "Соль", - "block.gtceu.rhyolite_saltpeter_ore.prospected": "Селитра", - "block.gtceu.rhyolite_sapphire_ore.prospected": "Сапфир", - "block.gtceu.rhyolite_scheelite_ore.prospected": "Шеелит", - "block.gtceu.rhyolite_silver_ore.prospected": "Серебро", - "block.gtceu.rhyolite_soapstone_ore.prospected": "Мыльный камень", - "block.gtceu.rhyolite_sodalite_ore.prospected": "Содалит", - "block.gtceu.rhyolite_spessartine_ore.prospected": "Спессартин", - "block.gtceu.rhyolite_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.rhyolite_spodumene_ore.prospected": "Сподумен", - "block.gtceu.rhyolite_stibnite_ore.prospected": "Стибнит", - "block.gtceu.rhyolite_sulfur_ore.prospected": "Сера", - "block.gtceu.rhyolite_sylvite_ore.prospected": "Сильвит", - "block.gtceu.rhyolite_talc_ore.prospected": "Тальк", - "block.gtceu.rhyolite_tantalite_ore.prospected": "Танталит", - "block.gtceu.rhyolite_tetrahedrite_ore.prospected": "Тетраэдрит", - "block.gtceu.rhyolite_thorium_ore.prospected": "Торий", - "block.gtceu.rhyolite_tin_ore.prospected": "Олово", - "block.gtceu.rhyolite_topaz_ore.prospected": "Топаз", - "block.gtceu.rhyolite_tricalcium_phosphate_ore.prospected": "Трикальцийфосфат", - "block.gtceu.rhyolite_trona_ore.prospected": "Трона", - "block.gtceu.rhyolite_tungstate_ore.prospected": "Вольфрамат", - "block.gtceu.rhyolite_uraninite_ore.prospected": "Уранинит", - "block.gtceu.rhyolite_vanadium_magnetite_ore.prospected": "Ванадиевый магнетит", - "block.gtceu.rhyolite_wulfenite_ore.prospected": "Вульфенит", - "block.gtceu.rhyolite_yellow_garnet_ore.prospected": "Желтый гранат", - "block.gtceu.rhyolite_yellow_limonite_ore.prospected": "Желтый лимонит", - "block.gtceu.rhyolite_zeolite_ore.prospected": "Цеолит", - "block.gtceu.schist_almandine_ore.prospected": "Альмандин", - "block.gtceu.schist_aluminium_ore.prospected": "Алюминий", - "block.gtceu.schist_alunite_ore.prospected": "Алюнит", - "block.gtceu.schist_amethyst_ore.prospected": "Аметист", - "block.gtceu.schist_apatite_ore.prospected": "Апатит", - "block.gtceu.schist_asbestos_ore.prospected": "Асбест", - "block.gtceu.schist_barite_ore.prospected": "Барит", - "block.gtceu.schist_basaltic_mineral_sand_ore.prospected": "Базальтовый минеральный песок", - "block.gtceu.schist_bastnasite_ore.prospected": "Бастназит", - "block.gtceu.schist_bauxite_ore.prospected": "Боксит", - "block.gtceu.schist_bentonite_ore.prospected": "Бентонит", - "block.gtceu.schist_beryllium_ore.prospected": "Бериллий", - "block.gtceu.schist_bismuth_ore.prospected": "Висмут", - "block.gtceu.schist_blue_topaz_ore.prospected": "Голубой топаз", - "block.gtceu.schist_borax_ore.prospected": "Боракс", - "block.gtceu.schist_bornite_ore.prospected": "Борнит", - "block.gtceu.schist_calcite_ore.prospected": "Кальцит", - "block.gtceu.schist_cassiterite_ore.prospected": "Касситерит", - "block.gtceu.schist_cassiterite_sand_ore.prospected": "Касситеритовый песок", - "block.gtceu.schist_certus_quartz_ore.prospected": "Сертус Кварц", - "block.gtceu.schist_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.schist_chalcopyrite_ore.prospected": "Халькопирит", - "block.gtceu.schist_chromite_ore.prospected": "Хромит", - "block.gtceu.schist_cinnabar_ore.prospected": "Киноварь", - "block.gtceu.schist_coal_ore.prospected": "Уголь", - "block.gtceu.schist_cobalt_ore.prospected": "Кобальт", - "block.gtceu.schist_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.schist_cooperite_ore.prospected": "Кооперит", - "block.gtceu.schist_copper_ore.prospected": "Медь", - "block.gtceu.schist_diamond_ore.prospected": "Алмаз", - "block.gtceu.schist_diatomite_ore.prospected": "Диатомит", - "block.gtceu.schist_electrotine_ore.prospected": "Электротин", - "block.gtceu.schist_emerald_ore.prospected": "Изумруд", - "block.gtceu.schist_fullers_earth_ore.prospected": "Фулерова земля", - "block.gtceu.schist_galena_ore.prospected": "Галена", - "block.gtceu.schist_garnet_sand_ore.prospected": "Гранатовый песок", - "block.gtceu.schist_garnierite_ore.prospected": "Гарниерит", - "block.gtceu.schist_glauconite_sand_ore.prospected": "Глауконитовый песок", - "block.gtceu.schist_goethite_ore.prospected": "Гетит", - "block.gtceu.schist_gold_ore.prospected": "Золото", - "block.gtceu.schist_granitic_mineral_sand_ore.prospected": "Гранитный минеральный песок", - "block.gtceu.schist_graphite_ore.prospected": "Графит", - "block.gtceu.schist_green_sapphire_ore.prospected": "Зеленый сапфир", - "block.gtceu.schist_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.schist_gypsum_ore.prospected": "Гипс", - "block.gtceu.schist_hematite_ore.prospected": "Гематит", - "block.gtceu.schist_ilmenite_ore.prospected": "Ильменит", - "block.gtceu.schist_iron_ore.prospected": "Железо", - "block.gtceu.schist_kyanite_ore.prospected": "Кианит", - "block.gtceu.schist_lapis_ore.prospected": "Лазурит", - "block.gtceu.schist_lazurite_ore.prospected": "Сапожниковец", - "block.gtceu.schist_lead_ore.prospected": "Свинец", - "block.gtceu.schist_lepidolite_ore.prospected": "Лепидолит", - "block.gtceu.schist_lithium_ore.prospected": "Литий", - "block.gtceu.schist_magnesite_ore.prospected": "Магнезит", - "block.gtceu.schist_magnetite_ore.prospected": "Магнетит", - "block.gtceu.schist_malachite_ore.prospected": "Малахит", - "block.gtceu.schist_mica_ore.prospected": "Слюда", - "block.gtceu.schist_molybdenite_ore.prospected": "Молибденит", - "block.gtceu.schist_molybdenum_ore.prospected": "Молибден", - "block.gtceu.schist_monazite_ore.prospected": "Монацит", - "block.gtceu.schist_naquadah_ore.prospected": "Наквада", - "block.gtceu.schist_neodymium_ore.prospected": "Неодим", - "block.gtceu.schist_nether_quartz_ore.prospected": "Кварц нижнего мира", - "block.gtceu.schist_nickel_ore.prospected": "Никель", - "block.gtceu.schist_oilsands_ore.prospected": "Нефтяные пески", - "block.gtceu.schist_olivine_ore.prospected": "Оливин", - "block.gtceu.schist_opal_ore.prospected": "Опал", - "block.gtceu.schist_palladium_ore.prospected": "Палладий", - "block.gtceu.schist_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.schist_pitchblende_ore.prospected": "Горный хрусталь", - "block.gtceu.schist_platinum_ore.prospected": "Платина", - "block.gtceu.schist_plutonium_ore.prospected": "Плутоний", - "block.gtceu.schist_pollucite_ore.prospected": "Поллуцит", - "block.gtceu.schist_powellite_ore.prospected": "Пауэллит", - "block.gtceu.schist_pyrite_ore.prospected": "Пирит", - "block.gtceu.schist_pyrochlore_ore.prospected": "Пирохлор", - "block.gtceu.schist_pyrolusite_ore.prospected": "Пиролюзит", - "block.gtceu.schist_pyrope_ore.prospected": "Пироп", - "block.gtceu.schist_quartzite_ore.prospected": "Кварцит", - "block.gtceu.schist_realgar_ore.prospected": "Реалгар", - "block.gtceu.schist_red_garnet_ore.prospected": "Красный гранат", - "block.gtceu.schist_redstone_ore.prospected": "Красный камень", - "block.gtceu.schist_rock_salt_ore.prospected": "Каменная соль", - "block.gtceu.schist_ruby_ore.prospected": "Рубин", - "block.gtceu.schist_salt_ore.prospected": "Соль", - "block.gtceu.schist_saltpeter_ore.prospected": "Селитра", - "block.gtceu.schist_sapphire_ore.prospected": "Сапфир", - "block.gtceu.schist_scheelite_ore.prospected": "Шеелит", - "block.gtceu.schist_silver_ore.prospected": "Серебро", - "block.gtceu.schist_soapstone_ore.prospected": "Мыльный камень", - "block.gtceu.schist_sodalite_ore.prospected": "Содалит", - "block.gtceu.schist_spessartine_ore.prospected": "Спессартин", - "block.gtceu.schist_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.schist_spodumene_ore.prospected": "Сподумен", - "block.gtceu.schist_stibnite_ore.prospected": "Стибнит", - "block.gtceu.schist_sulfur_ore.prospected": "Сера", - "block.gtceu.schist_sylvite_ore.prospected": "Сильвит", - "block.gtceu.schist_talc_ore.prospected": "Тальк", - "block.gtceu.schist_tantalite_ore.prospected": "Танталит", - "block.gtceu.schist_tetrahedrite_ore.prospected": "Тетраэдрит", - "block.gtceu.schist_thorium_ore.prospected": "Торий", - "block.gtceu.schist_tin_ore.prospected": "Олово", - "block.gtceu.schist_topaz_ore.prospected": "Топаз", - "block.gtceu.schist_tricalcium_phosphate_ore.prospected": "Трикальцийфосфат", - "block.gtceu.schist_trona_ore.prospected": "Трона", - "block.gtceu.schist_tungstate_ore.prospected": "Вольфрамат", - "block.gtceu.schist_uraninite_ore.prospected": "Уранинит", - "block.gtceu.schist_vanadium_magnetite_ore.prospected": "Ванадиевый магнетит", - "block.gtceu.schist_wulfenite_ore.prospected": "Вульфенит", - "block.gtceu.schist_yellow_garnet_ore.prospected": "Желтый гранат", - "block.gtceu.schist_yellow_limonite_ore.prospected": "Желтый лимонит", - "block.gtceu.schist_zeolite_ore.prospected": "Цеолит", - "block.gtceu.shale_almandine_ore.prospected": "Альмандин", - "block.gtceu.shale_aluminium_ore.prospected": "Алюминий", - "block.gtceu.shale_alunite_ore.prospected": "Алюнит", - "block.gtceu.shale_amethyst_ore.prospected": "Аметист", - "block.gtceu.shale_apatite_ore.prospected": "Апатит", - "block.gtceu.shale_asbestos_ore.prospected": "Асбест", - "block.gtceu.shale_barite_ore.prospected": "Барит", - "block.gtceu.shale_basaltic_mineral_sand_ore.prospected": "Базальтовый минеральный песок", - "block.gtceu.shale_bastnasite_ore.prospected": "Бастназит", - "block.gtceu.shale_bauxite_ore.prospected": "Боксит", - "block.gtceu.shale_bentonite_ore.prospected": "Бентонит", - "block.gtceu.shale_beryllium_ore.prospected": "Бериллий", - "block.gtceu.shale_bismuth_ore.prospected": "Висмут", - "block.gtceu.shale_blue_topaz_ore.prospected": "Голубой топаз", - "block.gtceu.shale_borax_ore.prospected": "Боракс", - "block.gtceu.shale_bornite_ore.prospected": "Борнит", - "block.gtceu.shale_calcite_ore.prospected": "Кальцит", - "block.gtceu.shale_cassiterite_ore.prospected": "Касситерит", - "block.gtceu.shale_cassiterite_sand_ore.prospected": "Касситеритовый песок", - "block.gtceu.shale_certus_quartz_ore.prospected": "Сертус Кварц", - "block.gtceu.shale_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.shale_chalcopyrite_ore.prospected": "Халькопирит", - "block.gtceu.shale_chromite_ore.prospected": "Хромит", - "block.gtceu.shale_cinnabar_ore.prospected": "Киноварь", - "block.gtceu.shale_coal_ore.prospected": "Уголь", - "block.gtceu.shale_cobalt_ore.prospected": "Кобальт", - "block.gtceu.shale_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.shale_cooperite_ore.prospected": "Кооперит", - "block.gtceu.shale_copper_ore.prospected": "Медь", - "block.gtceu.shale_diamond_ore.prospected": "Алмаз", - "block.gtceu.shale_diatomite_ore.prospected": "Диатомит", - "block.gtceu.shale_electrotine_ore.prospected": "Электротин", - "block.gtceu.shale_emerald_ore.prospected": "Изумруд", - "block.gtceu.shale_fullers_earth_ore.prospected": "Фулерова земля", - "block.gtceu.shale_galena_ore.prospected": "Галена", - "block.gtceu.shale_garnet_sand_ore.prospected": "Гранатовый песок", - "block.gtceu.shale_garnierite_ore.prospected": "Гарниерит", - "block.gtceu.shale_glauconite_sand_ore.prospected": "Глауконитовый песок", - "block.gtceu.shale_goethite_ore.prospected": "Гетит", - "block.gtceu.shale_gold_ore.prospected": "Золото", - "block.gtceu.shale_granitic_mineral_sand_ore.prospected": "Гранитный минеральный песок", - "block.gtceu.shale_graphite_ore.prospected": "Графит", - "block.gtceu.shale_green_sapphire_ore.prospected": "Зеленый сапфир", - "block.gtceu.shale_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.shale_gypsum_ore.prospected": "Гипс", - "block.gtceu.shale_hematite_ore.prospected": "Гематит", - "block.gtceu.shale_ilmenite_ore.prospected": "Ильменит", - "block.gtceu.shale_iron_ore.prospected": "Железо", - "block.gtceu.shale_kyanite_ore.prospected": "Кианит", - "block.gtceu.shale_lapis_ore.prospected": "Лазурит", - "block.gtceu.shale_lazurite_ore.prospected": "Сапожниковец", - "block.gtceu.shale_lead_ore.prospected": "Свинец", - "block.gtceu.shale_lepidolite_ore.prospected": "Лепидолит", - "block.gtceu.shale_lithium_ore.prospected": "Литий", - "block.gtceu.shale_magnesite_ore.prospected": "Магнезит", - "block.gtceu.shale_magnetite_ore.prospected": "Магнетит", - "block.gtceu.shale_malachite_ore.prospected": "Малахит", - "block.gtceu.shale_mica_ore.prospected": "Слюда", - "block.gtceu.shale_molybdenite_ore.prospected": "Молибденит", - "block.gtceu.shale_molybdenum_ore.prospected": "Молибден", - "block.gtceu.shale_monazite_ore.prospected": "Монацит", - "block.gtceu.shale_naquadah_ore.prospected": "Наквада", - "block.gtceu.shale_neodymium_ore.prospected": "Неодим", - "block.gtceu.shale_nether_quartz_ore.prospected": "Кварц нижнего мира", - "block.gtceu.shale_nickel_ore.prospected": "Никель", - "block.gtceu.shale_oilsands_ore.prospected": "Нефтяные пески", - "block.gtceu.shale_olivine_ore.prospected": "Оливин", - "block.gtceu.shale_opal_ore.prospected": "Опал", - "block.gtceu.shale_palladium_ore.prospected": "Палладий", - "block.gtceu.shale_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.shale_pitchblende_ore.prospected": "Горный хрусталь", - "block.gtceu.shale_platinum_ore.prospected": "Платина", - "block.gtceu.shale_plutonium_ore.prospected": "Плутоний", - "block.gtceu.shale_pollucite_ore.prospected": "Поллуцит", - "block.gtceu.shale_powellite_ore.prospected": "Пауэллит", - "block.gtceu.shale_pyrite_ore.prospected": "Пирит", - "block.gtceu.shale_pyrochlore_ore.prospected": "Пирохлор", - "block.gtceu.shale_pyrolusite_ore.prospected": "Пиролюзит", - "block.gtceu.shale_pyrope_ore.prospected": "Пироп", - "block.gtceu.shale_quartzite_ore.prospected": "Кварцит", - "block.gtceu.shale_realgar_ore.prospected": "Реалгар", - "block.gtceu.shale_red_garnet_ore.prospected": "Красный гранат", - "block.gtceu.shale_redstone_ore.prospected": "Красный камень", - "block.gtceu.shale_rock_salt_ore.prospected": "Каменная соль", - "block.gtceu.shale_ruby_ore.prospected": "Рубин", - "block.gtceu.shale_salt_ore.prospected": "Соль", - "block.gtceu.shale_saltpeter_ore.prospected": "Селитра", - "block.gtceu.shale_sapphire_ore.prospected": "Сапфир", - "block.gtceu.shale_scheelite_ore.prospected": "Шеелит", - "block.gtceu.shale_silver_ore.prospected": "Серебро", - "block.gtceu.shale_soapstone_ore.prospected": "Мыльный камень", - "block.gtceu.shale_sodalite_ore.prospected": "Содалит", - "block.gtceu.shale_spessartine_ore.prospected": "Спессартин", - "block.gtceu.shale_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.shale_spodumene_ore.prospected": "Сподумен", - "block.gtceu.shale_stibnite_ore.prospected": "Стибнит", - "block.gtceu.shale_sulfur_ore.prospected": "Сера", - "block.gtceu.shale_sylvite_ore.prospected": "Сильвит", - "block.gtceu.shale_talc_ore.prospected": "Тальк", - "block.gtceu.shale_tantalite_ore.prospected": "Танталит", - "block.gtceu.shale_tetrahedrite_ore.prospected": "Тетраэдрит", - "block.gtceu.shale_thorium_ore.prospected": "Торий", - "block.gtceu.shale_tin_ore.prospected": "Олово", - "block.gtceu.shale_topaz_ore.prospected": "Топаз", - "block.gtceu.shale_tricalcium_phosphate_ore.prospected": "Трикальцийфосфат", - "block.gtceu.shale_trona_ore.prospected": "Трона", - "block.gtceu.shale_tungstate_ore.prospected": "Вольфрамат", - "block.gtceu.shale_uraninite_ore.prospected": "Уранинит", - "block.gtceu.shale_vanadium_magnetite_ore.prospected": "Ванадиевый магнетит", - "block.gtceu.shale_wulfenite_ore.prospected": "Вульфенит", - "block.gtceu.shale_yellow_garnet_ore.prospected": "Желтый гранат", - "block.gtceu.shale_yellow_limonite_ore.prospected": "Желтый лимонит", - "block.gtceu.shale_zeolite_ore.prospected": "Цеолит", - "block.gtceu.slate_almandine_ore.prospected": "Альмандин", - "block.gtceu.slate_aluminium_ore.prospected": "Алюминий", - "block.gtceu.slate_alunite_ore.prospected": "Алюнит", - "block.gtceu.slate_amethyst_ore.prospected": "Аметист", - "block.gtceu.slate_apatite_ore.prospected": "Апатит", - "block.gtceu.slate_asbestos_ore.prospected": "Асбест", - "block.gtceu.slate_barite_ore.prospected": "Барит", - "block.gtceu.slate_basaltic_mineral_sand_ore.prospected": "Базальтовый минеральный песок", - "block.gtceu.slate_bastnasite_ore.prospected": "Бастназит", - "block.gtceu.slate_bauxite_ore.prospected": "Боксит", - "block.gtceu.slate_bentonite_ore.prospected": "Бентонит", - "block.gtceu.slate_beryllium_ore.prospected": "Бериллий", - "block.gtceu.slate_bismuth_ore.prospected": "Висмут", - "block.gtceu.slate_blue_topaz_ore.prospected": "Голубой топаз", - "block.gtceu.slate_borax_ore.prospected": "Боракс", - "block.gtceu.slate_bornite_ore.prospected": "Борнит", - "block.gtceu.slate_calcite_ore.prospected": "Кальцит", - "block.gtceu.slate_cassiterite_ore.prospected": "Касситерит", - "block.gtceu.slate_cassiterite_sand_ore.prospected": "Касситеритовый песок", - "block.gtceu.slate_certus_quartz_ore.prospected": "Сертус Кварц", - "block.gtceu.slate_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.slate_chalcopyrite_ore.prospected": "Халькопирит", - "block.gtceu.slate_chromite_ore.prospected": "Хромит", - "block.gtceu.slate_cinnabar_ore.prospected": "Киноварь", - "block.gtceu.slate_coal_ore.prospected": "Уголь", - "block.gtceu.slate_cobalt_ore.prospected": "Кобальт", - "block.gtceu.slate_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.slate_cooperite_ore.prospected": "Кооперит", - "block.gtceu.slate_copper_ore.prospected": "Медь", - "block.gtceu.slate_diamond_ore.prospected": "Алмаз", - "block.gtceu.slate_diatomite_ore.prospected": "Диатомит", - "block.gtceu.slate_electrotine_ore.prospected": "Электротин", - "block.gtceu.slate_emerald_ore.prospected": "Изумруд", - "block.gtceu.slate_fullers_earth_ore.prospected": "Фулерова земля", - "block.gtceu.slate_galena_ore.prospected": "Галена", - "block.gtceu.slate_garnet_sand_ore.prospected": "Гранатовый песок", - "block.gtceu.slate_garnierite_ore.prospected": "Гарниерит", - "block.gtceu.slate_glauconite_sand_ore.prospected": "Глауконитовый песок", - "block.gtceu.slate_goethite_ore.prospected": "Гетит", - "block.gtceu.slate_gold_ore.prospected": "Золото", - "block.gtceu.slate_granitic_mineral_sand_ore.prospected": "Гранитный минеральный песок", - "block.gtceu.slate_graphite_ore.prospected": "Графит", - "block.gtceu.slate_green_sapphire_ore.prospected": "Зеленый сапфир", - "block.gtceu.slate_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.slate_gypsum_ore.prospected": "Гипс", - "block.gtceu.slate_hematite_ore.prospected": "Гематит", - "block.gtceu.slate_ilmenite_ore.prospected": "Ильменит", - "block.gtceu.slate_iron_ore.prospected": "Железо", - "block.gtceu.slate_kyanite_ore.prospected": "Кианит", - "block.gtceu.slate_lapis_ore.prospected": "Лазурит", - "block.gtceu.slate_lazurite_ore.prospected": "Сапожниковец", - "block.gtceu.slate_lead_ore.prospected": "Свинец", - "block.gtceu.slate_lepidolite_ore.prospected": "Лепидолит", - "block.gtceu.slate_lithium_ore.prospected": "Литий", - "block.gtceu.slate_magnesite_ore.prospected": "Магнезит", - "block.gtceu.slate_magnetite_ore.prospected": "Магнетит", - "block.gtceu.slate_malachite_ore.prospected": "Малахит", - "block.gtceu.slate_mica_ore.prospected": "Слюда", - "block.gtceu.slate_molybdenite_ore.prospected": "Молибденит", - "block.gtceu.slate_molybdenum_ore.prospected": "Молибден", - "block.gtceu.slate_monazite_ore.prospected": "Монацит", - "block.gtceu.slate_naquadah_ore.prospected": "Наквада", - "block.gtceu.slate_neodymium_ore.prospected": "Неодим", - "block.gtceu.slate_nether_quartz_ore.prospected": "Кварц нижнего мира", - "block.gtceu.slate_nickel_ore.prospected": "Никель", - "block.gtceu.slate_oilsands_ore.prospected": "Нефтяные пески", - "block.gtceu.slate_olivine_ore.prospected": "Оливин", - "block.gtceu.slate_opal_ore.prospected": "Опал", - "block.gtceu.slate_palladium_ore.prospected": "Палладий", - "block.gtceu.slate_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.slate_pitchblende_ore.prospected": "Горный хрусталь", - "block.gtceu.slate_platinum_ore.prospected": "Платина", - "block.gtceu.slate_plutonium_ore.prospected": "Плутоний", - "block.gtceu.slate_pollucite_ore.prospected": "Поллуцит", - "block.gtceu.slate_powellite_ore.prospected": "Пауэллит", - "block.gtceu.slate_pyrite_ore.prospected": "Пирит", - "block.gtceu.slate_pyrochlore_ore.prospected": "Пирохлор", - "block.gtceu.slate_pyrolusite_ore.prospected": "Пиролюзит", - "block.gtceu.slate_pyrope_ore.prospected": "Пироп", - "block.gtceu.slate_quartzite_ore.prospected": "Кварцит", - "block.gtceu.slate_realgar_ore.prospected": "Реалгар", - "block.gtceu.slate_red_garnet_ore.prospected": "Красный гранат", - "block.gtceu.slate_redstone_ore.prospected": "Красный камень", - "block.gtceu.slate_rock_salt_ore.prospected": "Каменная соль", - "block.gtceu.slate_ruby_ore.prospected": "Рубин", - "block.gtceu.slate_salt_ore.prospected": "Соль", - "block.gtceu.slate_saltpeter_ore.prospected": "Селитра", - "block.gtceu.slate_sapphire_ore.prospected": "Сапфир", - "block.gtceu.slate_scheelite_ore.prospected": "Шеелит", - "block.gtceu.slate_silver_ore.prospected": "Серебро", - "block.gtceu.slate_soapstone_ore.prospected": "Мыльный камень", - "block.gtceu.slate_sodalite_ore.prospected": "Содалит", - "block.gtceu.slate_spessartine_ore.prospected": "Спессартин", - "block.gtceu.slate_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.slate_spodumene_ore.prospected": "Сподумен", - "block.gtceu.slate_stibnite_ore.prospected": "Стибнит", - "block.gtceu.slate_sulfur_ore.prospected": "Сера", - "block.gtceu.slate_sylvite_ore.prospected": "Сильвит", - "block.gtceu.slate_talc_ore.prospected": "Тальк", - "block.gtceu.slate_tantalite_ore.prospected": "Танталит", - "block.gtceu.slate_tetrahedrite_ore.prospected": "Тетраэдрит", - "block.gtceu.slate_thorium_ore.prospected": "Торий", - "block.gtceu.slate_tin_ore.prospected": "Олово", - "block.gtceu.slate_topaz_ore.prospected": "Топаз", - "block.gtceu.slate_tricalcium_phosphate_ore.prospected": "Трикальцийфосфат", - "block.gtceu.slate_trona_ore.prospected": "Трона", - "block.gtceu.slate_tungstate_ore.prospected": "Вольфрамат", - "block.gtceu.slate_uraninite_ore.prospected": "Уранинит", - "block.gtceu.slate_vanadium_magnetite_ore.prospected": "Ванадиевый магнетит", - "block.gtceu.slate_wulfenite_ore.prospected": "Вульфенит", - "block.gtceu.slate_yellow_garnet_ore.prospected": "Желтый гранат", - "block.gtceu.slate_yellow_limonite_ore.prospected": "Желтый лимонит", - "block.gtceu.slate_zeolite_ore.prospected": "Цеолит" + "metal.tfg.tin_alloy": "Оловянный сплав" } \ No newline at end of file diff --git a/kubejs/assets/tfc/lang/uk_ua.json b/kubejs/assets/tfc/lang/uk_ua.json index 56fe8aaec..d2cbb659b 100644 --- a/kubejs/assets/tfc/lang/uk_ua.json +++ b/kubejs/assets/tfc/lang/uk_ua.json @@ -2,2605 +2,6 @@ "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", "block.tfc.fluid.salt_water": "Морська Вода", "block.tfc.cauldron.salt_water": "Котел з морською водою", - "block.gtceu.andesite_almandine_ore.prospected": "Альмандин", - "block.gtceu.andesite_aluminium_ore.prospected": "Алюміній", - "block.gtceu.andesite_alunite_ore.prospected": "Алюніт", - "block.gtceu.andesite_amethyst_ore.prospected": "Аметист", - "block.gtceu.andesite_apatite_ore.prospected": "Апатит", - "block.gtceu.andesite_asbestos_ore.prospected": "Азбест", - "block.gtceu.andesite_barite_ore.prospected": "Барит", - "block.gtceu.andesite_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.andesite_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.andesite_bauxite_ore.prospected": "Боксит", - "block.gtceu.andesite_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.andesite_beryllium_ore.prospected": "Берилій", - "block.gtceu.andesite_bismuth_ore.prospected": "Вісмут", - "block.gtceu.andesite_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.andesite_borax_ore.prospected": "Боракс", - "block.gtceu.andesite_bornite_ore.prospected": "Борніт", - "block.gtceu.andesite_calcite_ore.prospected": "Кальцит", - "block.gtceu.andesite_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.andesite_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.andesite_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.andesite_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.andesite_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.andesite_chromite_ore.prospected": "Хроміт", - "block.gtceu.andesite_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.andesite_coal_ore.prospected": "Вугілля", - "block.gtceu.andesite_cobalt_ore.prospected": "Кобальт", - "block.gtceu.andesite_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.andesite_cooperite_ore.prospected": "Куперит", - "block.gtceu.andesite_copper_ore.prospected": "Мідь", - "block.gtceu.andesite_diamond_ore.prospected": "Діамант", - "block.gtceu.andesite_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.andesite_electrotine_ore.prospected": "Електротин", - "block.gtceu.andesite_emerald_ore.prospected": "Смарагд", - "block.gtceu.andesite_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.andesite_galena_ore.prospected": "Галеніт", - "block.gtceu.andesite_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.andesite_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.andesite_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.andesite_goethite_ore.prospected": "Гетит", - "block.gtceu.andesite_gold_ore.prospected": "Золото", - "block.gtceu.andesite_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.andesite_graphite_ore.prospected": "Графіт", - "block.gtceu.andesite_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.andesite_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.andesite_gypsum_ore.prospected": "Гіпс", - "block.gtceu.andesite_hematite_ore.prospected": "Гематит", - "block.gtceu.andesite_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.andesite_iron_ore.prospected": "Залізо", - "block.gtceu.andesite_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.andesite_lapis_ore.prospected": "Лазурит", - "block.gtceu.andesite_lazurite_ore.prospected": "Лазурите", - "block.gtceu.andesite_lead_ore.prospected": "Свинець", - "block.gtceu.andesite_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.andesite_lithium_ore.prospected": "Літій", - "block.gtceu.andesite_magnesite_ore.prospected": "Магнезит", - "block.gtceu.andesite_magnetite_ore.prospected": "Магнетит", - "block.gtceu.andesite_malachite_ore.prospected": "Малахіт", - "block.gtceu.andesite_mica_ore.prospected": "Слюда", - "block.gtceu.andesite_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.andesite_molybdenum_ore.prospected": "Молібден", - "block.gtceu.andesite_monazite_ore.prospected": "Монацит", - "block.gtceu.andesite_naquadah_ore.prospected": "Наквада", - "block.gtceu.andesite_neodymium_ore.prospected": "Неодим", - "block.gtceu.andesite_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.andesite_nickel_ore.prospected": "Нікель", - "block.gtceu.andesite_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.andesite_olivine_ore.prospected": "Олівін", - "block.gtceu.andesite_opal_ore.prospected": "Опал", - "block.gtceu.andesite_palladium_ore.prospected": "Паладій", - "block.gtceu.andesite_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.andesite_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.andesite_platinum_ore.prospected": "Платина", - "block.gtceu.andesite_plutonium_ore.prospected": "Плутоній", - "block.gtceu.andesite_pollucite_ore.prospected": "Полюцит", - "block.gtceu.andesite_powellite_ore.prospected": "Повеліт", - "block.gtceu.andesite_pyrite_ore.prospected": "Пірит", - "block.gtceu.andesite_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.andesite_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.andesite_pyrope_ore.prospected": "Піроп", - "block.gtceu.andesite_quartzite_ore.prospected": "Кварцит", - "block.gtceu.andesite_realgar_ore.prospected": "Реальгар", - "block.gtceu.andesite_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.andesite_redstone_ore.prospected": "Редстоун", - "block.gtceu.andesite_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.andesite_ruby_ore.prospected": "Рубін", - "block.gtceu.andesite_salt_ore.prospected": "Сіль", - "block.gtceu.andesite_saltpeter_ore.prospected": "Селітра", - "block.gtceu.andesite_sapphire_ore.prospected": "Сапфір", - "block.gtceu.andesite_scheelite_ore.prospected": "Шееліт", - "block.gtceu.andesite_silver_ore.prospected": "Срібло", - "block.gtceu.andesite_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.andesite_sodalite_ore.prospected": "Содаліт", - "block.gtceu.andesite_spessartine_ore.prospected": "Спесартин", - "block.gtceu.andesite_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.andesite_spodumene_ore.prospected": "Сподумен", - "block.gtceu.andesite_stibnite_ore.prospected": "Стибніт", - "block.gtceu.andesite_sulfur_ore.prospected": "Сірка", - "block.gtceu.andesite_sylvite_ore.prospected": "Сильвін", - "block.gtceu.andesite_talc_ore.prospected": "Тальк", - "block.gtceu.andesite_tantalite_ore.prospected": "Танталіт", - "block.gtceu.andesite_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.andesite_thorium_ore.prospected": "Торій", - "block.gtceu.andesite_tin_ore.prospected": "Олово", - "block.gtceu.andesite_topaz_ore.prospected": "Топаз", - "block.gtceu.andesite_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.andesite_trona_ore.prospected": "Трона", - "block.gtceu.andesite_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.andesite_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.andesite_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.andesite_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.andesite_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.andesite_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.andesite_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.basalt_almandine_ore.prospected": "Альмандин", - "block.gtceu.basalt_aluminium_ore.prospected": "Алюміній", - "block.gtceu.basalt_alunite_ore.prospected": "Алюніт", - "block.gtceu.basalt_amethyst_ore.prospected": "Аметист", - "block.gtceu.basalt_apatite_ore.prospected": "Апатит", - "block.gtceu.basalt_asbestos_ore.prospected": "Азбест", - "block.gtceu.basalt_barite_ore.prospected": "Барит", - "block.gtceu.basalt_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.basalt_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.basalt_bauxite_ore.prospected": "Боксит", - "block.gtceu.basalt_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.basalt_beryllium_ore.prospected": "Берилій", - "block.gtceu.basalt_bismuth_ore.prospected": "Вісмут", - "block.gtceu.basalt_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.basalt_borax_ore.prospected": "Боракс", - "block.gtceu.basalt_bornite_ore.prospected": "Борніт", - "block.gtceu.basalt_calcite_ore.prospected": "Кальцит", - "block.gtceu.basalt_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.basalt_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.basalt_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.basalt_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.basalt_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.basalt_chromite_ore.prospected": "Хроміт", - "block.gtceu.basalt_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.basalt_coal_ore.prospected": "Вугілля", - "block.gtceu.basalt_cobalt_ore.prospected": "Кобальт", - "block.gtceu.basalt_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.basalt_cooperite_ore.prospected": "Куперит", - "block.gtceu.basalt_copper_ore.prospected": "Мідь", - "block.gtceu.basalt_diamond_ore.prospected": "Діамант", - "block.gtceu.basalt_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.basalt_electrotine_ore.prospected": "Електротин", - "block.gtceu.basalt_emerald_ore.prospected": "Смарагд", - "block.gtceu.basalt_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.basalt_galena_ore.prospected": "Галеніт", - "block.gtceu.basalt_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.basalt_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.basalt_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.basalt_goethite_ore.prospected": "Гетит", - "block.gtceu.basalt_gold_ore.prospected": "Золото", - "block.gtceu.basalt_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.basalt_graphite_ore.prospected": "Графіт", - "block.gtceu.basalt_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.basalt_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.basalt_gypsum_ore.prospected": "Гіпс", - "block.gtceu.basalt_hematite_ore.prospected": "Гематит", - "block.gtceu.basalt_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.basalt_iron_ore.prospected": "Залізо", - "block.gtceu.basalt_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.basalt_lapis_ore.prospected": "Лазурит", - "block.gtceu.basalt_lazurite_ore.prospected": "Лазурите", - "block.gtceu.basalt_lead_ore.prospected": "Свинець", - "block.gtceu.basalt_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.basalt_lithium_ore.prospected": "Літій", - "block.gtceu.basalt_magnesite_ore.prospected": "Магнезит", - "block.gtceu.basalt_magnetite_ore.prospected": "Магнетит", - "block.gtceu.basalt_malachite_ore.prospected": "Малахіт", - "block.gtceu.basalt_mica_ore.prospected": "Слюда", - "block.gtceu.basalt_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.basalt_molybdenum_ore.prospected": "Молібден", - "block.gtceu.basalt_monazite_ore.prospected": "Монацит", - "block.gtceu.basalt_naquadah_ore.prospected": "Наквада", - "block.gtceu.basalt_neodymium_ore.prospected": "Неодим", - "block.gtceu.basalt_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.basalt_nickel_ore.prospected": "Нікель", - "block.gtceu.basalt_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.basalt_olivine_ore.prospected": "Олівін", - "block.gtceu.basalt_opal_ore.prospected": "Опал", - "block.gtceu.basalt_palladium_ore.prospected": "Паладій", - "block.gtceu.basalt_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.basalt_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.basalt_platinum_ore.prospected": "Платина", - "block.gtceu.basalt_plutonium_ore.prospected": "Плутоній", - "block.gtceu.basalt_pollucite_ore.prospected": "Полюцит", - "block.gtceu.basalt_powellite_ore.prospected": "Повеліт", - "block.gtceu.basalt_pyrite_ore.prospected": "Пірит", - "block.gtceu.basalt_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.basalt_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.basalt_pyrope_ore.prospected": "Піроп", - "block.gtceu.basalt_quartzite_ore.prospected": "Кварцит", - "block.gtceu.basalt_realgar_ore.prospected": "Реальгар", - "block.gtceu.basalt_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.basalt_redstone_ore.prospected": "Редстоун", - "block.gtceu.basalt_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.basalt_ruby_ore.prospected": "Рубін", - "block.gtceu.basalt_salt_ore.prospected": "Сіль", - "block.gtceu.basalt_saltpeter_ore.prospected": "Селітра", - "block.gtceu.basalt_sapphire_ore.prospected": "Сапфір", - "block.gtceu.basalt_scheelite_ore.prospected": "Шееліт", - "block.gtceu.basalt_silver_ore.prospected": "Срібло", - "block.gtceu.basalt_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.basalt_sodalite_ore.prospected": "Содаліт", - "block.gtceu.basalt_spessartine_ore.prospected": "Спесартин", - "block.gtceu.basalt_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.basalt_spodumene_ore.prospected": "Сподумен", - "block.gtceu.basalt_stibnite_ore.prospected": "Стибніт", - "block.gtceu.basalt_sulfur_ore.prospected": "Сірка", - "block.gtceu.basalt_sylvite_ore.prospected": "Сильвін", - "block.gtceu.basalt_talc_ore.prospected": "Тальк", - "block.gtceu.basalt_tantalite_ore.prospected": "Танталіт", - "block.gtceu.basalt_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.basalt_thorium_ore.prospected": "Торій", - "block.gtceu.basalt_tin_ore.prospected": "Олово", - "block.gtceu.basalt_topaz_ore.prospected": "Топаз", - "block.gtceu.basalt_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.basalt_trona_ore.prospected": "Трона", - "block.gtceu.basalt_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.basalt_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.basalt_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.basalt_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.basalt_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.basalt_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.basalt_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.chalk_almandine_ore.prospected": "Альмандин", - "block.gtceu.chalk_aluminium_ore.prospected": "Алюміній", - "block.gtceu.chalk_alunite_ore.prospected": "Алюніт", - "block.gtceu.chalk_amethyst_ore.prospected": "Аметист", - "block.gtceu.chalk_apatite_ore.prospected": "Апатит", - "block.gtceu.chalk_asbestos_ore.prospected": "Азбест", - "block.gtceu.chalk_barite_ore.prospected": "Барит", - "block.gtceu.chalk_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.chalk_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.chalk_bauxite_ore.prospected": "Боксит", - "block.gtceu.chalk_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.chalk_beryllium_ore.prospected": "Берилій", - "block.gtceu.chalk_bismuth_ore.prospected": "Вісмут", - "block.gtceu.chalk_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.chalk_borax_ore.prospected": "Боракс", - "block.gtceu.chalk_bornite_ore.prospected": "Борніт", - "block.gtceu.chalk_calcite_ore.prospected": "Кальцит", - "block.gtceu.chalk_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.chalk_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.chalk_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.chalk_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.chalk_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.chalk_chromite_ore.prospected": "Хроміт", - "block.gtceu.chalk_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.chalk_coal_ore.prospected": "Вугілля", - "block.gtceu.chalk_cobalt_ore.prospected": "Кобальт", - "block.gtceu.chalk_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.chalk_cooperite_ore.prospected": "Куперит", - "block.gtceu.chalk_copper_ore.prospected": "Мідь", - "block.gtceu.chalk_diamond_ore.prospected": "Діамант", - "block.gtceu.chalk_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.chalk_electrotine_ore.prospected": "Електротин", - "block.gtceu.chalk_emerald_ore.prospected": "Смарагд", - "block.gtceu.chalk_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.chalk_galena_ore.prospected": "Галеніт", - "block.gtceu.chalk_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.chalk_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.chalk_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.chalk_goethite_ore.prospected": "Гетит", - "block.gtceu.chalk_gold_ore.prospected": "Золото", - "block.gtceu.chalk_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.chalk_graphite_ore.prospected": "Графіт", - "block.gtceu.chalk_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.chalk_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.chalk_gypsum_ore.prospected": "Гіпс", - "block.gtceu.chalk_hematite_ore.prospected": "Гематит", - "block.gtceu.chalk_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.chalk_iron_ore.prospected": "Залізо", - "block.gtceu.chalk_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.chalk_lapis_ore.prospected": "Лазурит", - "block.gtceu.chalk_lazurite_ore.prospected": "Лазурите", - "block.gtceu.chalk_lead_ore.prospected": "Свинець", - "block.gtceu.chalk_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.chalk_lithium_ore.prospected": "Літій", - "block.gtceu.chalk_magnesite_ore.prospected": "Магнезит", - "block.gtceu.chalk_magnetite_ore.prospected": "Магнетит", - "block.gtceu.chalk_malachite_ore.prospected": "Малахіт", - "block.gtceu.chalk_mica_ore.prospected": "Слюда", - "block.gtceu.chalk_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.chalk_molybdenum_ore.prospected": "Молібден", - "block.gtceu.chalk_monazite_ore.prospected": "Монацит", - "block.gtceu.chalk_naquadah_ore.prospected": "Наквада", - "block.gtceu.chalk_neodymium_ore.prospected": "Неодим", - "block.gtceu.chalk_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.chalk_nickel_ore.prospected": "Нікель", - "block.gtceu.chalk_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.chalk_olivine_ore.prospected": "Олівін", - "block.gtceu.chalk_opal_ore.prospected": "Опал", - "block.gtceu.chalk_palladium_ore.prospected": "Паладій", - "block.gtceu.chalk_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.chalk_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.chalk_platinum_ore.prospected": "Платина", - "block.gtceu.chalk_plutonium_ore.prospected": "Плутоній", - "block.gtceu.chalk_pollucite_ore.prospected": "Полюцит", - "block.gtceu.chalk_powellite_ore.prospected": "Повеліт", - "block.gtceu.chalk_pyrite_ore.prospected": "Пірит", - "block.gtceu.chalk_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.chalk_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.chalk_pyrope_ore.prospected": "Піроп", - "block.gtceu.chalk_quartzite_ore.prospected": "Кварцит", - "block.gtceu.chalk_realgar_ore.prospected": "Реальгар", - "block.gtceu.chalk_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.chalk_redstone_ore.prospected": "Редстоун", - "block.gtceu.chalk_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.chalk_ruby_ore.prospected": "Рубін", - "block.gtceu.chalk_salt_ore.prospected": "Сіль", - "block.gtceu.chalk_saltpeter_ore.prospected": "Селітра", - "block.gtceu.chalk_sapphire_ore.prospected": "Сапфір", - "block.gtceu.chalk_scheelite_ore.prospected": "Шееліт", - "block.gtceu.chalk_silver_ore.prospected": "Срібло", - "block.gtceu.chalk_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.chalk_sodalite_ore.prospected": "Содаліт", - "block.gtceu.chalk_spessartine_ore.prospected": "Спесартин", - "block.gtceu.chalk_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.chalk_spodumene_ore.prospected": "Сподумен", - "block.gtceu.chalk_stibnite_ore.prospected": "Стибніт", - "block.gtceu.chalk_sulfur_ore.prospected": "Сірка", - "block.gtceu.chalk_sylvite_ore.prospected": "Сильвін", - "block.gtceu.chalk_talc_ore.prospected": "Тальк", - "block.gtceu.chalk_tantalite_ore.prospected": "Танталіт", - "block.gtceu.chalk_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.chalk_thorium_ore.prospected": "Торій", - "block.gtceu.chalk_tin_ore.prospected": "Олово", - "block.gtceu.chalk_topaz_ore.prospected": "Топаз", - "block.gtceu.chalk_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.chalk_trona_ore.prospected": "Трона", - "block.gtceu.chalk_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.chalk_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.chalk_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.chalk_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.chalk_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.chalk_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.chalk_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.chert_almandine_ore.prospected": "Альмандин", - "block.gtceu.chert_aluminium_ore.prospected": "Алюміній", - "block.gtceu.chert_alunite_ore.prospected": "Алюніт", - "block.gtceu.chert_amethyst_ore.prospected": "Аметист", - "block.gtceu.chert_apatite_ore.prospected": "Апатит", - "block.gtceu.chert_asbestos_ore.prospected": "Азбест", - "block.gtceu.chert_barite_ore.prospected": "Барит", - "block.gtceu.chert_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.chert_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.chert_bauxite_ore.prospected": "Боксит", - "block.gtceu.chert_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.chert_beryllium_ore.prospected": "Берилій", - "block.gtceu.chert_bismuth_ore.prospected": "Вісмут", - "block.gtceu.chert_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.chert_borax_ore.prospected": "Боракс", - "block.gtceu.chert_bornite_ore.prospected": "Борніт", - "block.gtceu.chert_calcite_ore.prospected": "Кальцит", - "block.gtceu.chert_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.chert_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.chert_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.chert_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.chert_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.chert_chromite_ore.prospected": "Хроміт", - "block.gtceu.chert_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.chert_coal_ore.prospected": "Вугілля", - "block.gtceu.chert_cobalt_ore.prospected": "Кобальт", - "block.gtceu.chert_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.chert_cooperite_ore.prospected": "Куперит", - "block.gtceu.chert_copper_ore.prospected": "Мідь", - "block.gtceu.chert_diamond_ore.prospected": "Діамант", - "block.gtceu.chert_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.chert_electrotine_ore.prospected": "Електротин", - "block.gtceu.chert_emerald_ore.prospected": "Смарагд", - "block.gtceu.chert_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.chert_galena_ore.prospected": "Галеніт", - "block.gtceu.chert_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.chert_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.chert_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.chert_goethite_ore.prospected": "Гетит", - "block.gtceu.chert_gold_ore.prospected": "Золото", - "block.gtceu.chert_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.chert_graphite_ore.prospected": "Графіт", - "block.gtceu.chert_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.chert_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.chert_gypsum_ore.prospected": "Гіпс", - "block.gtceu.chert_hematite_ore.prospected": "Гематит", - "block.gtceu.chert_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.chert_iron_ore.prospected": "Залізо", - "block.gtceu.chert_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.chert_lapis_ore.prospected": "Лазурит", - "block.gtceu.chert_lazurite_ore.prospected": "Лазурите", - "block.gtceu.chert_lead_ore.prospected": "Свинець", - "block.gtceu.chert_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.chert_lithium_ore.prospected": "Літій", - "block.gtceu.chert_magnesite_ore.prospected": "Магнезит", - "block.gtceu.chert_magnetite_ore.prospected": "Магнетит", - "block.gtceu.chert_malachite_ore.prospected": "Малахіт", - "block.gtceu.chert_mica_ore.prospected": "Слюда", - "block.gtceu.chert_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.chert_molybdenum_ore.prospected": "Молібден", - "block.gtceu.chert_monazite_ore.prospected": "Монацит", - "block.gtceu.chert_naquadah_ore.prospected": "Наквада", - "block.gtceu.chert_neodymium_ore.prospected": "Неодим", - "block.gtceu.chert_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.chert_nickel_ore.prospected": "Нікель", - "block.gtceu.chert_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.chert_olivine_ore.prospected": "Олівін", - "block.gtceu.chert_opal_ore.prospected": "Опал", - "block.gtceu.chert_palladium_ore.prospected": "Паладій", - "block.gtceu.chert_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.chert_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.chert_platinum_ore.prospected": "Платина", - "block.gtceu.chert_plutonium_ore.prospected": "Плутоній", - "block.gtceu.chert_pollucite_ore.prospected": "Полюцит", - "block.gtceu.chert_powellite_ore.prospected": "Повеліт", - "block.gtceu.chert_pyrite_ore.prospected": "Пірит", - "block.gtceu.chert_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.chert_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.chert_pyrope_ore.prospected": "Піроп", - "block.gtceu.chert_quartzite_ore.prospected": "Кварцит", - "block.gtceu.chert_realgar_ore.prospected": "Реальгар", - "block.gtceu.chert_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.chert_redstone_ore.prospected": "Редстоун", - "block.gtceu.chert_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.chert_ruby_ore.prospected": "Рубін", - "block.gtceu.chert_salt_ore.prospected": "Сіль", - "block.gtceu.chert_saltpeter_ore.prospected": "Селітра", - "block.gtceu.chert_sapphire_ore.prospected": "Сапфір", - "block.gtceu.chert_scheelite_ore.prospected": "Шееліт", - "block.gtceu.chert_silver_ore.prospected": "Срібло", - "block.gtceu.chert_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.chert_sodalite_ore.prospected": "Содаліт", - "block.gtceu.chert_spessartine_ore.prospected": "Спесартин", - "block.gtceu.chert_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.chert_spodumene_ore.prospected": "Сподумен", - "block.gtceu.chert_stibnite_ore.prospected": "Стибніт", - "block.gtceu.chert_sulfur_ore.prospected": "Сірка", - "block.gtceu.chert_sylvite_ore.prospected": "Сильвін", - "block.gtceu.chert_talc_ore.prospected": "Тальк", - "block.gtceu.chert_tantalite_ore.prospected": "Танталіт", - "block.gtceu.chert_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.chert_thorium_ore.prospected": "Торій", - "block.gtceu.chert_tin_ore.prospected": "Олово", - "block.gtceu.chert_topaz_ore.prospected": "Топаз", - "block.gtceu.chert_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.chert_trona_ore.prospected": "Трона", - "block.gtceu.chert_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.chert_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.chert_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.chert_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.chert_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.chert_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.chert_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.claystone_almandine_ore.prospected": "Альмандин", - "block.gtceu.claystone_aluminium_ore.prospected": "Алюміній", - "block.gtceu.claystone_alunite_ore.prospected": "Алюніт", - "block.gtceu.claystone_amethyst_ore.prospected": "Аметист", - "block.gtceu.claystone_apatite_ore.prospected": "Апатит", - "block.gtceu.claystone_asbestos_ore.prospected": "Азбест", - "block.gtceu.claystone_barite_ore.prospected": "Барит", - "block.gtceu.claystone_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.claystone_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.claystone_bauxite_ore.prospected": "Боксит", - "block.gtceu.claystone_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.claystone_beryllium_ore.prospected": "Берилій", - "block.gtceu.claystone_bismuth_ore.prospected": "Вісмут", - "block.gtceu.claystone_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.claystone_borax_ore.prospected": "Боракс", - "block.gtceu.claystone_bornite_ore.prospected": "Борніт", - "block.gtceu.claystone_calcite_ore.prospected": "Кальцит", - "block.gtceu.claystone_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.claystone_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.claystone_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.claystone_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.claystone_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.claystone_chromite_ore.prospected": "Хроміт", - "block.gtceu.claystone_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.claystone_coal_ore.prospected": "Вугілля", - "block.gtceu.claystone_cobalt_ore.prospected": "Кобальт", - "block.gtceu.claystone_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.claystone_cooperite_ore.prospected": "Куперит", - "block.gtceu.claystone_copper_ore.prospected": "Мідь", - "block.gtceu.claystone_diamond_ore.prospected": "Діамант", - "block.gtceu.claystone_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.claystone_electrotine_ore.prospected": "Електротин", - "block.gtceu.claystone_emerald_ore.prospected": "Смарагд", - "block.gtceu.claystone_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.claystone_galena_ore.prospected": "Галеніт", - "block.gtceu.claystone_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.claystone_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.claystone_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.claystone_goethite_ore.prospected": "Гетит", - "block.gtceu.claystone_gold_ore.prospected": "Золото", - "block.gtceu.claystone_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.claystone_graphite_ore.prospected": "Графіт", - "block.gtceu.claystone_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.claystone_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.claystone_gypsum_ore.prospected": "Гіпс", - "block.gtceu.claystone_hematite_ore.prospected": "Гематит", - "block.gtceu.claystone_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.claystone_iron_ore.prospected": "Залізо", - "block.gtceu.claystone_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.claystone_lapis_ore.prospected": "Лазурит", - "block.gtceu.claystone_lazurite_ore.prospected": "Лазурите", - "block.gtceu.claystone_lead_ore.prospected": "Свинець", - "block.gtceu.claystone_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.claystone_lithium_ore.prospected": "Літій", - "block.gtceu.claystone_magnesite_ore.prospected": "Магнезит", - "block.gtceu.claystone_magnetite_ore.prospected": "Магнетит", - "block.gtceu.claystone_malachite_ore.prospected": "Малахіт", - "block.gtceu.claystone_mica_ore.prospected": "Слюда", - "block.gtceu.claystone_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.claystone_molybdenum_ore.prospected": "Молібден", - "block.gtceu.claystone_monazite_ore.prospected": "Монацит", - "block.gtceu.claystone_naquadah_ore.prospected": "Наквада", - "block.gtceu.claystone_neodymium_ore.prospected": "Неодим", - "block.gtceu.claystone_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.claystone_nickel_ore.prospected": "Нікель", - "block.gtceu.claystone_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.claystone_olivine_ore.prospected": "Олівін", - "block.gtceu.claystone_opal_ore.prospected": "Опал", - "block.gtceu.claystone_palladium_ore.prospected": "Паладій", - "block.gtceu.claystone_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.claystone_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.claystone_platinum_ore.prospected": "Платина", - "block.gtceu.claystone_plutonium_ore.prospected": "Плутоній", - "block.gtceu.claystone_pollucite_ore.prospected": "Полюцит", - "block.gtceu.claystone_powellite_ore.prospected": "Повеліт", - "block.gtceu.claystone_pyrite_ore.prospected": "Пірит", - "block.gtceu.claystone_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.claystone_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.claystone_pyrope_ore.prospected": "Піроп", - "block.gtceu.claystone_quartzite_ore.prospected": "Кварцит", - "block.gtceu.claystone_realgar_ore.prospected": "Реальгар", - "block.gtceu.claystone_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.claystone_redstone_ore.prospected": "Редстоун", - "block.gtceu.claystone_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.claystone_ruby_ore.prospected": "Рубін", - "block.gtceu.claystone_salt_ore.prospected": "Сіль", - "block.gtceu.claystone_saltpeter_ore.prospected": "Селітра", - "block.gtceu.claystone_sapphire_ore.prospected": "Сапфір", - "block.gtceu.claystone_scheelite_ore.prospected": "Шееліт", - "block.gtceu.claystone_silver_ore.prospected": "Срібло", - "block.gtceu.claystone_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.claystone_sodalite_ore.prospected": "Содаліт", - "block.gtceu.claystone_spessartine_ore.prospected": "Спесартин", - "block.gtceu.claystone_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.claystone_spodumene_ore.prospected": "Сподумен", - "block.gtceu.claystone_stibnite_ore.prospected": "Стибніт", - "block.gtceu.claystone_sulfur_ore.prospected": "Сірка", - "block.gtceu.claystone_sylvite_ore.prospected": "Сильвін", - "block.gtceu.claystone_talc_ore.prospected": "Тальк", - "block.gtceu.claystone_tantalite_ore.prospected": "Танталіт", - "block.gtceu.claystone_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.claystone_thorium_ore.prospected": "Торій", - "block.gtceu.claystone_tin_ore.prospected": "Олово", - "block.gtceu.claystone_topaz_ore.prospected": "Топаз", - "block.gtceu.claystone_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.claystone_trona_ore.prospected": "Трона", - "block.gtceu.claystone_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.claystone_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.claystone_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.claystone_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.claystone_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.claystone_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.claystone_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.conglomerate_almandine_ore.prospected": "Альмандин", - "block.gtceu.conglomerate_aluminium_ore.prospected": "Алюміній", - "block.gtceu.conglomerate_alunite_ore.prospected": "Алюніт", - "block.gtceu.conglomerate_amethyst_ore.prospected": "Аметист", - "block.gtceu.conglomerate_apatite_ore.prospected": "Апатит", - "block.gtceu.conglomerate_asbestos_ore.prospected": "Азбест", - "block.gtceu.conglomerate_barite_ore.prospected": "Барит", - "block.gtceu.conglomerate_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.conglomerate_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.conglomerate_bauxite_ore.prospected": "Боксит", - "block.gtceu.conglomerate_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.conglomerate_beryllium_ore.prospected": "Берилій", - "block.gtceu.conglomerate_bismuth_ore.prospected": "Вісмут", - "block.gtceu.conglomerate_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.conglomerate_borax_ore.prospected": "Боракс", - "block.gtceu.conglomerate_bornite_ore.prospected": "Борніт", - "block.gtceu.conglomerate_calcite_ore.prospected": "Кальцит", - "block.gtceu.conglomerate_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.conglomerate_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.conglomerate_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.conglomerate_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.conglomerate_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.conglomerate_chromite_ore.prospected": "Хроміт", - "block.gtceu.conglomerate_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.conglomerate_coal_ore.prospected": "Вугілля", - "block.gtceu.conglomerate_cobalt_ore.prospected": "Кобальт", - "block.gtceu.conglomerate_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.conglomerate_cooperite_ore.prospected": "Куперит", - "block.gtceu.conglomerate_copper_ore.prospected": "Мідь", - "block.gtceu.conglomerate_diamond_ore.prospected": "Діамант", - "block.gtceu.conglomerate_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.conglomerate_electrotine_ore.prospected": "Електротин", - "block.gtceu.conglomerate_emerald_ore.prospected": "Смарагд", - "block.gtceu.conglomerate_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.conglomerate_galena_ore.prospected": "Галеніт", - "block.gtceu.conglomerate_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.conglomerate_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.conglomerate_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.conglomerate_goethite_ore.prospected": "Гетит", - "block.gtceu.conglomerate_gold_ore.prospected": "Золото", - "block.gtceu.conglomerate_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.conglomerate_graphite_ore.prospected": "Графіт", - "block.gtceu.conglomerate_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.conglomerate_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.conglomerate_gypsum_ore.prospected": "Гіпс", - "block.gtceu.conglomerate_hematite_ore.prospected": "Гематит", - "block.gtceu.conglomerate_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.conglomerate_iron_ore.prospected": "Залізо", - "block.gtceu.conglomerate_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.conglomerate_lapis_ore.prospected": "Лазурит", - "block.gtceu.conglomerate_lazurite_ore.prospected": "Лазурите", - "block.gtceu.conglomerate_lead_ore.prospected": "Свинець", - "block.gtceu.conglomerate_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.conglomerate_lithium_ore.prospected": "Літій", - "block.gtceu.conglomerate_magnesite_ore.prospected": "Магнезит", - "block.gtceu.conglomerate_magnetite_ore.prospected": "Магнетит", - "block.gtceu.conglomerate_malachite_ore.prospected": "Малахіт", - "block.gtceu.conglomerate_mica_ore.prospected": "Слюда", - "block.gtceu.conglomerate_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.conglomerate_molybdenum_ore.prospected": "Молібден", - "block.gtceu.conglomerate_monazite_ore.prospected": "Монацит", - "block.gtceu.conglomerate_naquadah_ore.prospected": "Наквада", - "block.gtceu.conglomerate_neodymium_ore.prospected": "Неодим", - "block.gtceu.conglomerate_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.conglomerate_nickel_ore.prospected": "Нікель", - "block.gtceu.conglomerate_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.conglomerate_olivine_ore.prospected": "Олівін", - "block.gtceu.conglomerate_opal_ore.prospected": "Опал", - "block.gtceu.conglomerate_palladium_ore.prospected": "Паладій", - "block.gtceu.conglomerate_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.conglomerate_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.conglomerate_platinum_ore.prospected": "Платина", - "block.gtceu.conglomerate_plutonium_ore.prospected": "Плутоній", - "block.gtceu.conglomerate_pollucite_ore.prospected": "Полюцит", - "block.gtceu.conglomerate_powellite_ore.prospected": "Повеліт", - "block.gtceu.conglomerate_pyrite_ore.prospected": "Пірит", - "block.gtceu.conglomerate_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.conglomerate_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.conglomerate_pyrope_ore.prospected": "Піроп", - "block.gtceu.conglomerate_quartzite_ore.prospected": "Кварцит", - "block.gtceu.conglomerate_realgar_ore.prospected": "Реальгар", - "block.gtceu.conglomerate_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.conglomerate_redstone_ore.prospected": "Редстоун", - "block.gtceu.conglomerate_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.conglomerate_ruby_ore.prospected": "Рубін", - "block.gtceu.conglomerate_salt_ore.prospected": "Сіль", - "block.gtceu.conglomerate_saltpeter_ore.prospected": "Селітра", - "block.gtceu.conglomerate_sapphire_ore.prospected": "Сапфір", - "block.gtceu.conglomerate_scheelite_ore.prospected": "Шееліт", - "block.gtceu.conglomerate_silver_ore.prospected": "Срібло", - "block.gtceu.conglomerate_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.conglomerate_sodalite_ore.prospected": "Содаліт", - "block.gtceu.conglomerate_spessartine_ore.prospected": "Спесартин", - "block.gtceu.conglomerate_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.conglomerate_spodumene_ore.prospected": "Сподумен", - "block.gtceu.conglomerate_stibnite_ore.prospected": "Стибніт", - "block.gtceu.conglomerate_sulfur_ore.prospected": "Сірка", - "block.gtceu.conglomerate_sylvite_ore.prospected": "Сильвін", - "block.gtceu.conglomerate_talc_ore.prospected": "Тальк", - "block.gtceu.conglomerate_tantalite_ore.prospected": "Танталіт", - "block.gtceu.conglomerate_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.conglomerate_thorium_ore.prospected": "Торій", - "block.gtceu.conglomerate_tin_ore.prospected": "Олово", - "block.gtceu.conglomerate_topaz_ore.prospected": "Топаз", - "block.gtceu.conglomerate_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.conglomerate_trona_ore.prospected": "Трона", - "block.gtceu.conglomerate_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.conglomerate_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.conglomerate_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.conglomerate_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.conglomerate_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.conglomerate_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.conglomerate_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.dacite_almandine_ore.prospected": "Альмандин", - "block.gtceu.dacite_aluminium_ore.prospected": "Алюміній", - "block.gtceu.dacite_alunite_ore.prospected": "Алюніт", - "block.gtceu.dacite_amethyst_ore.prospected": "Аметист", - "block.gtceu.dacite_apatite_ore.prospected": "Апатит", - "block.gtceu.dacite_asbestos_ore.prospected": "Азбест", - "block.gtceu.dacite_barite_ore.prospected": "Барит", - "block.gtceu.dacite_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.dacite_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.dacite_bauxite_ore.prospected": "Боксит", - "block.gtceu.dacite_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.dacite_beryllium_ore.prospected": "Берилій", - "block.gtceu.dacite_bismuth_ore.prospected": "Вісмут", - "block.gtceu.dacite_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.dacite_borax_ore.prospected": "Боракс", - "block.gtceu.dacite_bornite_ore.prospected": "Борніт", - "block.gtceu.dacite_calcite_ore.prospected": "Кальцит", - "block.gtceu.dacite_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.dacite_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.dacite_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.dacite_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.dacite_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.dacite_chromite_ore.prospected": "Хроміт", - "block.gtceu.dacite_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.dacite_coal_ore.prospected": "Вугілля", - "block.gtceu.dacite_cobalt_ore.prospected": "Кобальт", - "block.gtceu.dacite_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.dacite_cooperite_ore.prospected": "Куперит", - "block.gtceu.dacite_copper_ore.prospected": "Мідь", - "block.gtceu.dacite_diamond_ore.prospected": "Діамант", - "block.gtceu.dacite_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.dacite_electrotine_ore.prospected": "Електротин", - "block.gtceu.dacite_emerald_ore.prospected": "Смарагд", - "block.gtceu.dacite_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.dacite_galena_ore.prospected": "Галеніт", - "block.gtceu.dacite_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.dacite_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.dacite_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.dacite_goethite_ore.prospected": "Гетит", - "block.gtceu.dacite_gold_ore.prospected": "Золото", - "block.gtceu.dacite_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.dacite_graphite_ore.prospected": "Графіт", - "block.gtceu.dacite_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.dacite_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.dacite_gypsum_ore.prospected": "Гіпс", - "block.gtceu.dacite_hematite_ore.prospected": "Гематит", - "block.gtceu.dacite_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.dacite_iron_ore.prospected": "Залізо", - "block.gtceu.dacite_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.dacite_lapis_ore.prospected": "Лазурит", - "block.gtceu.dacite_lazurite_ore.prospected": "Лазурите", - "block.gtceu.dacite_lead_ore.prospected": "Свинець", - "block.gtceu.dacite_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.dacite_lithium_ore.prospected": "Літій", - "block.gtceu.dacite_magnesite_ore.prospected": "Магнезит", - "block.gtceu.dacite_magnetite_ore.prospected": "Магнетит", - "block.gtceu.dacite_malachite_ore.prospected": "Малахіт", - "block.gtceu.dacite_mica_ore.prospected": "Слюда", - "block.gtceu.dacite_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.dacite_molybdenum_ore.prospected": "Молібден", - "block.gtceu.dacite_monazite_ore.prospected": "Монацит", - "block.gtceu.dacite_naquadah_ore.prospected": "Наквада", - "block.gtceu.dacite_neodymium_ore.prospected": "Неодим", - "block.gtceu.dacite_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.dacite_nickel_ore.prospected": "Нікель", - "block.gtceu.dacite_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.dacite_olivine_ore.prospected": "Олівін", - "block.gtceu.dacite_opal_ore.prospected": "Опал", - "block.gtceu.dacite_palladium_ore.prospected": "Паладій", - "block.gtceu.dacite_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.dacite_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.dacite_platinum_ore.prospected": "Платина", - "block.gtceu.dacite_plutonium_ore.prospected": "Плутоній", - "block.gtceu.dacite_pollucite_ore.prospected": "Полюцит", - "block.gtceu.dacite_powellite_ore.prospected": "Повеліт", - "block.gtceu.dacite_pyrite_ore.prospected": "Пірит", - "block.gtceu.dacite_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.dacite_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.dacite_pyrope_ore.prospected": "Піроп", - "block.gtceu.dacite_quartzite_ore.prospected": "Кварцит", - "block.gtceu.dacite_realgar_ore.prospected": "Реальгар", - "block.gtceu.dacite_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.dacite_redstone_ore.prospected": "Редстоун", - "block.gtceu.dacite_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.dacite_ruby_ore.prospected": "Рубін", - "block.gtceu.dacite_salt_ore.prospected": "Сіль", - "block.gtceu.dacite_saltpeter_ore.prospected": "Селітра", - "block.gtceu.dacite_sapphire_ore.prospected": "Сапфір", - "block.gtceu.dacite_scheelite_ore.prospected": "Шееліт", - "block.gtceu.dacite_silver_ore.prospected": "Срібло", - "block.gtceu.dacite_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.dacite_sodalite_ore.prospected": "Содаліт", - "block.gtceu.dacite_spessartine_ore.prospected": "Спесартин", - "block.gtceu.dacite_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.dacite_spodumene_ore.prospected": "Сподумен", - "block.gtceu.dacite_stibnite_ore.prospected": "Стибніт", - "block.gtceu.dacite_sulfur_ore.prospected": "Сірка", - "block.gtceu.dacite_sylvite_ore.prospected": "Сильвін", - "block.gtceu.dacite_talc_ore.prospected": "Тальк", - "block.gtceu.dacite_tantalite_ore.prospected": "Танталіт", - "block.gtceu.dacite_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.dacite_thorium_ore.prospected": "Торій", - "block.gtceu.dacite_tin_ore.prospected": "Олово", - "block.gtceu.dacite_topaz_ore.prospected": "Топаз", - "block.gtceu.dacite_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.dacite_trona_ore.prospected": "Трона", - "block.gtceu.dacite_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.dacite_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.dacite_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.dacite_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.dacite_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.dacite_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.dacite_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.diorite_almandine_ore.prospected": "Альмандин", - "block.gtceu.diorite_aluminium_ore.prospected": "Алюміній", - "block.gtceu.diorite_alunite_ore.prospected": "Алюніт", - "block.gtceu.diorite_amethyst_ore.prospected": "Аметист", - "block.gtceu.diorite_apatite_ore.prospected": "Апатит", - "block.gtceu.diorite_asbestos_ore.prospected": "Азбест", - "block.gtceu.diorite_barite_ore.prospected": "Барит", - "block.gtceu.diorite_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.diorite_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.diorite_bauxite_ore.prospected": "Боксит", - "block.gtceu.diorite_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.diorite_beryllium_ore.prospected": "Берилій", - "block.gtceu.diorite_bismuth_ore.prospected": "Вісмут", - "block.gtceu.diorite_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.diorite_borax_ore.prospected": "Боракс", - "block.gtceu.diorite_bornite_ore.prospected": "Борніт", - "block.gtceu.diorite_calcite_ore.prospected": "Кальцит", - "block.gtceu.diorite_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.diorite_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.diorite_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.diorite_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.diorite_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.diorite_chromite_ore.prospected": "Хроміт", - "block.gtceu.diorite_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.diorite_coal_ore.prospected": "Вугілля", - "block.gtceu.diorite_cobalt_ore.prospected": "Кобальт", - "block.gtceu.diorite_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.diorite_cooperite_ore.prospected": "Куперит", - "block.gtceu.diorite_copper_ore.prospected": "Мідь", - "block.gtceu.diorite_diamond_ore.prospected": "Діамант", - "block.gtceu.diorite_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.diorite_electrotine_ore.prospected": "Електротин", - "block.gtceu.diorite_emerald_ore.prospected": "Смарагд", - "block.gtceu.diorite_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.diorite_galena_ore.prospected": "Галеніт", - "block.gtceu.diorite_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.diorite_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.diorite_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.diorite_goethite_ore.prospected": "Гетит", - "block.gtceu.diorite_gold_ore.prospected": "Золото", - "block.gtceu.diorite_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.diorite_graphite_ore.prospected": "Графіт", - "block.gtceu.diorite_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.diorite_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.diorite_gypsum_ore.prospected": "Гіпс", - "block.gtceu.diorite_hematite_ore.prospected": "Гематит", - "block.gtceu.diorite_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.diorite_iron_ore.prospected": "Залізо", - "block.gtceu.diorite_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.diorite_lapis_ore.prospected": "Лазурит", - "block.gtceu.diorite_lazurite_ore.prospected": "Лазурите", - "block.gtceu.diorite_lead_ore.prospected": "Свинець", - "block.gtceu.diorite_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.diorite_lithium_ore.prospected": "Літій", - "block.gtceu.diorite_magnesite_ore.prospected": "Магнезит", - "block.gtceu.diorite_magnetite_ore.prospected": "Магнетит", - "block.gtceu.diorite_malachite_ore.prospected": "Малахіт", - "block.gtceu.diorite_mica_ore.prospected": "Слюда", - "block.gtceu.diorite_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.diorite_molybdenum_ore.prospected": "Молібден", - "block.gtceu.diorite_monazite_ore.prospected": "Монацит", - "block.gtceu.diorite_naquadah_ore.prospected": "Наквада", - "block.gtceu.diorite_neodymium_ore.prospected": "Неодим", - "block.gtceu.diorite_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.diorite_nickel_ore.prospected": "Нікель", - "block.gtceu.diorite_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.diorite_olivine_ore.prospected": "Олівін", - "block.gtceu.diorite_opal_ore.prospected": "Опал", - "block.gtceu.diorite_palladium_ore.prospected": "Паладій", - "block.gtceu.diorite_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.diorite_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.diorite_platinum_ore.prospected": "Платина", - "block.gtceu.diorite_plutonium_ore.prospected": "Плутоній", - "block.gtceu.diorite_pollucite_ore.prospected": "Полюцит", - "block.gtceu.diorite_powellite_ore.prospected": "Повеліт", - "block.gtceu.diorite_pyrite_ore.prospected": "Пірит", - "block.gtceu.diorite_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.diorite_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.diorite_pyrope_ore.prospected": "Піроп", - "block.gtceu.diorite_quartzite_ore.prospected": "Кварцит", - "block.gtceu.diorite_realgar_ore.prospected": "Реальгар", - "block.gtceu.diorite_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.diorite_redstone_ore.prospected": "Редстоун", - "block.gtceu.diorite_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.diorite_ruby_ore.prospected": "Рубін", - "block.gtceu.diorite_salt_ore.prospected": "Сіль", - "block.gtceu.diorite_saltpeter_ore.prospected": "Селітра", - "block.gtceu.diorite_sapphire_ore.prospected": "Сапфір", - "block.gtceu.diorite_scheelite_ore.prospected": "Шееліт", - "block.gtceu.diorite_silver_ore.prospected": "Срібло", - "block.gtceu.diorite_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.diorite_sodalite_ore.prospected": "Содаліт", - "block.gtceu.diorite_spessartine_ore.prospected": "Спесартин", - "block.gtceu.diorite_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.diorite_spodumene_ore.prospected": "Сподумен", - "block.gtceu.diorite_stibnite_ore.prospected": "Стибніт", - "block.gtceu.diorite_sulfur_ore.prospected": "Сірка", - "block.gtceu.diorite_sylvite_ore.prospected": "Сильвін", - "block.gtceu.diorite_talc_ore.prospected": "Тальк", - "block.gtceu.diorite_tantalite_ore.prospected": "Танталіт", - "block.gtceu.diorite_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.diorite_thorium_ore.prospected": "Торій", - "block.gtceu.diorite_tin_ore.prospected": "Олово", - "block.gtceu.diorite_topaz_ore.prospected": "Топаз", - "block.gtceu.diorite_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.diorite_trona_ore.prospected": "Трона", - "block.gtceu.diorite_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.diorite_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.diorite_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.diorite_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.diorite_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.diorite_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.diorite_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.dolomite_almandine_ore.prospected": "Альмандин", - "block.gtceu.dolomite_aluminium_ore.prospected": "Алюміній", - "block.gtceu.dolomite_alunite_ore.prospected": "Алюніт", - "block.gtceu.dolomite_amethyst_ore.prospected": "Аметист", - "block.gtceu.dolomite_apatite_ore.prospected": "Апатит", - "block.gtceu.dolomite_asbestos_ore.prospected": "Азбест", - "block.gtceu.dolomite_barite_ore.prospected": "Барит", - "block.gtceu.dolomite_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.dolomite_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.dolomite_bauxite_ore.prospected": "Боксит", - "block.gtceu.dolomite_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.dolomite_beryllium_ore.prospected": "Берилій", - "block.gtceu.dolomite_bismuth_ore.prospected": "Вісмут", - "block.gtceu.dolomite_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.dolomite_borax_ore.prospected": "Боракс", - "block.gtceu.dolomite_bornite_ore.prospected": "Борніт", - "block.gtceu.dolomite_calcite_ore.prospected": "Кальцит", - "block.gtceu.dolomite_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.dolomite_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.dolomite_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.dolomite_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.dolomite_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.dolomite_chromite_ore.prospected": "Хроміт", - "block.gtceu.dolomite_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.dolomite_coal_ore.prospected": "Вугілля", - "block.gtceu.dolomite_cobalt_ore.prospected": "Кобальт", - "block.gtceu.dolomite_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.dolomite_cooperite_ore.prospected": "Куперит", - "block.gtceu.dolomite_copper_ore.prospected": "Мідь", - "block.gtceu.dolomite_diamond_ore.prospected": "Діамант", - "block.gtceu.dolomite_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.dolomite_electrotine_ore.prospected": "Електротин", - "block.gtceu.dolomite_emerald_ore.prospected": "Смарагд", - "block.gtceu.dolomite_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.dolomite_galena_ore.prospected": "Галеніт", - "block.gtceu.dolomite_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.dolomite_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.dolomite_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.dolomite_goethite_ore.prospected": "Гетит", - "block.gtceu.dolomite_gold_ore.prospected": "Золото", - "block.gtceu.dolomite_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.dolomite_graphite_ore.prospected": "Графіт", - "block.gtceu.dolomite_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.dolomite_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.dolomite_gypsum_ore.prospected": "Гіпс", - "block.gtceu.dolomite_hematite_ore.prospected": "Гематит", - "block.gtceu.dolomite_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.dolomite_iron_ore.prospected": "Залізо", - "block.gtceu.dolomite_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.dolomite_lapis_ore.prospected": "Лазурит", - "block.gtceu.dolomite_lazurite_ore.prospected": "Лазурите", - "block.gtceu.dolomite_lead_ore.prospected": "Свинець", - "block.gtceu.dolomite_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.dolomite_lithium_ore.prospected": "Літій", - "block.gtceu.dolomite_magnesite_ore.prospected": "Магнезит", - "block.gtceu.dolomite_magnetite_ore.prospected": "Магнетит", - "block.gtceu.dolomite_malachite_ore.prospected": "Малахіт", - "block.gtceu.dolomite_mica_ore.prospected": "Слюда", - "block.gtceu.dolomite_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.dolomite_molybdenum_ore.prospected": "Молібден", - "block.gtceu.dolomite_monazite_ore.prospected": "Монацит", - "block.gtceu.dolomite_naquadah_ore.prospected": "Наквада", - "block.gtceu.dolomite_neodymium_ore.prospected": "Неодим", - "block.gtceu.dolomite_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.dolomite_nickel_ore.prospected": "Нікель", - "block.gtceu.dolomite_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.dolomite_olivine_ore.prospected": "Олівін", - "block.gtceu.dolomite_opal_ore.prospected": "Опал", - "block.gtceu.dolomite_palladium_ore.prospected": "Паладій", - "block.gtceu.dolomite_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.dolomite_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.dolomite_platinum_ore.prospected": "Платина", - "block.gtceu.dolomite_plutonium_ore.prospected": "Плутоній", - "block.gtceu.dolomite_pollucite_ore.prospected": "Полюцит", - "block.gtceu.dolomite_powellite_ore.prospected": "Повеліт", - "block.gtceu.dolomite_pyrite_ore.prospected": "Пірит", - "block.gtceu.dolomite_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.dolomite_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.dolomite_pyrope_ore.prospected": "Піроп", - "block.gtceu.dolomite_quartzite_ore.prospected": "Кварцит", - "block.gtceu.dolomite_realgar_ore.prospected": "Реальгар", - "block.gtceu.dolomite_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.dolomite_redstone_ore.prospected": "Редстоун", - "block.gtceu.dolomite_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.dolomite_ruby_ore.prospected": "Рубін", - "block.gtceu.dolomite_salt_ore.prospected": "Сіль", - "block.gtceu.dolomite_saltpeter_ore.prospected": "Селітра", - "block.gtceu.dolomite_sapphire_ore.prospected": "Сапфір", - "block.gtceu.dolomite_scheelite_ore.prospected": "Шееліт", - "block.gtceu.dolomite_silver_ore.prospected": "Срібло", - "block.gtceu.dolomite_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.dolomite_sodalite_ore.prospected": "Содаліт", - "block.gtceu.dolomite_spessartine_ore.prospected": "Спесартин", - "block.gtceu.dolomite_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.dolomite_spodumene_ore.prospected": "Сподумен", - "block.gtceu.dolomite_stibnite_ore.prospected": "Стибніт", - "block.gtceu.dolomite_sulfur_ore.prospected": "Сірка", - "block.gtceu.dolomite_sylvite_ore.prospected": "Сильвін", - "block.gtceu.dolomite_talc_ore.prospected": "Тальк", - "block.gtceu.dolomite_tantalite_ore.prospected": "Танталіт", - "block.gtceu.dolomite_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.dolomite_thorium_ore.prospected": "Торій", - "block.gtceu.dolomite_tin_ore.prospected": "Олово", - "block.gtceu.dolomite_topaz_ore.prospected": "Топаз", - "block.gtceu.dolomite_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.dolomite_trona_ore.prospected": "Трона", - "block.gtceu.dolomite_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.dolomite_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.dolomite_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.dolomite_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.dolomite_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.dolomite_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.dolomite_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.gabbro_almandine_ore.prospected": "Альмандин", - "block.gtceu.gabbro_aluminium_ore.prospected": "Алюміній", - "block.gtceu.gabbro_alunite_ore.prospected": "Алюніт", - "block.gtceu.gabbro_amethyst_ore.prospected": "Аметист", - "block.gtceu.gabbro_apatite_ore.prospected": "Апатит", - "block.gtceu.gabbro_asbestos_ore.prospected": "Азбест", - "block.gtceu.gabbro_barite_ore.prospected": "Барит", - "block.gtceu.gabbro_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.gabbro_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.gabbro_bauxite_ore.prospected": "Боксит", - "block.gtceu.gabbro_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.gabbro_beryllium_ore.prospected": "Берилій", - "block.gtceu.gabbro_bismuth_ore.prospected": "Вісмут", - "block.gtceu.gabbro_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.gabbro_borax_ore.prospected": "Боракс", - "block.gtceu.gabbro_bornite_ore.prospected": "Борніт", - "block.gtceu.gabbro_calcite_ore.prospected": "Кальцит", - "block.gtceu.gabbro_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.gabbro_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.gabbro_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.gabbro_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.gabbro_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.gabbro_chromite_ore.prospected": "Хроміт", - "block.gtceu.gabbro_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.gabbro_coal_ore.prospected": "Вугілля", - "block.gtceu.gabbro_cobalt_ore.prospected": "Кобальт", - "block.gtceu.gabbro_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.gabbro_cooperite_ore.prospected": "Куперит", - "block.gtceu.gabbro_copper_ore.prospected": "Мідь", - "block.gtceu.gabbro_diamond_ore.prospected": "Діамант", - "block.gtceu.gabbro_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.gabbro_electrotine_ore.prospected": "Електротин", - "block.gtceu.gabbro_emerald_ore.prospected": "Смарагд", - "block.gtceu.gabbro_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.gabbro_galena_ore.prospected": "Галеніт", - "block.gtceu.gabbro_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.gabbro_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.gabbro_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.gabbro_goethite_ore.prospected": "Гетит", - "block.gtceu.gabbro_gold_ore.prospected": "Золото", - "block.gtceu.gabbro_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.gabbro_graphite_ore.prospected": "Графіт", - "block.gtceu.gabbro_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.gabbro_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.gabbro_gypsum_ore.prospected": "Гіпс", - "block.gtceu.gabbro_hematite_ore.prospected": "Гематит", - "block.gtceu.gabbro_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.gabbro_iron_ore.prospected": "Залізо", - "block.gtceu.gabbro_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.gabbro_lapis_ore.prospected": "Лазурит", - "block.gtceu.gabbro_lazurite_ore.prospected": "Лазурите", - "block.gtceu.gabbro_lead_ore.prospected": "Свинець", - "block.gtceu.gabbro_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.gabbro_lithium_ore.prospected": "Літій", - "block.gtceu.gabbro_magnesite_ore.prospected": "Магнезит", - "block.gtceu.gabbro_magnetite_ore.prospected": "Магнетит", - "block.gtceu.gabbro_malachite_ore.prospected": "Малахіт", - "block.gtceu.gabbro_mica_ore.prospected": "Слюда", - "block.gtceu.gabbro_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.gabbro_molybdenum_ore.prospected": "Молібден", - "block.gtceu.gabbro_monazite_ore.prospected": "Монацит", - "block.gtceu.gabbro_naquadah_ore.prospected": "Наквада", - "block.gtceu.gabbro_neodymium_ore.prospected": "Неодим", - "block.gtceu.gabbro_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.gabbro_nickel_ore.prospected": "Нікель", - "block.gtceu.gabbro_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.gabbro_olivine_ore.prospected": "Олівін", - "block.gtceu.gabbro_opal_ore.prospected": "Опал", - "block.gtceu.gabbro_palladium_ore.prospected": "Паладій", - "block.gtceu.gabbro_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.gabbro_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.gabbro_platinum_ore.prospected": "Платина", - "block.gtceu.gabbro_plutonium_ore.prospected": "Плутоній", - "block.gtceu.gabbro_pollucite_ore.prospected": "Полюцит", - "block.gtceu.gabbro_powellite_ore.prospected": "Повеліт", - "block.gtceu.gabbro_pyrite_ore.prospected": "Пірит", - "block.gtceu.gabbro_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.gabbro_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.gabbro_pyrope_ore.prospected": "Піроп", - "block.gtceu.gabbro_quartzite_ore.prospected": "Кварцит", - "block.gtceu.gabbro_realgar_ore.prospected": "Реальгар", - "block.gtceu.gabbro_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.gabbro_redstone_ore.prospected": "Редстоун", - "block.gtceu.gabbro_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.gabbro_ruby_ore.prospected": "Рубін", - "block.gtceu.gabbro_salt_ore.prospected": "Сіль", - "block.gtceu.gabbro_saltpeter_ore.prospected": "Селітра", - "block.gtceu.gabbro_sapphire_ore.prospected": "Сапфір", - "block.gtceu.gabbro_scheelite_ore.prospected": "Шееліт", - "block.gtceu.gabbro_silver_ore.prospected": "Срібло", - "block.gtceu.gabbro_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.gabbro_sodalite_ore.prospected": "Содаліт", - "block.gtceu.gabbro_spessartine_ore.prospected": "Спесартин", - "block.gtceu.gabbro_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.gabbro_spodumene_ore.prospected": "Сподумен", - "block.gtceu.gabbro_stibnite_ore.prospected": "Стибніт", - "block.gtceu.gabbro_sulfur_ore.prospected": "Сірка", - "block.gtceu.gabbro_sylvite_ore.prospected": "Сильвін", - "block.gtceu.gabbro_talc_ore.prospected": "Тальк", - "block.gtceu.gabbro_tantalite_ore.prospected": "Танталіт", - "block.gtceu.gabbro_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.gabbro_thorium_ore.prospected": "Торій", - "block.gtceu.gabbro_tin_ore.prospected": "Олово", - "block.gtceu.gabbro_topaz_ore.prospected": "Топаз", - "block.gtceu.gabbro_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.gabbro_trona_ore.prospected": "Трона", - "block.gtceu.gabbro_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.gabbro_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.gabbro_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.gabbro_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.gabbro_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.gabbro_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.gabbro_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.gneiss_almandine_ore.prospected": "Альмандин", - "block.gtceu.gneiss_aluminium_ore.prospected": "Алюміній", - "block.gtceu.gneiss_alunite_ore.prospected": "Алюніт", - "block.gtceu.gneiss_amethyst_ore.prospected": "Аметист", - "block.gtceu.gneiss_apatite_ore.prospected": "Апатит", - "block.gtceu.gneiss_asbestos_ore.prospected": "Азбест", - "block.gtceu.gneiss_barite_ore.prospected": "Барит", - "block.gtceu.gneiss_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.gneiss_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.gneiss_bauxite_ore.prospected": "Боксит", - "block.gtceu.gneiss_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.gneiss_beryllium_ore.prospected": "Берилій", - "block.gtceu.gneiss_bismuth_ore.prospected": "Вісмут", - "block.gtceu.gneiss_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.gneiss_borax_ore.prospected": "Боракс", - "block.gtceu.gneiss_bornite_ore.prospected": "Борніт", - "block.gtceu.gneiss_calcite_ore.prospected": "Кальцит", - "block.gtceu.gneiss_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.gneiss_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.gneiss_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.gneiss_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.gneiss_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.gneiss_chromite_ore.prospected": "Хроміт", - "block.gtceu.gneiss_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.gneiss_coal_ore.prospected": "Вугілля", - "block.gtceu.gneiss_cobalt_ore.prospected": "Кобальт", - "block.gtceu.gneiss_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.gneiss_cooperite_ore.prospected": "Куперит", - "block.gtceu.gneiss_copper_ore.prospected": "Мідь", - "block.gtceu.gneiss_diamond_ore.prospected": "Діамант", - "block.gtceu.gneiss_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.gneiss_electrotine_ore.prospected": "Електротин", - "block.gtceu.gneiss_emerald_ore.prospected": "Смарагд", - "block.gtceu.gneiss_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.gneiss_galena_ore.prospected": "Галеніт", - "block.gtceu.gneiss_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.gneiss_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.gneiss_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.gneiss_goethite_ore.prospected": "Гетит", - "block.gtceu.gneiss_gold_ore.prospected": "Золото", - "block.gtceu.gneiss_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.gneiss_graphite_ore.prospected": "Графіт", - "block.gtceu.gneiss_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.gneiss_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.gneiss_gypsum_ore.prospected": "Гіпс", - "block.gtceu.gneiss_hematite_ore.prospected": "Гематит", - "block.gtceu.gneiss_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.gneiss_iron_ore.prospected": "Залізо", - "block.gtceu.gneiss_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.gneiss_lapis_ore.prospected": "Лазурит", - "block.gtceu.gneiss_lazurite_ore.prospected": "Лазурите", - "block.gtceu.gneiss_lead_ore.prospected": "Свинець", - "block.gtceu.gneiss_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.gneiss_lithium_ore.prospected": "Літій", - "block.gtceu.gneiss_magnesite_ore.prospected": "Магнезит", - "block.gtceu.gneiss_magnetite_ore.prospected": "Магнетит", - "block.gtceu.gneiss_malachite_ore.prospected": "Малахіт", - "block.gtceu.gneiss_mica_ore.prospected": "Слюда", - "block.gtceu.gneiss_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.gneiss_molybdenum_ore.prospected": "Молібден", - "block.gtceu.gneiss_monazite_ore.prospected": "Монацит", - "block.gtceu.gneiss_naquadah_ore.prospected": "Наквада", - "block.gtceu.gneiss_neodymium_ore.prospected": "Неодим", - "block.gtceu.gneiss_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.gneiss_nickel_ore.prospected": "Нікель", - "block.gtceu.gneiss_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.gneiss_olivine_ore.prospected": "Олівін", - "block.gtceu.gneiss_opal_ore.prospected": "Опал", - "block.gtceu.gneiss_palladium_ore.prospected": "Паладій", - "block.gtceu.gneiss_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.gneiss_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.gneiss_platinum_ore.prospected": "Платина", - "block.gtceu.gneiss_plutonium_ore.prospected": "Плутоній", - "block.gtceu.gneiss_pollucite_ore.prospected": "Полюцит", - "block.gtceu.gneiss_powellite_ore.prospected": "Повеліт", - "block.gtceu.gneiss_pyrite_ore.prospected": "Пірит", - "block.gtceu.gneiss_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.gneiss_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.gneiss_pyrope_ore.prospected": "Піроп", - "block.gtceu.gneiss_quartzite_ore.prospected": "Кварцит", - "block.gtceu.gneiss_realgar_ore.prospected": "Реальгар", - "block.gtceu.gneiss_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.gneiss_redstone_ore.prospected": "Редстоун", - "block.gtceu.gneiss_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.gneiss_ruby_ore.prospected": "Рубін", - "block.gtceu.gneiss_salt_ore.prospected": "Сіль", - "block.gtceu.gneiss_saltpeter_ore.prospected": "Селітра", - "block.gtceu.gneiss_sapphire_ore.prospected": "Сапфір", - "block.gtceu.gneiss_scheelite_ore.prospected": "Шееліт", - "block.gtceu.gneiss_silver_ore.prospected": "Срібло", - "block.gtceu.gneiss_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.gneiss_sodalite_ore.prospected": "Содаліт", - "block.gtceu.gneiss_spessartine_ore.prospected": "Спесартин", - "block.gtceu.gneiss_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.gneiss_spodumene_ore.prospected": "Сподумен", - "block.gtceu.gneiss_stibnite_ore.prospected": "Стибніт", - "block.gtceu.gneiss_sulfur_ore.prospected": "Сірка", - "block.gtceu.gneiss_sylvite_ore.prospected": "Сильвін", - "block.gtceu.gneiss_talc_ore.prospected": "Тальк", - "block.gtceu.gneiss_tantalite_ore.prospected": "Танталіт", - "block.gtceu.gneiss_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.gneiss_thorium_ore.prospected": "Торій", - "block.gtceu.gneiss_tin_ore.prospected": "Олово", - "block.gtceu.gneiss_topaz_ore.prospected": "Топаз", - "block.gtceu.gneiss_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.gneiss_trona_ore.prospected": "Трона", - "block.gtceu.gneiss_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.gneiss_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.gneiss_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.gneiss_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.gneiss_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.gneiss_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.gneiss_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.granite_almandine_ore.prospected": "Альмандин", - "block.gtceu.granite_aluminium_ore.prospected": "Алюміній", - "block.gtceu.granite_alunite_ore.prospected": "Алюніт", - "block.gtceu.granite_amethyst_ore.prospected": "Аметист", - "block.gtceu.granite_apatite_ore.prospected": "Апатит", - "block.gtceu.granite_asbestos_ore.prospected": "Азбест", - "block.gtceu.granite_barite_ore.prospected": "Барит", - "block.gtceu.granite_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.granite_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.granite_bauxite_ore.prospected": "Боксит", - "block.gtceu.granite_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.granite_beryllium_ore.prospected": "Берилій", - "block.gtceu.granite_bismuth_ore.prospected": "Вісмут", - "block.gtceu.granite_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.granite_borax_ore.prospected": "Боракс", - "block.gtceu.granite_bornite_ore.prospected": "Борніт", - "block.gtceu.granite_calcite_ore.prospected": "Кальцит", - "block.gtceu.granite_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.granite_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.granite_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.granite_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.granite_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.granite_chromite_ore.prospected": "Хроміт", - "block.gtceu.granite_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.granite_coal_ore.prospected": "Вугілля", - "block.gtceu.granite_cobalt_ore.prospected": "Кобальт", - "block.gtceu.granite_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.granite_cooperite_ore.prospected": "Куперит", - "block.gtceu.granite_copper_ore.prospected": "Мідь", - "block.gtceu.granite_diamond_ore.prospected": "Діамант", - "block.gtceu.granite_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.granite_electrotine_ore.prospected": "Електротин", - "block.gtceu.granite_emerald_ore.prospected": "Смарагд", - "block.gtceu.granite_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.granite_galena_ore.prospected": "Галеніт", - "block.gtceu.granite_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.granite_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.granite_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.granite_goethite_ore.prospected": "Гетит", - "block.gtceu.granite_gold_ore.prospected": "Золото", - "block.gtceu.granite_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.granite_graphite_ore.prospected": "Графіт", - "block.gtceu.granite_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.granite_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.granite_gypsum_ore.prospected": "Гіпс", - "block.gtceu.granite_hematite_ore.prospected": "Гематит", - "block.gtceu.granite_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.granite_iron_ore.prospected": "Залізо", - "block.gtceu.granite_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.granite_lapis_ore.prospected": "Лазурит", - "block.gtceu.granite_lazurite_ore.prospected": "Лазурите", - "block.gtceu.granite_lead_ore.prospected": "Свинець", - "block.gtceu.granite_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.granite_lithium_ore.prospected": "Літій", - "block.gtceu.granite_magnesite_ore.prospected": "Магнезит", - "block.gtceu.granite_magnetite_ore.prospected": "Магнетит", - "block.gtceu.granite_malachite_ore.prospected": "Малахіт", - "block.gtceu.granite_mica_ore.prospected": "Слюда", - "block.gtceu.granite_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.granite_molybdenum_ore.prospected": "Молібден", - "block.gtceu.granite_monazite_ore.prospected": "Монацит", - "block.gtceu.granite_naquadah_ore.prospected": "Наквада", - "block.gtceu.granite_neodymium_ore.prospected": "Неодим", - "block.gtceu.granite_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.granite_nickel_ore.prospected": "Нікель", - "block.gtceu.granite_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.granite_olivine_ore.prospected": "Олівін", - "block.gtceu.granite_opal_ore.prospected": "Опал", - "block.gtceu.granite_palladium_ore.prospected": "Паладій", - "block.gtceu.granite_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.granite_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.granite_platinum_ore.prospected": "Платина", - "block.gtceu.granite_plutonium_ore.prospected": "Плутоній", - "block.gtceu.granite_pollucite_ore.prospected": "Полюцит", - "block.gtceu.granite_powellite_ore.prospected": "Повеліт", - "block.gtceu.granite_pyrite_ore.prospected": "Пірит", - "block.gtceu.granite_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.granite_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.granite_pyrope_ore.prospected": "Піроп", - "block.gtceu.granite_quartzite_ore.prospected": "Кварцит", - "block.gtceu.granite_realgar_ore.prospected": "Реальгар", - "block.gtceu.granite_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.granite_redstone_ore.prospected": "Редстоун", - "block.gtceu.granite_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.granite_ruby_ore.prospected": "Рубін", - "block.gtceu.granite_salt_ore.prospected": "Сіль", - "block.gtceu.granite_saltpeter_ore.prospected": "Селітра", - "block.gtceu.granite_sapphire_ore.prospected": "Сапфір", - "block.gtceu.granite_scheelite_ore.prospected": "Шееліт", - "block.gtceu.granite_silver_ore.prospected": "Срібло", - "block.gtceu.granite_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.granite_sodalite_ore.prospected": "Содаліт", - "block.gtceu.granite_spessartine_ore.prospected": "Спесартин", - "block.gtceu.granite_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.granite_spodumene_ore.prospected": "Сподумен", - "block.gtceu.granite_stibnite_ore.prospected": "Стибніт", - "block.gtceu.granite_sulfur_ore.prospected": "Сірка", - "block.gtceu.granite_sylvite_ore.prospected": "Сильвін", - "block.gtceu.granite_talc_ore.prospected": "Тальк", - "block.gtceu.granite_tantalite_ore.prospected": "Танталіт", - "block.gtceu.granite_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.granite_thorium_ore.prospected": "Торій", - "block.gtceu.granite_tin_ore.prospected": "Олово", - "block.gtceu.granite_topaz_ore.prospected": "Топаз", - "block.gtceu.granite_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.granite_trona_ore.prospected": "Трона", - "block.gtceu.granite_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.granite_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.granite_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.granite_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.granite_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.granite_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.granite_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.limestone_almandine_ore.prospected": "Альмандин", - "block.gtceu.limestone_aluminium_ore.prospected": "Алюміній", - "block.gtceu.limestone_alunite_ore.prospected": "Алюніт", - "block.gtceu.limestone_amethyst_ore.prospected": "Аметист", - "block.gtceu.limestone_apatite_ore.prospected": "Апатит", - "block.gtceu.limestone_asbestos_ore.prospected": "Азбест", - "block.gtceu.limestone_barite_ore.prospected": "Барит", - "block.gtceu.limestone_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.limestone_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.limestone_bauxite_ore.prospected": "Боксит", - "block.gtceu.limestone_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.limestone_beryllium_ore.prospected": "Берилій", - "block.gtceu.limestone_bismuth_ore.prospected": "Вісмут", - "block.gtceu.limestone_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.limestone_borax_ore.prospected": "Боракс", - "block.gtceu.limestone_bornite_ore.prospected": "Борніт", - "block.gtceu.limestone_calcite_ore.prospected": "Кальцит", - "block.gtceu.limestone_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.limestone_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.limestone_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.limestone_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.limestone_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.limestone_chromite_ore.prospected": "Хроміт", - "block.gtceu.limestone_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.limestone_coal_ore.prospected": "Вугілля", - "block.gtceu.limestone_cobalt_ore.prospected": "Кобальт", - "block.gtceu.limestone_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.limestone_cooperite_ore.prospected": "Куперит", - "block.gtceu.limestone_copper_ore.prospected": "Мідь", - "block.gtceu.limestone_diamond_ore.prospected": "Діамант", - "block.gtceu.limestone_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.limestone_electrotine_ore.prospected": "Електротин", - "block.gtceu.limestone_emerald_ore.prospected": "Смарагд", - "block.gtceu.limestone_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.limestone_galena_ore.prospected": "Галеніт", - "block.gtceu.limestone_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.limestone_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.limestone_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.limestone_goethite_ore.prospected": "Гетит", - "block.gtceu.limestone_gold_ore.prospected": "Золото", - "block.gtceu.limestone_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.limestone_graphite_ore.prospected": "Графіт", - "block.gtceu.limestone_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.limestone_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.limestone_gypsum_ore.prospected": "Гіпс", - "block.gtceu.limestone_hematite_ore.prospected": "Гематит", - "block.gtceu.limestone_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.limestone_iron_ore.prospected": "Залізо", - "block.gtceu.limestone_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.limestone_lapis_ore.prospected": "Лазурит", - "block.gtceu.limestone_lazurite_ore.prospected": "Лазурите", - "block.gtceu.limestone_lead_ore.prospected": "Свинець", - "block.gtceu.limestone_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.limestone_lithium_ore.prospected": "Літій", - "block.gtceu.limestone_magnesite_ore.prospected": "Магнезит", - "block.gtceu.limestone_magnetite_ore.prospected": "Магнетит", - "block.gtceu.limestone_malachite_ore.prospected": "Малахіт", - "block.gtceu.limestone_mica_ore.prospected": "Слюда", - "block.gtceu.limestone_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.limestone_molybdenum_ore.prospected": "Молібден", - "block.gtceu.limestone_monazite_ore.prospected": "Монацит", - "block.gtceu.limestone_naquadah_ore.prospected": "Наквада", - "block.gtceu.limestone_neodymium_ore.prospected": "Неодим", - "block.gtceu.limestone_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.limestone_nickel_ore.prospected": "Нікель", - "block.gtceu.limestone_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.limestone_olivine_ore.prospected": "Олівін", - "block.gtceu.limestone_opal_ore.prospected": "Опал", - "block.gtceu.limestone_palladium_ore.prospected": "Паладій", - "block.gtceu.limestone_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.limestone_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.limestone_platinum_ore.prospected": "Платина", - "block.gtceu.limestone_plutonium_ore.prospected": "Плутоній", - "block.gtceu.limestone_pollucite_ore.prospected": "Полюцит", - "block.gtceu.limestone_powellite_ore.prospected": "Повеліт", - "block.gtceu.limestone_pyrite_ore.prospected": "Пірит", - "block.gtceu.limestone_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.limestone_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.limestone_pyrope_ore.prospected": "Піроп", - "block.gtceu.limestone_quartzite_ore.prospected": "Кварцит", - "block.gtceu.limestone_realgar_ore.prospected": "Реальгар", - "block.gtceu.limestone_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.limestone_redstone_ore.prospected": "Редстоун", - "block.gtceu.limestone_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.limestone_ruby_ore.prospected": "Рубін", - "block.gtceu.limestone_salt_ore.prospected": "Сіль", - "block.gtceu.limestone_saltpeter_ore.prospected": "Селітра", - "block.gtceu.limestone_sapphire_ore.prospected": "Сапфір", - "block.gtceu.limestone_scheelite_ore.prospected": "Шееліт", - "block.gtceu.limestone_silver_ore.prospected": "Срібло", - "block.gtceu.limestone_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.limestone_sodalite_ore.prospected": "Содаліт", - "block.gtceu.limestone_spessartine_ore.prospected": "Спесартин", - "block.gtceu.limestone_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.limestone_spodumene_ore.prospected": "Сподумен", - "block.gtceu.limestone_stibnite_ore.prospected": "Стибніт", - "block.gtceu.limestone_sulfur_ore.prospected": "Сірка", - "block.gtceu.limestone_sylvite_ore.prospected": "Сильвін", - "block.gtceu.limestone_talc_ore.prospected": "Тальк", - "block.gtceu.limestone_tantalite_ore.prospected": "Танталіт", - "block.gtceu.limestone_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.limestone_thorium_ore.prospected": "Торій", - "block.gtceu.limestone_tin_ore.prospected": "Олово", - "block.gtceu.limestone_topaz_ore.prospected": "Топаз", - "block.gtceu.limestone_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.limestone_trona_ore.prospected": "Трона", - "block.gtceu.limestone_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.limestone_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.limestone_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.limestone_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.limestone_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.limestone_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.limestone_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.marble_almandine_ore.prospected": "Альмандин", - "block.gtceu.marble_aluminium_ore.prospected": "Алюміній", - "block.gtceu.marble_alunite_ore.prospected": "Алюніт", - "block.gtceu.marble_amethyst_ore.prospected": "Аметист", - "block.gtceu.marble_apatite_ore.prospected": "Апатит", - "block.gtceu.marble_asbestos_ore.prospected": "Азбест", - "block.gtceu.marble_barite_ore.prospected": "Барит", - "block.gtceu.marble_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.marble_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.marble_bauxite_ore.prospected": "Боксит", - "block.gtceu.marble_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.marble_beryllium_ore.prospected": "Берилій", - "block.gtceu.marble_bismuth_ore.prospected": "Вісмут", - "block.gtceu.marble_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.marble_borax_ore.prospected": "Боракс", - "block.gtceu.marble_bornite_ore.prospected": "Борніт", - "block.gtceu.marble_calcite_ore.prospected": "Кальцит", - "block.gtceu.marble_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.marble_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.marble_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.marble_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.marble_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.marble_chromite_ore.prospected": "Хроміт", - "block.gtceu.marble_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.marble_coal_ore.prospected": "Вугілля", - "block.gtceu.marble_cobalt_ore.prospected": "Кобальт", - "block.gtceu.marble_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.marble_cooperite_ore.prospected": "Куперит", - "block.gtceu.marble_copper_ore.prospected": "Мідь", - "block.gtceu.marble_diamond_ore.prospected": "Діамант", - "block.gtceu.marble_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.marble_electrotine_ore.prospected": "Електротин", - "block.gtceu.marble_emerald_ore.prospected": "Смарагд", - "block.gtceu.marble_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.marble_galena_ore.prospected": "Галеніт", - "block.gtceu.marble_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.marble_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.marble_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.marble_goethite_ore.prospected": "Гетит", - "block.gtceu.marble_gold_ore.prospected": "Золото", - "block.gtceu.marble_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.marble_graphite_ore.prospected": "Графіт", - "block.gtceu.marble_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.marble_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.marble_gypsum_ore.prospected": "Гіпс", - "block.gtceu.marble_hematite_ore.prospected": "Гематит", - "block.gtceu.marble_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.marble_iron_ore.prospected": "Залізо", - "block.gtceu.marble_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.marble_lapis_ore.prospected": "Лазурит", - "block.gtceu.marble_lazurite_ore.prospected": "Лазурите", - "block.gtceu.marble_lead_ore.prospected": "Свинець", - "block.gtceu.marble_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.marble_lithium_ore.prospected": "Літій", - "block.gtceu.marble_magnesite_ore.prospected": "Магнезит", - "block.gtceu.marble_magnetite_ore.prospected": "Магнетит", - "block.gtceu.marble_malachite_ore.prospected": "Малахіт", - "block.gtceu.marble_mica_ore.prospected": "Слюда", - "block.gtceu.marble_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.marble_molybdenum_ore.prospected": "Молібден", - "block.gtceu.marble_monazite_ore.prospected": "Монацит", - "block.gtceu.marble_naquadah_ore.prospected": "Наквада", - "block.gtceu.marble_neodymium_ore.prospected": "Неодим", - "block.gtceu.marble_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.marble_nickel_ore.prospected": "Нікель", - "block.gtceu.marble_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.marble_olivine_ore.prospected": "Олівін", - "block.gtceu.marble_opal_ore.prospected": "Опал", - "block.gtceu.marble_palladium_ore.prospected": "Паладій", - "block.gtceu.marble_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.marble_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.marble_platinum_ore.prospected": "Платина", - "block.gtceu.marble_plutonium_ore.prospected": "Плутоній", - "block.gtceu.marble_pollucite_ore.prospected": "Полюцит", - "block.gtceu.marble_powellite_ore.prospected": "Повеліт", - "block.gtceu.marble_pyrite_ore.prospected": "Пірит", - "block.gtceu.marble_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.marble_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.marble_pyrope_ore.prospected": "Піроп", - "block.gtceu.marble_quartzite_ore.prospected": "Кварцит", - "block.gtceu.marble_realgar_ore.prospected": "Реальгар", - "block.gtceu.marble_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.marble_redstone_ore.prospected": "Редстоун", - "block.gtceu.marble_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.marble_ruby_ore.prospected": "Рубін", - "block.gtceu.marble_salt_ore.prospected": "Сіль", - "block.gtceu.marble_saltpeter_ore.prospected": "Селітра", - "block.gtceu.marble_sapphire_ore.prospected": "Сапфір", - "block.gtceu.marble_scheelite_ore.prospected": "Шееліт", - "block.gtceu.marble_silver_ore.prospected": "Срібло", - "block.gtceu.marble_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.marble_sodalite_ore.prospected": "Содаліт", - "block.gtceu.marble_spessartine_ore.prospected": "Спесартин", - "block.gtceu.marble_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.marble_spodumene_ore.prospected": "Сподумен", - "block.gtceu.marble_stibnite_ore.prospected": "Стибніт", - "block.gtceu.marble_sulfur_ore.prospected": "Сірка", - "block.gtceu.marble_sylvite_ore.prospected": "Сильвін", - "block.gtceu.marble_talc_ore.prospected": "Тальк", - "block.gtceu.marble_tantalite_ore.prospected": "Танталіт", - "block.gtceu.marble_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.marble_thorium_ore.prospected": "Торій", - "block.gtceu.marble_tin_ore.prospected": "Олово", - "block.gtceu.marble_topaz_ore.prospected": "Топаз", - "block.gtceu.marble_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.marble_trona_ore.prospected": "Трона", - "block.gtceu.marble_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.marble_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.marble_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.marble_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.marble_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.marble_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.marble_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.phyllite_almandine_ore.prospected": "Альмандин", - "block.gtceu.phyllite_aluminium_ore.prospected": "Алюміній", - "block.gtceu.phyllite_alunite_ore.prospected": "Алюніт", - "block.gtceu.phyllite_amethyst_ore.prospected": "Аметист", - "block.gtceu.phyllite_apatite_ore.prospected": "Апатит", - "block.gtceu.phyllite_asbestos_ore.prospected": "Азбест", - "block.gtceu.phyllite_barite_ore.prospected": "Барит", - "block.gtceu.phyllite_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.phyllite_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.phyllite_bauxite_ore.prospected": "Боксит", - "block.gtceu.phyllite_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.phyllite_beryllium_ore.prospected": "Берилій", - "block.gtceu.phyllite_bismuth_ore.prospected": "Вісмут", - "block.gtceu.phyllite_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.phyllite_borax_ore.prospected": "Боракс", - "block.gtceu.phyllite_bornite_ore.prospected": "Борніт", - "block.gtceu.phyllite_calcite_ore.prospected": "Кальцит", - "block.gtceu.phyllite_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.phyllite_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.phyllite_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.phyllite_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.phyllite_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.phyllite_chromite_ore.prospected": "Хроміт", - "block.gtceu.phyllite_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.phyllite_coal_ore.prospected": "Вугілля", - "block.gtceu.phyllite_cobalt_ore.prospected": "Кобальт", - "block.gtceu.phyllite_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.phyllite_cooperite_ore.prospected": "Куперит", - "block.gtceu.phyllite_copper_ore.prospected": "Мідь", - "block.gtceu.phyllite_diamond_ore.prospected": "Діамант", - "block.gtceu.phyllite_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.phyllite_electrotine_ore.prospected": "Електротин", - "block.gtceu.phyllite_emerald_ore.prospected": "Смарагд", - "block.gtceu.phyllite_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.phyllite_galena_ore.prospected": "Галеніт", - "block.gtceu.phyllite_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.phyllite_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.phyllite_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.phyllite_goethite_ore.prospected": "Гетит", - "block.gtceu.phyllite_gold_ore.prospected": "Золото", - "block.gtceu.phyllite_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.phyllite_graphite_ore.prospected": "Графіт", - "block.gtceu.phyllite_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.phyllite_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.phyllite_gypsum_ore.prospected": "Гіпс", - "block.gtceu.phyllite_hematite_ore.prospected": "Гематит", - "block.gtceu.phyllite_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.phyllite_iron_ore.prospected": "Залізо", - "block.gtceu.phyllite_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.phyllite_lapis_ore.prospected": "Лазурит", - "block.gtceu.phyllite_lazurite_ore.prospected": "Лазурите", - "block.gtceu.phyllite_lead_ore.prospected": "Свинець", - "block.gtceu.phyllite_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.phyllite_lithium_ore.prospected": "Літій", - "block.gtceu.phyllite_magnesite_ore.prospected": "Магнезит", - "block.gtceu.phyllite_magnetite_ore.prospected": "Магнетит", - "block.gtceu.phyllite_malachite_ore.prospected": "Малахіт", - "block.gtceu.phyllite_mica_ore.prospected": "Слюда", - "block.gtceu.phyllite_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.phyllite_molybdenum_ore.prospected": "Молібден", - "block.gtceu.phyllite_monazite_ore.prospected": "Монацит", - "block.gtceu.phyllite_naquadah_ore.prospected": "Наквада", - "block.gtceu.phyllite_neodymium_ore.prospected": "Неодим", - "block.gtceu.phyllite_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.phyllite_nickel_ore.prospected": "Нікель", - "block.gtceu.phyllite_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.phyllite_olivine_ore.prospected": "Олівін", - "block.gtceu.phyllite_opal_ore.prospected": "Опал", - "block.gtceu.phyllite_palladium_ore.prospected": "Паладій", - "block.gtceu.phyllite_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.phyllite_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.phyllite_platinum_ore.prospected": "Платина", - "block.gtceu.phyllite_plutonium_ore.prospected": "Плутоній", - "block.gtceu.phyllite_pollucite_ore.prospected": "Полюцит", - "block.gtceu.phyllite_powellite_ore.prospected": "Повеліт", - "block.gtceu.phyllite_pyrite_ore.prospected": "Пірит", - "block.gtceu.phyllite_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.phyllite_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.phyllite_pyrope_ore.prospected": "Піроп", - "block.gtceu.phyllite_quartzite_ore.prospected": "Кварцит", - "block.gtceu.phyllite_realgar_ore.prospected": "Реальгар", - "block.gtceu.phyllite_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.phyllite_redstone_ore.prospected": "Редстоун", - "block.gtceu.phyllite_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.phyllite_ruby_ore.prospected": "Рубін", - "block.gtceu.phyllite_salt_ore.prospected": "Сіль", - "block.gtceu.phyllite_saltpeter_ore.prospected": "Селітра", - "block.gtceu.phyllite_sapphire_ore.prospected": "Сапфір", - "block.gtceu.phyllite_scheelite_ore.prospected": "Шееліт", - "block.gtceu.phyllite_silver_ore.prospected": "Срібло", - "block.gtceu.phyllite_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.phyllite_sodalite_ore.prospected": "Содаліт", - "block.gtceu.phyllite_spessartine_ore.prospected": "Спесартин", - "block.gtceu.phyllite_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.phyllite_spodumene_ore.prospected": "Сподумен", - "block.gtceu.phyllite_stibnite_ore.prospected": "Стибніт", - "block.gtceu.phyllite_sulfur_ore.prospected": "Сірка", - "block.gtceu.phyllite_sylvite_ore.prospected": "Сильвін", - "block.gtceu.phyllite_talc_ore.prospected": "Тальк", - "block.gtceu.phyllite_tantalite_ore.prospected": "Танталіт", - "block.gtceu.phyllite_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.phyllite_thorium_ore.prospected": "Торій", - "block.gtceu.phyllite_tin_ore.prospected": "Олово", - "block.gtceu.phyllite_topaz_ore.prospected": "Топаз", - "block.gtceu.phyllite_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.phyllite_trona_ore.prospected": "Трона", - "block.gtceu.phyllite_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.phyllite_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.phyllite_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.phyllite_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.phyllite_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.phyllite_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.phyllite_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.quartzite_almandine_ore.prospected": "Альмандин", - "block.gtceu.quartzite_aluminium_ore.prospected": "Алюміній", - "block.gtceu.quartzite_alunite_ore.prospected": "Алюніт", - "block.gtceu.quartzite_amethyst_ore.prospected": "Аметист", - "block.gtceu.quartzite_apatite_ore.prospected": "Апатит", - "block.gtceu.quartzite_asbestos_ore.prospected": "Азбест", - "block.gtceu.quartzite_barite_ore.prospected": "Барит", - "block.gtceu.quartzite_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.quartzite_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.quartzite_bauxite_ore.prospected": "Боксит", - "block.gtceu.quartzite_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.quartzite_beryllium_ore.prospected": "Берилій", - "block.gtceu.quartzite_bismuth_ore.prospected": "Вісмут", - "block.gtceu.quartzite_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.quartzite_borax_ore.prospected": "Боракс", - "block.gtceu.quartzite_bornite_ore.prospected": "Борніт", - "block.gtceu.quartzite_calcite_ore.prospected": "Кальцит", - "block.gtceu.quartzite_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.quartzite_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.quartzite_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.quartzite_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.quartzite_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.quartzite_chromite_ore.prospected": "Хроміт", - "block.gtceu.quartzite_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.quartzite_coal_ore.prospected": "Вугілля", - "block.gtceu.quartzite_cobalt_ore.prospected": "Кобальт", - "block.gtceu.quartzite_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.quartzite_cooperite_ore.prospected": "Куперит", - "block.gtceu.quartzite_copper_ore.prospected": "Мідь", - "block.gtceu.quartzite_diamond_ore.prospected": "Діамант", - "block.gtceu.quartzite_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.quartzite_electrotine_ore.prospected": "Електротин", - "block.gtceu.quartzite_emerald_ore.prospected": "Смарагд", - "block.gtceu.quartzite_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.quartzite_galena_ore.prospected": "Галеніт", - "block.gtceu.quartzite_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.quartzite_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.quartzite_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.quartzite_goethite_ore.prospected": "Гетит", - "block.gtceu.quartzite_gold_ore.prospected": "Золото", - "block.gtceu.quartzite_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.quartzite_graphite_ore.prospected": "Графіт", - "block.gtceu.quartzite_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.quartzite_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.quartzite_gypsum_ore.prospected": "Гіпс", - "block.gtceu.quartzite_hematite_ore.prospected": "Гематит", - "block.gtceu.quartzite_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.quartzite_iron_ore.prospected": "Залізо", - "block.gtceu.quartzite_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.quartzite_lapis_ore.prospected": "Лазурит", - "block.gtceu.quartzite_lazurite_ore.prospected": "Лазурите", - "block.gtceu.quartzite_lead_ore.prospected": "Свинець", - "block.gtceu.quartzite_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.quartzite_lithium_ore.prospected": "Літій", - "block.gtceu.quartzite_magnesite_ore.prospected": "Магнезит", - "block.gtceu.quartzite_magnetite_ore.prospected": "Магнетит", - "block.gtceu.quartzite_malachite_ore.prospected": "Малахіт", - "block.gtceu.quartzite_mica_ore.prospected": "Слюда", - "block.gtceu.quartzite_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.quartzite_molybdenum_ore.prospected": "Молібден", - "block.gtceu.quartzite_monazite_ore.prospected": "Монацит", - "block.gtceu.quartzite_naquadah_ore.prospected": "Наквада", - "block.gtceu.quartzite_neodymium_ore.prospected": "Неодим", - "block.gtceu.quartzite_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.quartzite_nickel_ore.prospected": "Нікель", - "block.gtceu.quartzite_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.quartzite_olivine_ore.prospected": "Олівін", - "block.gtceu.quartzite_opal_ore.prospected": "Опал", - "block.gtceu.quartzite_palladium_ore.prospected": "Паладій", - "block.gtceu.quartzite_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.quartzite_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.quartzite_platinum_ore.prospected": "Платина", - "block.gtceu.quartzite_plutonium_ore.prospected": "Плутоній", - "block.gtceu.quartzite_pollucite_ore.prospected": "Полюцит", - "block.gtceu.quartzite_powellite_ore.prospected": "Повеліт", - "block.gtceu.quartzite_pyrite_ore.prospected": "Пірит", - "block.gtceu.quartzite_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.quartzite_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.quartzite_pyrope_ore.prospected": "Піроп", - "block.gtceu.quartzite_quartzite_ore.prospected": "Кварцит", - "block.gtceu.quartzite_realgar_ore.prospected": "Реальгар", - "block.gtceu.quartzite_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.quartzite_redstone_ore.prospected": "Редстоун", - "block.gtceu.quartzite_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.quartzite_ruby_ore.prospected": "Рубін", - "block.gtceu.quartzite_salt_ore.prospected": "Сіль", - "block.gtceu.quartzite_saltpeter_ore.prospected": "Селітра", - "block.gtceu.quartzite_sapphire_ore.prospected": "Сапфір", - "block.gtceu.quartzite_scheelite_ore.prospected": "Шееліт", - "block.gtceu.quartzite_silver_ore.prospected": "Срібло", - "block.gtceu.quartzite_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.quartzite_sodalite_ore.prospected": "Содаліт", - "block.gtceu.quartzite_spessartine_ore.prospected": "Спесартин", - "block.gtceu.quartzite_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.quartzite_spodumene_ore.prospected": "Сподумен", - "block.gtceu.quartzite_stibnite_ore.prospected": "Стибніт", - "block.gtceu.quartzite_sulfur_ore.prospected": "Сірка", - "block.gtceu.quartzite_sylvite_ore.prospected": "Сильвін", - "block.gtceu.quartzite_talc_ore.prospected": "Тальк", - "block.gtceu.quartzite_tantalite_ore.prospected": "Танталіт", - "block.gtceu.quartzite_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.quartzite_thorium_ore.prospected": "Торій", - "block.gtceu.quartzite_tin_ore.prospected": "Олово", - "block.gtceu.quartzite_topaz_ore.prospected": "Топаз", - "block.gtceu.quartzite_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.quartzite_trona_ore.prospected": "Трона", - "block.gtceu.quartzite_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.quartzite_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.quartzite_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.quartzite_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.quartzite_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.quartzite_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.quartzite_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.rhyolite_almandine_ore.prospected": "Альмандин", - "block.gtceu.rhyolite_aluminium_ore.prospected": "Алюміній", - "block.gtceu.rhyolite_alunite_ore.prospected": "Алюніт", - "block.gtceu.rhyolite_amethyst_ore.prospected": "Аметист", - "block.gtceu.rhyolite_apatite_ore.prospected": "Апатит", - "block.gtceu.rhyolite_asbestos_ore.prospected": "Азбест", - "block.gtceu.rhyolite_barite_ore.prospected": "Барит", - "block.gtceu.rhyolite_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.rhyolite_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.rhyolite_bauxite_ore.prospected": "Боксит", - "block.gtceu.rhyolite_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.rhyolite_beryllium_ore.prospected": "Берилій", - "block.gtceu.rhyolite_bismuth_ore.prospected": "Вісмут", - "block.gtceu.rhyolite_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.rhyolite_borax_ore.prospected": "Боракс", - "block.gtceu.rhyolite_bornite_ore.prospected": "Борніт", - "block.gtceu.rhyolite_calcite_ore.prospected": "Кальцит", - "block.gtceu.rhyolite_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.rhyolite_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.rhyolite_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.rhyolite_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.rhyolite_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.rhyolite_chromite_ore.prospected": "Хроміт", - "block.gtceu.rhyolite_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.rhyolite_coal_ore.prospected": "Вугілля", - "block.gtceu.rhyolite_cobalt_ore.prospected": "Кобальт", - "block.gtceu.rhyolite_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.rhyolite_cooperite_ore.prospected": "Куперит", - "block.gtceu.rhyolite_copper_ore.prospected": "Мідь", - "block.gtceu.rhyolite_diamond_ore.prospected": "Діамант", - "block.gtceu.rhyolite_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.rhyolite_electrotine_ore.prospected": "Електротин", - "block.gtceu.rhyolite_emerald_ore.prospected": "Смарагд", - "block.gtceu.rhyolite_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.rhyolite_galena_ore.prospected": "Галеніт", - "block.gtceu.rhyolite_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.rhyolite_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.rhyolite_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.rhyolite_goethite_ore.prospected": "Гетит", - "block.gtceu.rhyolite_gold_ore.prospected": "Золото", - "block.gtceu.rhyolite_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.rhyolite_graphite_ore.prospected": "Графіт", - "block.gtceu.rhyolite_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.rhyolite_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.rhyolite_gypsum_ore.prospected": "Гіпс", - "block.gtceu.rhyolite_hematite_ore.prospected": "Гематит", - "block.gtceu.rhyolite_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.rhyolite_iron_ore.prospected": "Залізо", - "block.gtceu.rhyolite_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.rhyolite_lapis_ore.prospected": "Лазурит", - "block.gtceu.rhyolite_lazurite_ore.prospected": "Лазурите", - "block.gtceu.rhyolite_lead_ore.prospected": "Свинець", - "block.gtceu.rhyolite_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.rhyolite_lithium_ore.prospected": "Літій", - "block.gtceu.rhyolite_magnesite_ore.prospected": "Магнезит", - "block.gtceu.rhyolite_magnetite_ore.prospected": "Магнетит", - "block.gtceu.rhyolite_malachite_ore.prospected": "Малахіт", - "block.gtceu.rhyolite_mica_ore.prospected": "Слюда", - "block.gtceu.rhyolite_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.rhyolite_molybdenum_ore.prospected": "Молібден", - "block.gtceu.rhyolite_monazite_ore.prospected": "Монацит", - "block.gtceu.rhyolite_naquadah_ore.prospected": "Наквада", - "block.gtceu.rhyolite_neodymium_ore.prospected": "Неодим", - "block.gtceu.rhyolite_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.rhyolite_nickel_ore.prospected": "Нікель", - "block.gtceu.rhyolite_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.rhyolite_olivine_ore.prospected": "Олівін", - "block.gtceu.rhyolite_opal_ore.prospected": "Опал", - "block.gtceu.rhyolite_palladium_ore.prospected": "Паладій", - "block.gtceu.rhyolite_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.rhyolite_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.rhyolite_platinum_ore.prospected": "Платина", - "block.gtceu.rhyolite_plutonium_ore.prospected": "Плутоній", - "block.gtceu.rhyolite_pollucite_ore.prospected": "Полюцит", - "block.gtceu.rhyolite_powellite_ore.prospected": "Повеліт", - "block.gtceu.rhyolite_pyrite_ore.prospected": "Пірит", - "block.gtceu.rhyolite_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.rhyolite_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.rhyolite_pyrope_ore.prospected": "Піроп", - "block.gtceu.rhyolite_quartzite_ore.prospected": "Кварцит", - "block.gtceu.rhyolite_realgar_ore.prospected": "Реальгар", - "block.gtceu.rhyolite_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.rhyolite_redstone_ore.prospected": "Редстоун", - "block.gtceu.rhyolite_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.rhyolite_ruby_ore.prospected": "Рубін", - "block.gtceu.rhyolite_salt_ore.prospected": "Сіль", - "block.gtceu.rhyolite_saltpeter_ore.prospected": "Селітра", - "block.gtceu.rhyolite_sapphire_ore.prospected": "Сапфір", - "block.gtceu.rhyolite_scheelite_ore.prospected": "Шееліт", - "block.gtceu.rhyolite_silver_ore.prospected": "Срібло", - "block.gtceu.rhyolite_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.rhyolite_sodalite_ore.prospected": "Содаліт", - "block.gtceu.rhyolite_spessartine_ore.prospected": "Спесартин", - "block.gtceu.rhyolite_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.rhyolite_spodumene_ore.prospected": "Сподумен", - "block.gtceu.rhyolite_stibnite_ore.prospected": "Стибніт", - "block.gtceu.rhyolite_sulfur_ore.prospected": "Сірка", - "block.gtceu.rhyolite_sylvite_ore.prospected": "Сильвін", - "block.gtceu.rhyolite_talc_ore.prospected": "Тальк", - "block.gtceu.rhyolite_tantalite_ore.prospected": "Танталіт", - "block.gtceu.rhyolite_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.rhyolite_thorium_ore.prospected": "Торій", - "block.gtceu.rhyolite_tin_ore.prospected": "Олово", - "block.gtceu.rhyolite_topaz_ore.prospected": "Топаз", - "block.gtceu.rhyolite_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.rhyolite_trona_ore.prospected": "Трона", - "block.gtceu.rhyolite_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.rhyolite_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.rhyolite_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.rhyolite_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.rhyolite_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.rhyolite_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.rhyolite_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.schist_almandine_ore.prospected": "Альмандин", - "block.gtceu.schist_aluminium_ore.prospected": "Алюміній", - "block.gtceu.schist_alunite_ore.prospected": "Алюніт", - "block.gtceu.schist_amethyst_ore.prospected": "Аметист", - "block.gtceu.schist_apatite_ore.prospected": "Апатит", - "block.gtceu.schist_asbestos_ore.prospected": "Азбест", - "block.gtceu.schist_barite_ore.prospected": "Барит", - "block.gtceu.schist_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.schist_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.schist_bauxite_ore.prospected": "Боксит", - "block.gtceu.schist_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.schist_beryllium_ore.prospected": "Берилій", - "block.gtceu.schist_bismuth_ore.prospected": "Вісмут", - "block.gtceu.schist_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.schist_borax_ore.prospected": "Боракс", - "block.gtceu.schist_bornite_ore.prospected": "Борніт", - "block.gtceu.schist_calcite_ore.prospected": "Кальцит", - "block.gtceu.schist_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.schist_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.schist_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.schist_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.schist_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.schist_chromite_ore.prospected": "Хроміт", - "block.gtceu.schist_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.schist_coal_ore.prospected": "Вугілля", - "block.gtceu.schist_cobalt_ore.prospected": "Кобальт", - "block.gtceu.schist_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.schist_cooperite_ore.prospected": "Куперит", - "block.gtceu.schist_copper_ore.prospected": "Мідь", - "block.gtceu.schist_diamond_ore.prospected": "Діамант", - "block.gtceu.schist_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.schist_electrotine_ore.prospected": "Електротин", - "block.gtceu.schist_emerald_ore.prospected": "Смарагд", - "block.gtceu.schist_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.schist_galena_ore.prospected": "Галеніт", - "block.gtceu.schist_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.schist_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.schist_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.schist_goethite_ore.prospected": "Гетит", - "block.gtceu.schist_gold_ore.prospected": "Золото", - "block.gtceu.schist_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.schist_graphite_ore.prospected": "Графіт", - "block.gtceu.schist_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.schist_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.schist_gypsum_ore.prospected": "Гіпс", - "block.gtceu.schist_hematite_ore.prospected": "Гематит", - "block.gtceu.schist_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.schist_iron_ore.prospected": "Залізо", - "block.gtceu.schist_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.schist_lapis_ore.prospected": "Лазурит", - "block.gtceu.schist_lazurite_ore.prospected": "Лазурите", - "block.gtceu.schist_lead_ore.prospected": "Свинець", - "block.gtceu.schist_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.schist_lithium_ore.prospected": "Літій", - "block.gtceu.schist_magnesite_ore.prospected": "Магнезит", - "block.gtceu.schist_magnetite_ore.prospected": "Магнетит", - "block.gtceu.schist_malachite_ore.prospected": "Малахіт", - "block.gtceu.schist_mica_ore.prospected": "Слюда", - "block.gtceu.schist_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.schist_molybdenum_ore.prospected": "Молібден", - "block.gtceu.schist_monazite_ore.prospected": "Монацит", - "block.gtceu.schist_naquadah_ore.prospected": "Наквада", - "block.gtceu.schist_neodymium_ore.prospected": "Неодим", - "block.gtceu.schist_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.schist_nickel_ore.prospected": "Нікель", - "block.gtceu.schist_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.schist_olivine_ore.prospected": "Олівін", - "block.gtceu.schist_opal_ore.prospected": "Опал", - "block.gtceu.schist_palladium_ore.prospected": "Паладій", - "block.gtceu.schist_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.schist_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.schist_platinum_ore.prospected": "Платина", - "block.gtceu.schist_plutonium_ore.prospected": "Плутоній", - "block.gtceu.schist_pollucite_ore.prospected": "Полюцит", - "block.gtceu.schist_powellite_ore.prospected": "Повеліт", - "block.gtceu.schist_pyrite_ore.prospected": "Пірит", - "block.gtceu.schist_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.schist_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.schist_pyrope_ore.prospected": "Піроп", - "block.gtceu.schist_quartzite_ore.prospected": "Кварцит", - "block.gtceu.schist_realgar_ore.prospected": "Реальгар", - "block.gtceu.schist_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.schist_redstone_ore.prospected": "Редстоун", - "block.gtceu.schist_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.schist_ruby_ore.prospected": "Рубін", - "block.gtceu.schist_salt_ore.prospected": "Сіль", - "block.gtceu.schist_saltpeter_ore.prospected": "Селітра", - "block.gtceu.schist_sapphire_ore.prospected": "Сапфір", - "block.gtceu.schist_scheelite_ore.prospected": "Шееліт", - "block.gtceu.schist_silver_ore.prospected": "Срібло", - "block.gtceu.schist_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.schist_sodalite_ore.prospected": "Содаліт", - "block.gtceu.schist_spessartine_ore.prospected": "Спесартин", - "block.gtceu.schist_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.schist_spodumene_ore.prospected": "Сподумен", - "block.gtceu.schist_stibnite_ore.prospected": "Стибніт", - "block.gtceu.schist_sulfur_ore.prospected": "Сірка", - "block.gtceu.schist_sylvite_ore.prospected": "Сильвін", - "block.gtceu.schist_talc_ore.prospected": "Тальк", - "block.gtceu.schist_tantalite_ore.prospected": "Танталіт", - "block.gtceu.schist_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.schist_thorium_ore.prospected": "Торій", - "block.gtceu.schist_tin_ore.prospected": "Олово", - "block.gtceu.schist_topaz_ore.prospected": "Топаз", - "block.gtceu.schist_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.schist_trona_ore.prospected": "Трона", - "block.gtceu.schist_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.schist_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.schist_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.schist_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.schist_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.schist_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.schist_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.shale_almandine_ore.prospected": "Альмандин", - "block.gtceu.shale_aluminium_ore.prospected": "Алюміній", - "block.gtceu.shale_alunite_ore.prospected": "Алюніт", - "block.gtceu.shale_amethyst_ore.prospected": "Аметист", - "block.gtceu.shale_apatite_ore.prospected": "Апатит", - "block.gtceu.shale_asbestos_ore.prospected": "Азбест", - "block.gtceu.shale_barite_ore.prospected": "Барит", - "block.gtceu.shale_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.shale_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.shale_bauxite_ore.prospected": "Боксит", - "block.gtceu.shale_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.shale_beryllium_ore.prospected": "Берилій", - "block.gtceu.shale_bismuth_ore.prospected": "Вісмут", - "block.gtceu.shale_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.shale_borax_ore.prospected": "Боракс", - "block.gtceu.shale_bornite_ore.prospected": "Борніт", - "block.gtceu.shale_calcite_ore.prospected": "Кальцит", - "block.gtceu.shale_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.shale_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.shale_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.shale_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.shale_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.shale_chromite_ore.prospected": "Хроміт", - "block.gtceu.shale_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.shale_coal_ore.prospected": "Вугілля", - "block.gtceu.shale_cobalt_ore.prospected": "Кобальт", - "block.gtceu.shale_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.shale_cooperite_ore.prospected": "Куперит", - "block.gtceu.shale_copper_ore.prospected": "Мідь", - "block.gtceu.shale_diamond_ore.prospected": "Діамант", - "block.gtceu.shale_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.shale_electrotine_ore.prospected": "Електротин", - "block.gtceu.shale_emerald_ore.prospected": "Смарагд", - "block.gtceu.shale_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.shale_galena_ore.prospected": "Галеніт", - "block.gtceu.shale_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.shale_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.shale_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.shale_goethite_ore.prospected": "Гетит", - "block.gtceu.shale_gold_ore.prospected": "Золото", - "block.gtceu.shale_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.shale_graphite_ore.prospected": "Графіт", - "block.gtceu.shale_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.shale_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.shale_gypsum_ore.prospected": "Гіпс", - "block.gtceu.shale_hematite_ore.prospected": "Гематит", - "block.gtceu.shale_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.shale_iron_ore.prospected": "Залізо", - "block.gtceu.shale_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.shale_lapis_ore.prospected": "Лазурит", - "block.gtceu.shale_lazurite_ore.prospected": "Лазурите", - "block.gtceu.shale_lead_ore.prospected": "Свинець", - "block.gtceu.shale_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.shale_lithium_ore.prospected": "Літій", - "block.gtceu.shale_magnesite_ore.prospected": "Магнезит", - "block.gtceu.shale_magnetite_ore.prospected": "Магнетит", - "block.gtceu.shale_malachite_ore.prospected": "Малахіт", - "block.gtceu.shale_mica_ore.prospected": "Слюда", - "block.gtceu.shale_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.shale_molybdenum_ore.prospected": "Молібден", - "block.gtceu.shale_monazite_ore.prospected": "Монацит", - "block.gtceu.shale_naquadah_ore.prospected": "Наквада", - "block.gtceu.shale_neodymium_ore.prospected": "Неодим", - "block.gtceu.shale_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.shale_nickel_ore.prospected": "Нікель", - "block.gtceu.shale_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.shale_olivine_ore.prospected": "Олівін", - "block.gtceu.shale_opal_ore.prospected": "Опал", - "block.gtceu.shale_palladium_ore.prospected": "Паладій", - "block.gtceu.shale_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.shale_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.shale_platinum_ore.prospected": "Платина", - "block.gtceu.shale_plutonium_ore.prospected": "Плутоній", - "block.gtceu.shale_pollucite_ore.prospected": "Полюцит", - "block.gtceu.shale_powellite_ore.prospected": "Повеліт", - "block.gtceu.shale_pyrite_ore.prospected": "Пірит", - "block.gtceu.shale_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.shale_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.shale_pyrope_ore.prospected": "Піроп", - "block.gtceu.shale_quartzite_ore.prospected": "Кварцит", - "block.gtceu.shale_realgar_ore.prospected": "Реальгар", - "block.gtceu.shale_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.shale_redstone_ore.prospected": "Редстоун", - "block.gtceu.shale_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.shale_ruby_ore.prospected": "Рубін", - "block.gtceu.shale_salt_ore.prospected": "Сіль", - "block.gtceu.shale_saltpeter_ore.prospected": "Селітра", - "block.gtceu.shale_sapphire_ore.prospected": "Сапфір", - "block.gtceu.shale_scheelite_ore.prospected": "Шееліт", - "block.gtceu.shale_silver_ore.prospected": "Срібло", - "block.gtceu.shale_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.shale_sodalite_ore.prospected": "Содаліт", - "block.gtceu.shale_spessartine_ore.prospected": "Спесартин", - "block.gtceu.shale_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.shale_spodumene_ore.prospected": "Сподумен", - "block.gtceu.shale_stibnite_ore.prospected": "Стибніт", - "block.gtceu.shale_sulfur_ore.prospected": "Сірка", - "block.gtceu.shale_sylvite_ore.prospected": "Сильвін", - "block.gtceu.shale_talc_ore.prospected": "Тальк", - "block.gtceu.shale_tantalite_ore.prospected": "Танталіт", - "block.gtceu.shale_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.shale_thorium_ore.prospected": "Торій", - "block.gtceu.shale_tin_ore.prospected": "Олово", - "block.gtceu.shale_topaz_ore.prospected": "Топаз", - "block.gtceu.shale_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.shale_trona_ore.prospected": "Трона", - "block.gtceu.shale_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.shale_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.shale_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.shale_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.shale_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.shale_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.shale_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.slate_almandine_ore.prospected": "Альмандин", - "block.gtceu.slate_aluminium_ore.prospected": "Алюміній", - "block.gtceu.slate_alunite_ore.prospected": "Алюніт", - "block.gtceu.slate_amethyst_ore.prospected": "Аметист", - "block.gtceu.slate_apatite_ore.prospected": "Апатит", - "block.gtceu.slate_asbestos_ore.prospected": "Азбест", - "block.gtceu.slate_barite_ore.prospected": "Барит", - "block.gtceu.slate_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.slate_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.slate_bauxite_ore.prospected": "Боксит", - "block.gtceu.slate_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.slate_beryllium_ore.prospected": "Берилій", - "block.gtceu.slate_bismuth_ore.prospected": "Вісмут", - "block.gtceu.slate_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.slate_borax_ore.prospected": "Боракс", - "block.gtceu.slate_bornite_ore.prospected": "Борніт", - "block.gtceu.slate_calcite_ore.prospected": "Кальцит", - "block.gtceu.slate_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.slate_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.slate_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.slate_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.slate_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.slate_chromite_ore.prospected": "Хроміт", - "block.gtceu.slate_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.slate_coal_ore.prospected": "Вугілля", - "block.gtceu.slate_cobalt_ore.prospected": "Кобальт", - "block.gtceu.slate_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.slate_cooperite_ore.prospected": "Куперит", - "block.gtceu.slate_copper_ore.prospected": "Мідь", - "block.gtceu.slate_diamond_ore.prospected": "Діамант", - "block.gtceu.slate_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.slate_electrotine_ore.prospected": "Електротин", - "block.gtceu.slate_emerald_ore.prospected": "Смарагд", - "block.gtceu.slate_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.slate_galena_ore.prospected": "Галеніт", - "block.gtceu.slate_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.slate_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.slate_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.slate_goethite_ore.prospected": "Гетит", - "block.gtceu.slate_gold_ore.prospected": "Золото", - "block.gtceu.slate_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.slate_graphite_ore.prospected": "Графіт", - "block.gtceu.slate_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.slate_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.slate_gypsum_ore.prospected": "Гіпс", - "block.gtceu.slate_hematite_ore.prospected": "Гематит", - "block.gtceu.slate_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.slate_iron_ore.prospected": "Залізо", - "block.gtceu.slate_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.slate_lapis_ore.prospected": "Лазурит", - "block.gtceu.slate_lazurite_ore.prospected": "Лазурите", - "block.gtceu.slate_lead_ore.prospected": "Свинець", - "block.gtceu.slate_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.slate_lithium_ore.prospected": "Літій", - "block.gtceu.slate_magnesite_ore.prospected": "Магнезит", - "block.gtceu.slate_magnetite_ore.prospected": "Магнетит", - "block.gtceu.slate_malachite_ore.prospected": "Малахіт", - "block.gtceu.slate_mica_ore.prospected": "Слюда", - "block.gtceu.slate_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.slate_molybdenum_ore.prospected": "Молібден", - "block.gtceu.slate_monazite_ore.prospected": "Монацит", - "block.gtceu.slate_naquadah_ore.prospected": "Наквада", - "block.gtceu.slate_neodymium_ore.prospected": "Неодим", - "block.gtceu.slate_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.slate_nickel_ore.prospected": "Нікель", - "block.gtceu.slate_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.slate_olivine_ore.prospected": "Олівін", - "block.gtceu.slate_opal_ore.prospected": "Опал", - "block.gtceu.slate_palladium_ore.prospected": "Паладій", - "block.gtceu.slate_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.slate_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.slate_platinum_ore.prospected": "Платина", - "block.gtceu.slate_plutonium_ore.prospected": "Плутоній", - "block.gtceu.slate_pollucite_ore.prospected": "Полюцит", - "block.gtceu.slate_powellite_ore.prospected": "Повеліт", - "block.gtceu.slate_pyrite_ore.prospected": "Пірит", - "block.gtceu.slate_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.slate_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.slate_pyrope_ore.prospected": "Піроп", - "block.gtceu.slate_quartzite_ore.prospected": "Кварцит", - "block.gtceu.slate_realgar_ore.prospected": "Реальгар", - "block.gtceu.slate_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.slate_redstone_ore.prospected": "Редстоун", - "block.gtceu.slate_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.slate_ruby_ore.prospected": "Рубін", - "block.gtceu.slate_salt_ore.prospected": "Сіль", - "block.gtceu.slate_saltpeter_ore.prospected": "Селітра", - "block.gtceu.slate_sapphire_ore.prospected": "Сапфір", - "block.gtceu.slate_scheelite_ore.prospected": "Шееліт", - "block.gtceu.slate_silver_ore.prospected": "Срібло", - "block.gtceu.slate_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.slate_sodalite_ore.prospected": "Содаліт", - "block.gtceu.slate_spessartine_ore.prospected": "Спесартин", - "block.gtceu.slate_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.slate_spodumene_ore.prospected": "Сподумен", - "block.gtceu.slate_stibnite_ore.prospected": "Стибніт", - "block.gtceu.slate_sulfur_ore.prospected": "Сірка", - "block.gtceu.slate_sylvite_ore.prospected": "Сильвін", - "block.gtceu.slate_talc_ore.prospected": "Тальк", - "block.gtceu.slate_tantalite_ore.prospected": "Танталіт", - "block.gtceu.slate_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.slate_thorium_ore.prospected": "Торій", - "block.gtceu.slate_tin_ore.prospected": "Олово", - "block.gtceu.slate_topaz_ore.prospected": "Топаз", - "block.gtceu.slate_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.slate_trona_ore.prospected": "Трона", - "block.gtceu.slate_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.slate_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.slate_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.slate_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.slate_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.slate_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.slate_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.deepslate_almandine_ore.prospected": "Альмандин", - "block.gtceu.deepslate_aluminium_ore.prospected": "Алюміній", - "block.gtceu.deepslate_alunite_ore.prospected": "Алюніт", - "block.gtceu.deepslate_amethyst_ore.prospected": "Аметист", - "block.gtceu.deepslate_apatite_ore.prospected": "Апатит", - "block.gtceu.deepslate_asbestos_ore.prospected": "Азбест", - "block.gtceu.deepslate_barite_ore.prospected": "Барит", - "block.gtceu.deepslate_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.deepslate_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.deepslate_bauxite_ore.prospected": "Боксит", - "block.gtceu.deepslate_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.deepslate_beryllium_ore.prospected": "Берилій", - "block.gtceu.deepslate_bismuth_ore.prospected": "Вісмут", - "block.gtceu.deepslate_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.deepslate_borax_ore.prospected": "Боракс", - "block.gtceu.deepslate_bornite_ore.prospected": "Борніт", - "block.gtceu.deepslate_calcite_ore.prospected": "Кальцит", - "block.gtceu.deepslate_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.deepslate_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.deepslate_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.deepslate_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.deepslate_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.deepslate_chromite_ore.prospected": "Хроміт", - "block.gtceu.deepslate_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.deepslate_coal_ore.prospected": "Вугілля", - "block.gtceu.deepslate_cobalt_ore.prospected": "Кобальт", - "block.gtceu.deepslate_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.deepslate_cooperite_ore.prospected": "Куперит", - "block.gtceu.deepslate_copper_ore.prospected": "Мідь", - "block.gtceu.deepslate_diamond_ore.prospected": "Діамант", - "block.gtceu.deepslate_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.deepslate_electrotine_ore.prospected": "Електротин", - "block.gtceu.deepslate_emerald_ore.prospected": "Смарагд", - "block.gtceu.deepslate_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.deepslate_galena_ore.prospected": "Галеніт", - "block.gtceu.deepslate_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.deepslate_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.deepslate_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.deepslate_goethite_ore.prospected": "Гетит", - "block.gtceu.deepslate_gold_ore.prospected": "Золото", - "block.gtceu.deepslate_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.deepslate_graphite_ore.prospected": "Графіт", - "block.gtceu.deepslate_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.deepslate_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.deepslate_gypsum_ore.prospected": "Гіпс", - "block.gtceu.deepslate_hematite_ore.prospected": "Гематит", - "block.gtceu.deepslate_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.deepslate_iron_ore.prospected": "Залізо", - "block.gtceu.deepslate_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.deepslate_lapis_ore.prospected": "Лазурит", - "block.gtceu.deepslate_lazurite_ore.prospected": "Лазурите", - "block.gtceu.deepslate_lead_ore.prospected": "Свинець", - "block.gtceu.deepslate_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.deepslate_lithium_ore.prospected": "Літій", - "block.gtceu.deepslate_magnesite_ore.prospected": "Магнезит", - "block.gtceu.deepslate_magnetite_ore.prospected": "Магнетит", - "block.gtceu.deepslate_malachite_ore.prospected": "Малахіт", - "block.gtceu.deepslate_mica_ore.prospected": "Слюда", - "block.gtceu.deepslate_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.deepslate_molybdenum_ore.prospected": "Молібден", - "block.gtceu.deepslate_monazite_ore.prospected": "Монацит", - "block.gtceu.deepslate_naquadah_ore.prospected": "Наквада", - "block.gtceu.deepslate_neodymium_ore.prospected": "Неодим", - "block.gtceu.deepslate_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.deepslate_nickel_ore.prospected": "Нікель", - "block.gtceu.deepslate_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.deepslate_olivine_ore.prospected": "Олівін", - "block.gtceu.deepslate_opal_ore.prospected": "Опал", - "block.gtceu.deepslate_palladium_ore.prospected": "Паладій", - "block.gtceu.deepslate_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.deepslate_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.deepslate_platinum_ore.prospected": "Платина", - "block.gtceu.deepslate_plutonium_ore.prospected": "Плутоній", - "block.gtceu.deepslate_pollucite_ore.prospected": "Полюцит", - "block.gtceu.deepslate_powellite_ore.prospected": "Повеліт", - "block.gtceu.deepslate_pyrite_ore.prospected": "Пірит", - "block.gtceu.deepslate_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.deepslate_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.deepslate_pyrope_ore.prospected": "Піроп", - "block.gtceu.deepslate_quartzite_ore.prospected": "Кварцит", - "block.gtceu.deepslate_realgar_ore.prospected": "Реальгар", - "block.gtceu.deepslate_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.deepslate_redstone_ore.prospected": "Редстоун", - "block.gtceu.deepslate_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.deepslate_ruby_ore.prospected": "Рубін", - "block.gtceu.deepslate_salt_ore.prospected": "Сіль", - "block.gtceu.deepslate_saltpeter_ore.prospected": "Селітра", - "block.gtceu.deepslate_sapphire_ore.prospected": "Сапфір", - "block.gtceu.deepslate_scheelite_ore.prospected": "Шееліт", - "block.gtceu.deepslate_silver_ore.prospected": "Срібло", - "block.gtceu.deepslate_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.deepslate_sodalite_ore.prospected": "Содаліт", - "block.gtceu.deepslate_spessartine_ore.prospected": "Спесартин", - "block.gtceu.deepslate_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.deepslate_spodumene_ore.prospected": "Сподумен", - "block.gtceu.deepslate_stibnite_ore.prospected": "Стибніт", - "block.gtceu.deepslate_sulfur_ore.prospected": "Сірка", - "block.gtceu.deepslate_sylvite_ore.prospected": "Сильвін", - "block.gtceu.deepslate_talc_ore.prospected": "Тальк", - "block.gtceu.deepslate_tantalite_ore.prospected": "Танталіт", - "block.gtceu.deepslate_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.deepslate_thorium_ore.prospected": "Торій", - "block.gtceu.deepslate_tin_ore.prospected": "Олово", - "block.gtceu.deepslate_topaz_ore.prospected": "Топаз", - "block.gtceu.deepslate_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.deepslate_trona_ore.prospected": "Трона", - "block.gtceu.deepslate_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.deepslate_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.deepslate_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.deepslate_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.deepslate_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.deepslate_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.deepslate_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.pyroxenite_almandine_ore.prospected": "Альмандин", - "block.gtceu.pyroxenite_aluminium_ore.prospected": "Алюміній", - "block.gtceu.pyroxenite_alunite_ore.prospected": "Алюніт", - "block.gtceu.pyroxenite_amethyst_ore.prospected": "Аметист", - "block.gtceu.pyroxenite_apatite_ore.prospected": "Апатит", - "block.gtceu.pyroxenite_asbestos_ore.prospected": "Азбест", - "block.gtceu.pyroxenite_barite_ore.prospected": "Барит", - "block.gtceu.pyroxenite_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.pyroxenite_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.pyroxenite_bauxite_ore.prospected": "Боксит", - "block.gtceu.pyroxenite_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.pyroxenite_beryllium_ore.prospected": "Берилій", - "block.gtceu.pyroxenite_bismuth_ore.prospected": "Вісмут", - "block.gtceu.pyroxenite_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.pyroxenite_borax_ore.prospected": "Боракс", - "block.gtceu.pyroxenite_bornite_ore.prospected": "Борніт", - "block.gtceu.pyroxenite_calcite_ore.prospected": "Кальцит", - "block.gtceu.pyroxenite_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.pyroxenite_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.pyroxenite_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.pyroxenite_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.pyroxenite_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.pyroxenite_chromite_ore.prospected": "Хроміт", - "block.gtceu.pyroxenite_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.pyroxenite_coal_ore.prospected": "Вугілля", - "block.gtceu.pyroxenite_cobalt_ore.prospected": "Кобальт", - "block.gtceu.pyroxenite_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.pyroxenite_cooperite_ore.prospected": "Куперит", - "block.gtceu.pyroxenite_copper_ore.prospected": "Мідь", - "block.gtceu.pyroxenite_diamond_ore.prospected": "Діамант", - "block.gtceu.pyroxenite_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.pyroxenite_electrotine_ore.prospected": "Електротин", - "block.gtceu.pyroxenite_emerald_ore.prospected": "Смарагд", - "block.gtceu.pyroxenite_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.pyroxenite_galena_ore.prospected": "Галеніт", - "block.gtceu.pyroxenite_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.pyroxenite_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.pyroxenite_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.pyroxenite_goethite_ore.prospected": "Гетит", - "block.gtceu.pyroxenite_gold_ore.prospected": "Золото", - "block.gtceu.pyroxenite_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.pyroxenite_graphite_ore.prospected": "Графіт", - "block.gtceu.pyroxenite_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.pyroxenite_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.pyroxenite_gypsum_ore.prospected": "Гіпс", - "block.gtceu.pyroxenite_hematite_ore.prospected": "Гематит", - "block.gtceu.pyroxenite_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.pyroxenite_iron_ore.prospected": "Залізо", - "block.gtceu.pyroxenite_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.pyroxenite_lapis_ore.prospected": "Лазурит", - "block.gtceu.pyroxenite_lazurite_ore.prospected": "Лазурите", - "block.gtceu.pyroxenite_lead_ore.prospected": "Свинець", - "block.gtceu.pyroxenite_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.pyroxenite_lithium_ore.prospected": "Літій", - "block.gtceu.pyroxenite_magnesite_ore.prospected": "Магнезит", - "block.gtceu.pyroxenite_magnetite_ore.prospected": "Магнетит", - "block.gtceu.pyroxenite_malachite_ore.prospected": "Малахіт", - "block.gtceu.pyroxenite_mica_ore.prospected": "Слюда", - "block.gtceu.pyroxenite_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.pyroxenite_molybdenum_ore.prospected": "Молібден", - "block.gtceu.pyroxenite_monazite_ore.prospected": "Монацит", - "block.gtceu.pyroxenite_naquadah_ore.prospected": "Наквада", - "block.gtceu.pyroxenite_neodymium_ore.prospected": "Неодим", - "block.gtceu.pyroxenite_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.pyroxenite_nickel_ore.prospected": "Нікель", - "block.gtceu.pyroxenite_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.pyroxenite_olivine_ore.prospected": "Олівін", - "block.gtceu.pyroxenite_opal_ore.prospected": "Опал", - "block.gtceu.pyroxenite_palladium_ore.prospected": "Паладій", - "block.gtceu.pyroxenite_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.pyroxenite_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.pyroxenite_platinum_ore.prospected": "Платина", - "block.gtceu.pyroxenite_plutonium_ore.prospected": "Плутоній", - "block.gtceu.pyroxenite_pollucite_ore.prospected": "Полюцит", - "block.gtceu.pyroxenite_powellite_ore.prospected": "Повеліт", - "block.gtceu.pyroxenite_pyrite_ore.prospected": "Пірит", - "block.gtceu.pyroxenite_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.pyroxenite_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.pyroxenite_pyrope_ore.prospected": "Піроп", - "block.gtceu.pyroxenite_quartzite_ore.prospected": "Кварцит", - "block.gtceu.pyroxenite_realgar_ore.prospected": "Реальгар", - "block.gtceu.pyroxenite_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.pyroxenite_redstone_ore.prospected": "Редстоун", - "block.gtceu.pyroxenite_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.pyroxenite_ruby_ore.prospected": "Рубін", - "block.gtceu.pyroxenite_salt_ore.prospected": "Сіль", - "block.gtceu.pyroxenite_saltpeter_ore.prospected": "Селітра", - "block.gtceu.pyroxenite_sapphire_ore.prospected": "Сапфір", - "block.gtceu.pyroxenite_scheelite_ore.prospected": "Шееліт", - "block.gtceu.pyroxenite_silver_ore.prospected": "Срібло", - "block.gtceu.pyroxenite_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.pyroxenite_sodalite_ore.prospected": "Содаліт", - "block.gtceu.pyroxenite_spessartine_ore.prospected": "Спесартин", - "block.gtceu.pyroxenite_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.pyroxenite_spodumene_ore.prospected": "Сподумен", - "block.gtceu.pyroxenite_stibnite_ore.prospected": "Стибніт", - "block.gtceu.pyroxenite_sulfur_ore.prospected": "Сірка", - "block.gtceu.pyroxenite_sylvite_ore.prospected": "Сильвін", - "block.gtceu.pyroxenite_talc_ore.prospected": "Тальк", - "block.gtceu.pyroxenite_tantalite_ore.prospected": "Танталіт", - "block.gtceu.pyroxenite_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.pyroxenite_thorium_ore.prospected": "Торій", - "block.gtceu.pyroxenite_tin_ore.prospected": "Олово", - "block.gtceu.pyroxenite_topaz_ore.prospected": "Топаз", - "block.gtceu.pyroxenite_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.pyroxenite_trona_ore.prospected": "Трона", - "block.gtceu.pyroxenite_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.pyroxenite_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.pyroxenite_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.pyroxenite_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.pyroxenite_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.pyroxenite_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.pyroxenite_zeolite_ore.prospected": "Цеоліт", - "block.gtceu.dripstone_almandine_ore.prospected": "Альмандин", - "block.gtceu.dripstone_aluminium_ore.prospected": "Алюміній", - "block.gtceu.dripstone_alunite_ore.prospected": "Алюніт", - "block.gtceu.dripstone_amethyst_ore.prospected": "Аметист", - "block.gtceu.dripstone_apatite_ore.prospected": "Апатит", - "block.gtceu.dripstone_asbestos_ore.prospected": "Азбест", - "block.gtceu.dripstone_barite_ore.prospected": "Барит", - "block.gtceu.dripstone_basaltic_mineral_sand_ore.prospected": "Базальтовий Мінеральний Пісок", - "block.gtceu.dripstone_bastnasite_ore.prospected": "Бастнезит", - "block.gtceu.dripstone_bauxite_ore.prospected": "Боксит", - "block.gtceu.dripstone_bentonite_ore.prospected": "Бентоніт", - "block.gtceu.dripstone_beryllium_ore.prospected": "Берилій", - "block.gtceu.dripstone_bismuth_ore.prospected": "Вісмут", - "block.gtceu.dripstone_blue_topaz_ore.prospected": "Синій Топаз", - "block.gtceu.dripstone_borax_ore.prospected": "Боракс", - "block.gtceu.dripstone_bornite_ore.prospected": "Борніт", - "block.gtceu.dripstone_calcite_ore.prospected": "Кальцит", - "block.gtceu.dripstone_cassiterite_ore.prospected": "Касетерит", - "block.gtceu.dripstone_cassiterite_sand_ore.prospected": "Касетеритові Піски", - "block.gtceu.dripstone_certus_quartz_ore.prospected": "Істинний кварц", - "block.gtceu.dripstone_chalcocite_ore.prospected": "Халькоцит", - "block.gtceu.dripstone_chalcopyrite_ore.prospected": "Халькопірит", - "block.gtceu.dripstone_chromite_ore.prospected": "Хроміт", - "block.gtceu.dripstone_cinnabar_ore.prospected": "Кіновар", - "block.gtceu.dripstone_coal_ore.prospected": "Вугілля", - "block.gtceu.dripstone_cobalt_ore.prospected": "Кобальт", - "block.gtceu.dripstone_cobaltite_ore.prospected": "Кобальтит", - "block.gtceu.dripstone_cooperite_ore.prospected": "Куперит", - "block.gtceu.dripstone_copper_ore.prospected": "Мідь", - "block.gtceu.dripstone_diamond_ore.prospected": "Діамант", - "block.gtceu.dripstone_diatomite_ore.prospected": "Діатоміт", - "block.gtceu.dripstone_electrotine_ore.prospected": "Електротин", - "block.gtceu.dripstone_emerald_ore.prospected": "Смарагд", - "block.gtceu.dripstone_fullers_earth_ore.prospected": "Земля Фуллера", - "block.gtceu.dripstone_galena_ore.prospected": "Галеніт", - "block.gtceu.dripstone_garnet_sand_ore.prospected": "Гранатовий Пісок", - "block.gtceu.dripstone_garnierite_ore.prospected": "Гарнієрит", - "block.gtceu.dripstone_glauconite_sand_ore.prospected": "Глауконітовий Пісок", - "block.gtceu.dripstone_goethite_ore.prospected": "Гетит", - "block.gtceu.dripstone_gold_ore.prospected": "Золото", - "block.gtceu.dripstone_granitic_mineral_sand_ore.prospected": "Гранітний Мінеральний Пісок", - "block.gtceu.dripstone_graphite_ore.prospected": "Графіт", - "block.gtceu.dripstone_green_sapphire_ore.prospected": "Зелений Сапфір", - "block.gtceu.dripstone_grossular_ore.prospected": "Гроссуляр", - "block.gtceu.dripstone_gypsum_ore.prospected": "Гіпс", - "block.gtceu.dripstone_hematite_ore.prospected": "Гематит", - "block.gtceu.dripstone_ilmenite_ore.prospected": "Ільменіт", - "block.gtceu.dripstone_iron_ore.prospected": "Залізо", - "block.gtceu.dripstone_kyanite_ore.prospected": "Кіаніт", - "block.gtceu.dripstone_lapis_ore.prospected": "Лазурит", - "block.gtceu.dripstone_lazurite_ore.prospected": "Лазурите", - "block.gtceu.dripstone_lead_ore.prospected": "Свинець", - "block.gtceu.dripstone_lepidolite_ore.prospected": "Лепідоліт", - "block.gtceu.dripstone_lithium_ore.prospected": "Літій", - "block.gtceu.dripstone_magnesite_ore.prospected": "Магнезит", - "block.gtceu.dripstone_magnetite_ore.prospected": "Магнетит", - "block.gtceu.dripstone_malachite_ore.prospected": "Малахіт", - "block.gtceu.dripstone_mica_ore.prospected": "Слюда", - "block.gtceu.dripstone_molybdenite_ore.prospected": "Молібденіт", - "block.gtceu.dripstone_molybdenum_ore.prospected": "Молібден", - "block.gtceu.dripstone_monazite_ore.prospected": "Монацит", - "block.gtceu.dripstone_naquadah_ore.prospected": "Наквада", - "block.gtceu.dripstone_neodymium_ore.prospected": "Неодим", - "block.gtceu.dripstone_nether_quartz_ore.prospected": "Кварц Нижнього Світу", - "block.gtceu.dripstone_nickel_ore.prospected": "Нікель", - "block.gtceu.dripstone_oilsands_ore.prospected": "Нафтоносні Піски", - "block.gtceu.dripstone_olivine_ore.prospected": "Олівін", - "block.gtceu.dripstone_opal_ore.prospected": "Опал", - "block.gtceu.dripstone_palladium_ore.prospected": "Паладій", - "block.gtceu.dripstone_pentlandite_ore.prospected": "Пентландит", - "block.gtceu.dripstone_pitchblende_ore.prospected": "Пітчбленд", - "block.gtceu.dripstone_platinum_ore.prospected": "Платина", - "block.gtceu.dripstone_plutonium_ore.prospected": "Плутоній", - "block.gtceu.dripstone_pollucite_ore.prospected": "Полюцит", - "block.gtceu.dripstone_powellite_ore.prospected": "Повеліт", - "block.gtceu.dripstone_pyrite_ore.prospected": "Пірит", - "block.gtceu.dripstone_pyrochlore_ore.prospected": "Пірохлор", - "block.gtceu.dripstone_pyrolusite_ore.prospected": "Піролюзит", - "block.gtceu.dripstone_pyrope_ore.prospected": "Піроп", - "block.gtceu.dripstone_quartzite_ore.prospected": "Кварцит", - "block.gtceu.dripstone_realgar_ore.prospected": "Реальгар", - "block.gtceu.dripstone_red_garnet_ore.prospected": "Червоний Гранат", - "block.gtceu.dripstone_redstone_ore.prospected": "Редстоун", - "block.gtceu.dripstone_rock_salt_ore.prospected": "Кам'яна Сіль", - "block.gtceu.dripstone_ruby_ore.prospected": "Рубін", - "block.gtceu.dripstone_salt_ore.prospected": "Сіль", - "block.gtceu.dripstone_saltpeter_ore.prospected": "Селітра", - "block.gtceu.dripstone_sapphire_ore.prospected": "Сапфір", - "block.gtceu.dripstone_scheelite_ore.prospected": "Шееліт", - "block.gtceu.dripstone_silver_ore.prospected": "Срібло", - "block.gtceu.dripstone_soapstone_ore.prospected": "Талькохлорит", - "block.gtceu.dripstone_sodalite_ore.prospected": "Содаліт", - "block.gtceu.dripstone_spessartine_ore.prospected": "Спесартин", - "block.gtceu.dripstone_sphalerite_ore.prospected": "Сфалерит", - "block.gtceu.dripstone_spodumene_ore.prospected": "Сподумен", - "block.gtceu.dripstone_stibnite_ore.prospected": "Стибніт", - "block.gtceu.dripstone_sulfur_ore.prospected": "Сірка", - "block.gtceu.dripstone_sylvite_ore.prospected": "Сильвін", - "block.gtceu.dripstone_talc_ore.prospected": "Тальк", - "block.gtceu.dripstone_tantalite_ore.prospected": "Танталіт", - "block.gtceu.dripstone_tetrahedrite_ore.prospected": "Тетраедрит", - "block.gtceu.dripstone_thorium_ore.prospected": "Торій", - "block.gtceu.dripstone_tin_ore.prospected": "Олово", - "block.gtceu.dripstone_topaz_ore.prospected": "Топаз", - "block.gtceu.dripstone_tricalcium_phosphate_ore.prospected": "Трикальційфосфат", - "block.gtceu.dripstone_trona_ore.prospected": "Трона", - "block.gtceu.dripstone_tungstate_ore.prospected": "Тунгстат", - "block.gtceu.dripstone_uraninite_ore.prospected": "Ураниніт", - "block.gtceu.dripstone_vanadium_magnetite_ore.prospected": "Ванадієвий Магнетит", - "block.gtceu.dripstone_wulfenite_ore.prospected": "Вульфеніт", - "block.gtceu.dripstone_yellow_garnet_ore.prospected": "Жовтий Гранат", - "block.gtceu.dripstone_yellow_limonite_ore.prospected": "Жовтий Лімоніт", - "block.gtceu.dripstone_zeolite_ore.prospected": "Цеоліт", "fluid.tfc.salt_water": "Морська Вода", "item.tfc.bucket.salt_water": "Відро морської води", "item.tfc.powder.saltpeter": "Порошок Селітри", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index b9bc01cff..ea1f82e0f 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -250,8 +250,10 @@ "block.tfg.uv_railgun_item_loader_out": "§3UV Interplanetary Railgun Output Bus§r", "block.tfg.uhv_railgun_item_loader_out": "§4UHV Interplanetary Railgun Output Bus§r", "block.tfg.reflector": "Reflector Block", + "block.tfg.sunflower": "Sunflower", "block.tfg.sunflower_wild": "Wild Sunflower", "block.tfg.sunflower_dead": "Dead Sunflower", + "block.tfg.rapeseed": "Canola", "block.tfg.rapeseed_wild": "Wild Canola", "block.tfg.rapeseed_dead": "Dead Canola", "block.tfg.casings.machine_casing_iron_desh": "Desh Machine Casing", @@ -736,11 +738,6 @@ "tfg.tooltip.moon_rabbit_variant.cyan": "Seafoam Fur", "tfg.tooltip.moon_rabbit_variant.purple": "Lavender Fur", "tfg.tooltip.moon_rabbit_variant.sofu": "Sundae Fur", - "tfg.toast.ore_prospector_none": "No ores found in range.", - "tfg.toast.ore_prospector_message": "Ores found within %s §6blocks in this direction: %s", - "tooltip.tfg.ore_prospector_stats": "Scan Range: %s, Cross Section: %s x %s.", - "tooltip.tfg.ore_prospector_count": "This prospector will display ore counts.", - "tooltip.tfg.ore_prospector_xray": "This prospector will display an x-ray view of ore blocks.", "item.treetap.tap": "Deprecated Item, Craft to Upgrade", "item.gtceu.zinc_ingot": "Deprecated Item, Craft to Upgrade", "item.gtceu.brass_ingot": "Deprecated Item, Craft to Upgrade", @@ -872,6 +869,12 @@ "tfg.emi.ore_veins.height": "Height: %d", "tfg.emi.ore_veins.radius": "Radius: %d", "emi.category.tfg.ore_vein_info": "Ore Veins", + "tfg.toast.ore_prospector_none": "No ores found in range.", + "tfg.toast.ore_prospector_message": "Ores found within %s §6blocks in this direction: %s", + "tooltip.tfg.ore_prospector_stats": "Scan Range: %s, Cross Section: %s x %s.", + "tooltip.tfg.ore_prospector_count": "This prospector will display ore counts.", + "tooltip.tfg.ore_prospector_xray": "This prospector will display an x-ray view of ore blocks.", + "tfg.hangglider.disabled_dimension": "You can't use a hang glider here!", "tfc.jei.flint_knapping": "Flint Knapping", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "Dyeing", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.gray": "Dyeing", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index 27309bc66..1938dd42d 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -248,8 +248,10 @@ "block.tfg.zpm_railgun_item_loader_out": "§cZPM Міжпланетний рейкотронний вихідний модуль§r", "block.tfg.uv_railgun_item_loader_out": "§3UV Міжпланетний рейкотронний вихідний модуль§r", "block.tfg.uhv_railgun_item_loader_out": "§4UHV Міжпланетний рейкотронний вихідний модуль§r", + "block.tfg.sunflower": "Cоняшник", "block.tfg.sunflower_wild": "Дикий соняшник", "block.tfg.sunflower_dead": "Мертвий соняшник", + "block.tfg.rapeseed": "Pіпак", "block.tfg.rapeseed_wild": "Дикий ріпак", "block.tfg.rapeseed_dead": "Мертвий ріпак", "block.tfg.casings.machine_casing_iron_desh": "Обшивка машини з дешу", From 3b613c22d4cf11e8dbc20538e0bf122ad64a1263 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 11 Aug 2025 22:59:32 +0100 Subject: [PATCH 019/158] reverting these --- kubejs/assets/betterend/models/item/amber_root_wild.json | 5 +---- kubejs/assets/betterend/models/item/blossom_berry_wild.json | 5 +---- kubejs/assets/betterend/models/item/bolux_mushroom_wild.json | 5 +---- kubejs/assets/betterend/models/item/cave_pumpkin_wild.json | 5 +---- .../assets/betterend/models/item/chorus_mushroom_wild.json | 5 +---- kubejs/assets/betterend/models/item/shadow_berry_wild.json | 5 +---- 6 files changed, 6 insertions(+), 24 deletions(-) diff --git a/kubejs/assets/betterend/models/item/amber_root_wild.json b/kubejs/assets/betterend/models/item/amber_root_wild.json index 3de793d23..f8489214d 100644 --- a/kubejs/assets/betterend/models/item/amber_root_wild.json +++ b/kubejs/assets/betterend/models/item/amber_root_wild.json @@ -1,6 +1,3 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:block/amber_root_3" - } + "parent": "betterend:block/amber_root_wild" } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/blossom_berry_wild.json b/kubejs/assets/betterend/models/item/blossom_berry_wild.json index b95007e6e..b7f850a26 100644 --- a/kubejs/assets/betterend/models/item/blossom_berry_wild.json +++ b/kubejs/assets/betterend/models/item/blossom_berry_wild.json @@ -1,6 +1,3 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:block/blossom_berry_seed_3" - } + "parent": "betterend:block/blossom_berry_wild" } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json b/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json index 9a12586e8..e9bce3c0c 100644 --- a/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json +++ b/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json @@ -1,6 +1,3 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:block/bolux_mushroom_greenhouse_3" - } + "parent": "betterend:block/bolux_mushroom_wild" } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/cave_pumpkin_wild.json b/kubejs/assets/betterend/models/item/cave_pumpkin_wild.json index c0988d12b..1ea8c2841 100644 --- a/kubejs/assets/betterend/models/item/cave_pumpkin_wild.json +++ b/kubejs/assets/betterend/models/item/cave_pumpkin_wild.json @@ -1,6 +1,3 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:block/cave_pumpkin_stem_3" - } + "parent": "betterend:block/cave_pumpkin_wild" } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json b/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json index ed4ab05b3..55ae0a3b1 100644 --- a/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json +++ b/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json @@ -1,6 +1,3 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:block/chorus_mushroom_3" - } + "parent": "betterend:block/chorus_mushroom_wild" } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/shadow_berry_wild.json b/kubejs/assets/betterend/models/item/shadow_berry_wild.json index 53886c083..64a657ef2 100644 --- a/kubejs/assets/betterend/models/item/shadow_berry_wild.json +++ b/kubejs/assets/betterend/models/item/shadow_berry_wild.json @@ -1,6 +1,3 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:block/shadow_berry_greenhouse_3" - } + "parent": "betterend:block/shadow_berry_wild" } \ No newline at end of file From b38476aebb21de9562031531e319ae5003741616 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 12 Aug 2025 00:53:51 +0100 Subject: [PATCH 020/158] fixed item model positions --- .../betterend/blockstates/cave_pumpkin_wild.json | 1 - .../models/block/blossom_berry_wild_mature.json | 9 ++++++++- .../models/block/bolux_mushroom_wild_immature.json | 9 ++++++++- .../models/block/bolux_mushroom_wild_mature.json | 9 ++++++++- .../models/block/cave_pumpkin_wild_side.json | 9 ++++++++- kubejs/assets/betterend/models/block/crop_wild.json | 11 +++++++++-- .../models/block/shadow_berry_wild_immature.json | 9 ++++++++- .../models/block/shadow_berry_wild_mature.json | 9 ++++++++- 8 files changed, 57 insertions(+), 9 deletions(-) diff --git a/kubejs/assets/betterend/blockstates/cave_pumpkin_wild.json b/kubejs/assets/betterend/blockstates/cave_pumpkin_wild.json index aa952f482..7561ffc56 100644 --- a/kubejs/assets/betterend/blockstates/cave_pumpkin_wild.json +++ b/kubejs/assets/betterend/blockstates/cave_pumpkin_wild.json @@ -1,5 +1,4 @@ { - "__comment__": "This file was automatically created by mcresources", "multipart": [ { "when": { diff --git a/kubejs/assets/betterend/models/block/blossom_berry_wild_mature.json b/kubejs/assets/betterend/models/block/blossom_berry_wild_mature.json index b93d8294d..baaa32a8e 100644 --- a/kubejs/assets/betterend/models/block/blossom_berry_wild_mature.json +++ b/kubejs/assets/betterend/models/block/blossom_berry_wild_mature.json @@ -77,5 +77,12 @@ "south": {"uv": [0, 0, 16, 16], "texture": "#1"} } } - ] + ], + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.625, 0.625, 0.625 ] + } + } } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/bolux_mushroom_wild_immature.json b/kubejs/assets/betterend/models/block/bolux_mushroom_wild_immature.json index 6b5490338..d390db3de 100644 --- a/kubejs/assets/betterend/models/block/bolux_mushroom_wild_immature.json +++ b/kubejs/assets/betterend/models/block/bolux_mushroom_wild_immature.json @@ -114,5 +114,12 @@ "south": {"uv": [0, 0, 16, 16], "texture": "#1"} } } - ] + ], + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.625, 0.625, 0.625 ] + } + } } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/bolux_mushroom_wild_mature.json b/kubejs/assets/betterend/models/block/bolux_mushroom_wild_mature.json index 22987b28f..b48670fda 100644 --- a/kubejs/assets/betterend/models/block/bolux_mushroom_wild_mature.json +++ b/kubejs/assets/betterend/models/block/bolux_mushroom_wild_mature.json @@ -186,5 +186,12 @@ "south": {"uv": [0, 0, 16, 16], "texture": "#1"} } } - ] + ], + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.625, 0.625, 0.625 ] + } + } } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/cave_pumpkin_wild_side.json b/kubejs/assets/betterend/models/block/cave_pumpkin_wild_side.json index 8222bb8f7..1f9972ef0 100644 --- a/kubejs/assets/betterend/models/block/cave_pumpkin_wild_side.json +++ b/kubejs/assets/betterend/models/block/cave_pumpkin_wild_side.json @@ -44,5 +44,12 @@ } } } - ] + ], + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.625, 0.625, 0.625 ] + } + } } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/crop_wild.json b/kubejs/assets/betterend/models/block/crop_wild.json index 3998707f4..739e2ef50 100644 --- a/kubejs/assets/betterend/models/block/crop_wild.json +++ b/kubejs/assets/betterend/models/block/crop_wild.json @@ -1,7 +1,7 @@ { "credit": "Made with Blockbench", "ambientocclusion": false, - "parent": "block/block", + "render_type": "cutout_mipped", "textures": { "1": "betterend:block/wild_crop", "particle": "#crop", @@ -80,5 +80,12 @@ "south": {"uv": [0, 0, 16, 16], "texture": "#1"} } } - ] + ], + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.625, 0.625, 0.625 ] + } + } } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/shadow_berry_wild_immature.json b/kubejs/assets/betterend/models/block/shadow_berry_wild_immature.json index cdf452278..433fdab9c 100644 --- a/kubejs/assets/betterend/models/block/shadow_berry_wild_immature.json +++ b/kubejs/assets/betterend/models/block/shadow_berry_wild_immature.json @@ -69,5 +69,12 @@ "south": {"uv": [0, 0, 16, 16], "texture": "#1"} } } - ] + ], + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.625, 0.625, 0.625 ] + } + } } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/shadow_berry_wild_mature.json b/kubejs/assets/betterend/models/block/shadow_berry_wild_mature.json index 8e52d238b..d3304b8e6 100644 --- a/kubejs/assets/betterend/models/block/shadow_berry_wild_mature.json +++ b/kubejs/assets/betterend/models/block/shadow_berry_wild_mature.json @@ -82,5 +82,12 @@ "south": {"uv": [0, 0, 16, 16], "texture": "#1"} } } - ] + ], + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.625, 0.625, 0.625 ] + } + } } \ No newline at end of file From 1cb918ee351e5fe3dab2ea43899df7ec5c0d038b Mon Sep 17 00:00:00 2001 From: TomPlop Date: Tue, 12 Aug 2025 05:49:49 -0400 Subject: [PATCH 021/158] Fix soy bean (#1608) Signed-off-by: TomPlop --- kubejs/server_scripts/tfg/recipes.food.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index 084c286ac..110edad0d 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -521,7 +521,7 @@ function registerTFGFoodRecipes(event) { }, 0, 0).id(`tfg:mortar/masa_flour`) event.recipes.tfc.advanced_shaped_crafting( - TFC.isp.of(`4x firmalife:food/soybean_paste`).copyFood(), ['A', 'B'], { + TFC.isp.of(`firmalife:food/soybean_paste`).copyFood(), ['A', 'B'], { A: TFC.ingredient.notRotten(`firmalife:food/dehydrated_soybeans`), B: '#forge:tools/mortars' }, 0, 0).id(`tfg:mortar/soybean_paste`) From 99ce71139774b4cdfb7a09ecd53c3b32ef50427d Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 12 Aug 2025 10:53:10 +0100 Subject: [PATCH 022/158] fix --- kubejs/startup_scripts/gtceu/machines.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 843994131..6ed68ad78 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -340,7 +340,7 @@ const registerGTCEuMachines = (event) => { .rotationState(RotationState.NON_Y_AXIS) .generator(true) .recipeType('large_solar_panel_tier3') - .recipeModifiers(GTRecipeModifiers.PARALLEL_HATCH) + .recipeModifiers([GTRecipeModifiers.PARALLEL_HATCH]) .appearanceBlock(() => Block.getBlock('tfg:casings/machine_casing_iron_desh')) .pattern(definition => FactoryBlockPattern.start() .aisle(" A A ", " A A ", " A A ", " S S ", " S S ", " S S ", " CCCCCCCCC ", " ", " ", " ", " ", " ", " ", " ") From 5c25b1581acecdb9a3ab38e8e0c0b8c6485bdedf Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 12 Aug 2025 10:53:52 +0100 Subject: [PATCH 023/158] finally got these dumb models working --- kubejs/assets/betterend/models/item/amber_root_wild.json | 2 +- kubejs/assets/betterend/models/item/blossom_berry_wild.json | 2 +- kubejs/assets/betterend/models/item/bolux_mushroom_wild.json | 2 +- kubejs/assets/betterend/models/item/chorus_mushroom_wild.json | 2 +- kubejs/assets/betterend/models/item/shadow_berry_wild.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kubejs/assets/betterend/models/item/amber_root_wild.json b/kubejs/assets/betterend/models/item/amber_root_wild.json index f8489214d..2a637da80 100644 --- a/kubejs/assets/betterend/models/item/amber_root_wild.json +++ b/kubejs/assets/betterend/models/item/amber_root_wild.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/amber_root_wild" + "parent": "betterend:block/amber_root_wild_mature" } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/blossom_berry_wild.json b/kubejs/assets/betterend/models/item/blossom_berry_wild.json index b7f850a26..02118c18f 100644 --- a/kubejs/assets/betterend/models/item/blossom_berry_wild.json +++ b/kubejs/assets/betterend/models/item/blossom_berry_wild.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/blossom_berry_wild" + "parent": "betterend:block/blossom_berry_wild_mature" } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json b/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json index e9bce3c0c..458cef502 100644 --- a/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json +++ b/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/bolux_mushroom_wild" + "parent": "betterend:block/bolux_mushroom_wild_mature" } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json b/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json index 55ae0a3b1..ed7b57796 100644 --- a/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json +++ b/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/chorus_mushroom_wild" + "parent": "betterend:block/chorus_mushroom_wild_mature" } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/shadow_berry_wild.json b/kubejs/assets/betterend/models/item/shadow_berry_wild.json index 64a657ef2..adefc1e27 100644 --- a/kubejs/assets/betterend/models/item/shadow_berry_wild.json +++ b/kubejs/assets/betterend/models/item/shadow_berry_wild.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/shadow_berry_wild" + "parent": "betterend:block/shadow_berry_wild_mature" } \ No newline at end of file From b0609060ee52b8599d51c0d3627ed243090ca967 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 12 Aug 2025 11:06:42 +0100 Subject: [PATCH 024/158] update cl --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28472f4d6..f97c6f266 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Rebalance Large Solar Array to make Mk2 circuit 2 viable, and buffed to LSA Mk3 circuit 2 (#1591) @TomPlop ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett +- Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop ## [0.10.9] - 10-08-2025 ### Changes From 293a7543aebc20ca4dd30ff18865c730bc1bbb6a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 12 Aug 2025 11:07:02 +0100 Subject: [PATCH 025/158] don't need this any more --- .../placed_feature/mars/hardening.json | 186 ------------------ 1 file changed, 186 deletions(-) delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/hardening.json diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/hardening.json b/kubejs/data/tfg/worldgen/placed_feature/mars/hardening.json deleted file mode 100644 index eef3d5728..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/hardening.json +++ /dev/null @@ -1,186 +0,0 @@ -{ - "feature": { - "type": "minecraft:replace_single_block", - "config": { - "targets": [ - { - "target": { - "predicate_type": "minecraft:block_match", - "block": "ad_astra:mars_stone" - }, - "state": { - "Name": "tfg:rock/hardened_mars_stone" - } - }, - { - "target": { - "predicate_type": "minecraft:block_match", - "block": "ad_astra:venus_stone" - }, - "state": { - "Name": "tfg:rock/hardened_venus_stone" - } - }, - { - "target": { - "predicate_type": "minecraft:block_match", - "block": "gtceu:red_granite" - }, - "state": { - "Name": "tfg:rock/hardened_red_granite" - } - }, - { - "target": { - "predicate_type": "minecraft:block_match", - "block": "tfc:rock/raw/gabbro" - }, - "state": { - "Name": "tfc:rock/hardened/gabbro" - } - }, - { - "target": { - "predicate_type": "minecraft:block_match", - "block": "tfc:rock/raw/rhyolite" - }, - "state": { - "Name": "tfc:rock/hardened/rhyolite" - } - }, - { - "target": { - "predicate_type": "minecraft:block_match", - "block": "tfc:rock/raw/basalt" - }, - "state": { - "Name": "tfc:rock/hardened/basalt" - } - }, - { - "target": { - "predicate_type": "minecraft:block_match", - "block": "tfc:rock/raw/andesite" - }, - "state": { - "Name": "tfc:rock/hardened/andesite" - } - }, - { - "target": { - "predicate_type": "minecraft:block_match", - "block": "tfc:rock/raw/dacite" - }, - "state": { - "Name": "tfc:rock/hardened/dacite" - } - }, - { - "target": { - "predicate_type": "minecraft:block_match", - "block": "tfc:rock/raw/diorite" - }, - "state": { - "Name": "tfc:rock/hardened/diorite" - } - }, - { - "target": { - "predicate_type": "minecraft:block_match", - "block": "tfc:rock/raw/shale" - }, - "state": { - "Name": "tfc:rock/hardened/shale" - } - }, - { - "target": { - "predicate_type": "minecraft:block_match", - "block": "tfc:rock/raw/dolomite" - }, - "state": { - "Name": "tfc:rock/hardened/dolomite" - } - }, - { - "target": { - "predicate_type": "minecraft:block_match", - "block": "tfc:rock/raw/limestone" - }, - "state": { - "Name": "tfc:rock/hardened/limestone" - } - }, - { - "target": { - "predicate_type": "minecraft:block_match", - "block": "tfc:rock/raw/claystone" - }, - "state": { - "Name": "tfc:rock/hardened/claystone" - } - }, - { - "target": { - "predicate_type": "minecraft:block_match", - "block": "tfc:rock/raw/conglomerate" - }, - "state": { - "Name": "tfc:rock/hardened/conglomerate" - } - }, - { - "target": { - "predicate_type": "minecraft:block_match", - "block": "tfc:rock/raw/chert" - }, - "state": { - "Name": "tfc:rock/hardened/chert" - } - }, - { - "target": { - "predicate_type": "minecraft:block_match", - "block": "minecraft:dripstone_block" - }, - "state": { - "Name": "tfg:rock/hardened_dripstone" - } - }, - { - "target": { - "predicate_type": "minecraft:tag_match", - "tag": "tfc:can_landslide" - }, - "state": { - "Name": "tfg:rock/hardened_mars_stone" - } - } - ] - } - }, - "placement": [ - { - "type": "minecraft:carving_mask", - "step": "air" - }, - { - "type": "minecraft:environment_scan", - "direction_of_search": "up", - "max_steps": 1, - "target_condition": { - "type": "minecraft:any_of", - "predicates": [ - { - "type": "minecraft:matching_block_tag", - "tag": "ad_astra:mars_stone_replaceables" - }, - { - "type": "minecraft:matching_block_tag", - "tag": "tfc:can_landslide" - } - ] - } - } - ] -} \ No newline at end of file From 41fc80fdd2e561761cd9c0f197402b1ae7184f55 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 12 Aug 2025 11:25:07 +0100 Subject: [PATCH 026/158] langs --- kubejs/assets/minecraft/lang/en_gb.json | 15 ++- kubejs/assets/minecraft/lang/en_us.json | 2 + kubejs/assets/tfc/lang/en_us.json | 130 ++++++++++++------------ kubejs/assets/tfg/lang/en_us.json | 3 + 4 files changed, 84 insertions(+), 66 deletions(-) diff --git a/kubejs/assets/minecraft/lang/en_gb.json b/kubejs/assets/minecraft/lang/en_gb.json index c5ccf5f68..51a9bc47f 100644 --- a/kubejs/assets/minecraft/lang/en_gb.json +++ b/kubejs/assets/minecraft/lang/en_gb.json @@ -45,7 +45,20 @@ "block.minecraft.pearlescent_froglight": "Pearlescent Lightbloom", "block.minecraft.verdant_froglight": "Verdant Lightbloom", "block.minecraft.ochre_froglight": "Ochre Lightbloom", - "minecraft:nether_wart_block": "Crimson Wart Block", + "block.minecraft.nether_wart_block": "Crimson Wart Block", + "block.minecraft.weeping_vines_plant": "Crimson Vines Plant", + "block.minecraft.weeping_vines": "Crimson Vines", + "block.minecraft.red_sand": "Hematitic Sand", + "block.minecraft.red_sandstone": "Hematitic Sandstone", + "block.minecraft.red_sandstone_stairs": "Hematitic Sandstone Stairs", + "block.minecraft.red_sandstone_slab": "Hematitic Sandstone Slab", + "block.minecraft.red_sandstone_wall": "Hematitic Sandstone Wall", + "block.minecraft.chiseled_red_sandstone": "Chiseled Hematitic Sandstone", + "block.minecraft.smooth_red_sandstone": "Smooth Hematitic Sandstone", + "block.minecraft.smooth_red_sandstone_stairs": "Smooth Hematitic Sandstone Stairs", + "block.minecraft.smooth_red_sandstone_slab": "Smooth Hematitic Sandstone Slab", + "block.minecraft.cut_red_sandstone": "Cut Hematitic Sandstone", + "block.minecraft.cut_red_sandstone_slab": "Cut Hematitic Sandstone Slab", "item.minecraft.iron_nugget": "Cast Iron Nugget", "item.minecraft.iron_ingot": "Cast Iron Ingot", "item.minecraft.iron_block": "Cast Iron Block", diff --git a/kubejs/assets/minecraft/lang/en_us.json b/kubejs/assets/minecraft/lang/en_us.json index c1b1b6d87..51a9bc47f 100644 --- a/kubejs/assets/minecraft/lang/en_us.json +++ b/kubejs/assets/minecraft/lang/en_us.json @@ -46,6 +46,8 @@ "block.minecraft.verdant_froglight": "Verdant Lightbloom", "block.minecraft.ochre_froglight": "Ochre Lightbloom", "block.minecraft.nether_wart_block": "Crimson Wart Block", + "block.minecraft.weeping_vines_plant": "Crimson Vines Plant", + "block.minecraft.weeping_vines": "Crimson Vines", "block.minecraft.red_sand": "Hematitic Sand", "block.minecraft.red_sandstone": "Hematitic Sandstone", "block.minecraft.red_sandstone_stairs": "Hematitic Sandstone Stairs", diff --git a/kubejs/assets/tfc/lang/en_us.json b/kubejs/assets/tfc/lang/en_us.json index 61aab90fe..2d034321e 100644 --- a/kubejs/assets/tfc/lang/en_us.json +++ b/kubejs/assets/tfc/lang/en_us.json @@ -1,67 +1,67 @@ { - "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", - "block.tfc.fluid.salt_water": "Sea Water", - "block.tfc.cauldron.salt_water": "Sea Water Cauldron", - "fluid.tfc.salt_water": "Sea Water", - "item.tfc.bucket.salt_water": "Sea Water Bucket", - "item.tfc.powder.saltpeter": "Saltpeter Powder", - "item.tfc.powder.sulfur": "Sulfur Powder", - "tfc.jei.raw_hide_knapping": "Raw Hide Knapping", - "metal.tfg.redstone": "Redstone", - "metal.tfg.red_alloy": "Red Alloy", - "metal.tfg.tin_alloy": "Tin Alloy", - "metal.tfg.lead": "Lead", - "metal.tfg.invar": "Invar", - "metal.tfg.potin": "Potin", - "metal.tfg.cobalt": "Cobalt", - "metal.tfg.cobalt_brass": "Cobalt Brass", - "metal.tfg.aluminium_silicate": "Aluminium Silicate", - "trim_material.tfc.almandine_tfc": "Almandine", - "trim_material.tfc.andradite_tfc": "Andradite", - "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", - "trim_material.tfc.cinnabar_tfc": "Cinnabar", - "trim_material.tfc.coal_tfc": "Coal", - "trim_material.tfc.diamond_tfc": "Diamond", - "trim_material.tfc.emerald_tfc": "Emerald", - "trim_material.tfc.green_sapphire_tfc": "Green Sapphire", - "trim_material.tfc.grossular_tfc": "Grossular", - "trim_material.tfc.rutile_tfc": "Rutile", - "trim_material.tfc.lazurite_tfc": "Lazurite", - "trim_material.tfc.pyrope_tfc": "Pyrope", - "trim_material.tfc.rock_salt_tfc": "Rock Salt", - "trim_material.tfc.ruby_tfc": "Ruby", - "trim_material.tfc.salt_tfc": "salt", - "trim_material.tfc.sapphire_tfc": "Sapphire", - "trim_material.tfc.sodalite_tfc": "Sodalite", - "trim_material.tfc.coke_tfc": "Coke", - "trim_material.tfc.spessartine_tfc": "Spessartine", - "trim_material.tfc.topaz_tfc": "Topaz", - "trim_material.tfc.uvarovite_tfc": "Uvarovite", - "trim_material.tfc.nether_quartz_tfc": "Nether Quartz", - "trim_material.tfc.certus_quartz_tfc": "Certus Quartz", - "trim_material.tfc.quartzite_tfc": "Quartzite", - "trim_material.tfc.realgar_tfc": "Realgar", - "trim_material.tfc.malachite_tfc": "Malachite", - "trim_material.tfc.glass_tfc": "Glass", - "trim_material.tfc.olivine_tfc": "Olivine", - "trim_material.tfc.opal_tfc": "Opal", - "trim_material.tfc.amethyst_tfc": "Amethyst", - "trim_material.tfc.lapis_tfc": "Lapis", - "trim_material.tfc.apatite_tfc": "Apatite", - "trim_material.tfc.red_garnet_tfc": "Red Garnet", - "trim_material.tfc.yellow_garnet_tfc": "Yellow Garnet", - "trim_material.tfc.monazite_tfc": "Monazite", - "trim_material.tfc.rose_quartz_tfc": "Rose Quartz", - "trim_material.tfc.fluix_tfc": "Fluix", - "trim_material.tfc.silver_tfc": "Silver", - "trim_material.tfc.sterling_silver_tfc": "Sterling Silver", - "trim_material.tfc.gold_tfc": "Gold", - "trim_material.tfc.rose_gold_tfc": "Rose Gold", - "trim_material.tfc.nickel_tfc": "Nickel", - "trim_material.tfc.platinum_tfc": "Platinum", - "trim_material.tfc.titanium_tfc": "Titanium", - "trim_material.tfc.bismuth_tfc": "Bismuth", - "trim_material.tfc.neutronium_tfc": "Neutronium", - "trim_material.tfc.pyrite_tfc": "Pyrite", - "trim_material.tfc.redx_tfc": "RedX" + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.tfc.fluid.salt_water": "Sea Water", + "block.tfc.cauldron.salt_water": "Sea Water Cauldron", + "fluid.tfc.salt_water": "Sea Water", + "item.tfc.bucket.salt_water": "Sea Water Bucket", + "item.tfc.powder.saltpeter": "Saltpeter Powder", + "item.tfc.powder.sulfur": "Sulfur Powder", + "tfc.jei.raw_hide_knapping": "Raw Hide Knapping", + "metal.tfg.redstone": "Redstone", + "metal.tfg.red_alloy": "Red Alloy", + "metal.tfg.tin_alloy": "Tin Alloy", + "metal.tfg.lead": "Lead", + "metal.tfg.invar": "Invar", + "metal.tfg.potin": "Potin", + "metal.tfg.cobalt": "Cobalt", + "metal.tfg.cobalt_brass": "Cobalt Brass", + "metal.tfg.aluminium_silicate": "Aluminium Silicate", + "trim_material.tfc.almandine_tfc": "Almandine", + "trim_material.tfc.andradite_tfc": "Andradite", + "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", + "trim_material.tfc.cinnabar_tfc": "Cinnabar", + "trim_material.tfc.coal_tfc": "Coal", + "trim_material.tfc.diamond_tfc": "Diamond", + "trim_material.tfc.emerald_tfc": "Emerald", + "trim_material.tfc.green_sapphire_tfc": "Green Sapphire", + "trim_material.tfc.grossular_tfc": "Grossular", + "trim_material.tfc.rutile_tfc": "Rutile", + "trim_material.tfc.lazurite_tfc": "Lazurite", + "trim_material.tfc.pyrope_tfc": "Pyrope", + "trim_material.tfc.rock_salt_tfc": "Rock Salt", + "trim_material.tfc.ruby_tfc": "Ruby", + "trim_material.tfc.salt_tfc": "salt", + "trim_material.tfc.sapphire_tfc": "Sapphire", + "trim_material.tfc.sodalite_tfc": "Sodalite", + "trim_material.tfc.coke_tfc": "Coke", + "trim_material.tfc.spessartine_tfc": "Spessartine", + "trim_material.tfc.topaz_tfc": "Topaz", + "trim_material.tfc.uvarovite_tfc": "Uvarovite", + "trim_material.tfc.nether_quartz_tfc": "Nether Quartz", + "trim_material.tfc.certus_quartz_tfc": "Certus Quartz", + "trim_material.tfc.quartzite_tfc": "Quartzite", + "trim_material.tfc.realgar_tfc": "Realgar", + "trim_material.tfc.malachite_tfc": "Malachite", + "trim_material.tfc.glass_tfc": "Glass", + "trim_material.tfc.olivine_tfc": "Olivine", + "trim_material.tfc.opal_tfc": "Opal", + "trim_material.tfc.amethyst_tfc": "Amethyst", + "trim_material.tfc.lapis_tfc": "Lapis", + "trim_material.tfc.apatite_tfc": "Apatite", + "trim_material.tfc.red_garnet_tfc": "Red Garnet", + "trim_material.tfc.yellow_garnet_tfc": "Yellow Garnet", + "trim_material.tfc.monazite_tfc": "Monazite", + "trim_material.tfc.rose_quartz_tfc": "Rose Quartz", + "trim_material.tfc.fluix_tfc": "Fluix", + "trim_material.tfc.silver_tfc": "Silver", + "trim_material.tfc.sterling_silver_tfc": "Sterling Silver", + "trim_material.tfc.gold_tfc": "Gold", + "trim_material.tfc.rose_gold_tfc": "Rose Gold", + "trim_material.tfc.nickel_tfc": "Nickel", + "trim_material.tfc.platinum_tfc": "Platinum", + "trim_material.tfc.titanium_tfc": "Titanium", + "trim_material.tfc.bismuth_tfc": "Bismuth", + "trim_material.tfc.neutronium_tfc": "Neutronium", + "trim_material.tfc.pyrite_tfc": "Pyrite", + "trim_material.tfc.redx_tfc": "RedX" } \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index ea1f82e0f..2bd81758f 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -475,6 +475,9 @@ "item.tfg.food.freeze_dried.melon_slice": "Freeze Dried Melon Slice", "item.tfg.food.freeze_dried.fig": "Freeze Dried Fig", "item.tfg.food.freeze_dried.pineapple": "Freeze Dried Pineapple", + "item.tfg.food.freeze_dried.blossom_berry": "Freeze Dried Blossom Berry", + "item.tfg.food.freeze_dried.shadow_berry": "Freeze Dried Nox Berry", + "item.tfg.food.freeze_dried.cave_pumpkin": "Freeze Dried Bulbkin Chunks", "item.tfg.food.calorie_paste": "Calorie Paste", "item.tfg.food.meal_bag": "Meal Bag", "item.tfg.food.ice_soup": "Ice Soup", From a07f70594dee8b2c644b6ed39bf8cafdb70d4073 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 12 Aug 2025 11:25:38 +0100 Subject: [PATCH 027/158] freeze dried mars fruit --- .../item/food/freeze_dried_blossom_berry.png | Bin 0 -> 415 bytes .../item/food/freeze_dried_cave_pumpkin.png | Bin 0 -> 417 bytes .../item/food/freeze_dried_shadow_berry.png | Bin 0 -> 412 bytes kubejs/server_scripts/tfg/data.js | 4 ++-- kubejs/startup_scripts/tfg/constants.js | 5 ++++- 5 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 kubejs/assets/tfg/textures/item/food/freeze_dried_blossom_berry.png create mode 100644 kubejs/assets/tfg/textures/item/food/freeze_dried_cave_pumpkin.png create mode 100644 kubejs/assets/tfg/textures/item/food/freeze_dried_shadow_berry.png diff --git a/kubejs/assets/tfg/textures/item/food/freeze_dried_blossom_berry.png b/kubejs/assets/tfg/textures/item/food/freeze_dried_blossom_berry.png new file mode 100644 index 0000000000000000000000000000000000000000..f047affab0bba99f116663610eb6cb0904b97dcc GIT binary patch literal 415 zcmV;Q0bu@#P)LlQD|IKoo{Q!(KqhY-1A;6dSvMkj}O745so7iWk@> zV6_KGA=xwJ1XgykDJI*ba6p(~Wh>cY$zV*f7W-G3$(!%}@68+dr#fvv!Z0k#@8xpY z8u#)SeKZ>3IF5l`E*Dm-RRz{a4#TjpZQHDc5IBxQmSybsdjPc71VPZT+Oi8F5JH&X z!{LC|n#E#)=XuXd&|24k0C5~6r6dS~P9xyn{%qF;;GCZLdWSsEYl&J*D0NOx09>zE z;J1-a0j}#Z+jY%hc}&Rj9NV@{^BMu$?Y5ZD=atN*Znql%N~v}SW#iWCwb_%$gzt}6 z`u)DS!h6-4SRR(gq>^0-fl`VniYl{X0GrLG7!HTV=BJ-A7!0s1i?_+7cC9slQp(iV z>-7Lg(-eU5cx>k2QH`VQ`@VTd)9Dl`WuyIygL^#$7ELjwegIOqkwiH_`oI7H002ov JPDHLkV1iWEx=R26 literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/food/freeze_dried_cave_pumpkin.png b/kubejs/assets/tfg/textures/item/food/freeze_dried_cave_pumpkin.png new file mode 100644 index 0000000000000000000000000000000000000000..57520e5a8052ab7278c49e330ff8a4e6c5578407 GIT binary patch literal 417 zcmV;S0bc%zP)Llf7yJK@^3*UD79oQ*ARKC^k015U|tAXVA)LP<)1k zeTJ*;h_ z8+Uh$z0>I+rF3M6!-3gsRv@cnj^j9MG#YL%gg{EkZntB-UISo^Aq+#$ugflkKnUT2 zH=7N{7{=o<{eJ&%3&xldA;4<2LMcTUhF&GXrTnMI2LO)yE$RcTwWUP07IGZ-TL4a{ z6Yx{WOH^9u^?G<;Z|?EgSgid-N?DL!QV>N^HX4lznRBFR3V_zS-a=lu`F!rq&c^ck zeowR6bS=DTA%A=}zXeOv6d?p!YnIDpVRjtBVzJ2D?Y5H{y(n6(7QXK@96p!YS|ZR| zJAXkC0FWdJ0Nrla&A~M)M|m=txQ{d#3{Xl{$}cFm#8qHc6_eu|yMmK%OF$!V00000 LNkvXXu0mjfD@m@i literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/food/freeze_dried_shadow_berry.png b/kubejs/assets/tfg/textures/item/food/freeze_dried_shadow_berry.png new file mode 100644 index 0000000000000000000000000000000000000000..fd868713c265c1c5a3a368a929ed05f16923e819 GIT binary patch literal 412 zcmV;N0b~A&P)Lld*2XFc5}6qCP@Au|z@wF_fuDNZHufyOD`!0PzS_ zDyB|Mo>-al1T4UgjD*DE$rckMG##o~2}#P(e~O*+cmJKw@J}`Ben=_P?0Yhq)W*I1 zMelaI1VP|nm&=9ebXtH_lBJZX@B3~ogdhk4&gV0m%?1Et3~?Mcyt?c{2!s$Wc(>bO zjA1+;6NcgQ5{xk=AV88ND5Z$wxKRnn+g~ql0PMF1KIALb+ESw05;E<#2LP_uEAZRM zr+|LH&w6=thfh{vt;P3!*St!=VzEd^qfsGqru+R4fY!R+LDsn0Z07b(R`L1uMyu6w zSD06+iP_ { event.foodItem('betterend:cave_pumpkin_chunks', food => { food.hunger(4) food.saturation(1) - food.decayModifier(1.5) + food.decayModifier(2.5) food.water(5) - food.fruit(0.75) + food.fruit(0.8) }) event.foodItem('betterend:cave_pumpkin_pie_dough', food => { diff --git a/kubejs/startup_scripts/tfg/constants.js b/kubejs/startup_scripts/tfg/constants.js index 7c306fa9a..ae065b09d 100644 --- a/kubejs/startup_scripts/tfg/constants.js +++ b/kubejs/startup_scripts/tfg/constants.js @@ -160,5 +160,8 @@ global.FOOD_FRUIT = [ {name: 'pumpkin_chunks', id: 'tfc:food/pumpkin_chunks', saturation: 1, water: 5, fruit: 0.8, decay: 2.25}, {name: 'melon_slice', id: 'tfc:food/melon_slice', saturation: 0.2, water: 5, fruit: 0.8, decay: 2.25}, {name: 'fig', id: 'firmalife:food/fig', saturation: 1, water: 5, fruit: 0.9, decay: 1}, - {name: 'pineapple', id: 'firmalife:food/pineapple', saturation: 1, water: 1, fruit: 0.8, decay: 4.5} + {name: 'pineapple', id: 'firmalife:food/pineapple', saturation: 1, water: 1, fruit: 0.8, decay: 4.5}, + {name: 'cave_pumpkin', id: 'betterend:cave_pumpkin_chunks', saturation: 1, water: 5, fruit: 0.8, decay: 2.25 }, + {name: 'blossom_berry', id: 'betterend:blossom_berry_product', saturation: 1, water: 7.5, fruit: 1.5, decay: 2 }, + {name: 'shadow_berry', id: 'betterend:shadow_berry_cooked', saturation: 1, water: 5, fruit: 1.5, decay: 2 } ]; From 1185d6f41ceb258c12edcf84de8f3e93da033364 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 12 Aug 2025 11:25:52 +0100 Subject: [PATCH 028/158] adjusted rarity of mars crop features --- .../data/tfg/worldgen/placed_feature/mars/crop/amber_root.json | 2 +- .../tfg/worldgen/placed_feature/mars/crop/blossom_berry.json | 2 +- .../tfg/worldgen/placed_feature/mars/crop/bolux_mushroom.json | 2 +- .../tfg/worldgen/placed_feature/mars/crop/cave_pumpkin.json | 2 +- .../tfg/worldgen/placed_feature/mars/crop/chorus_mushroom.json | 2 +- .../tfg/worldgen/placed_feature/mars/crop/shadow_berry.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/amber_root.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/amber_root.json index e439f93ce..a754268f1 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/amber_root.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/amber_root.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 50 + "chance": 60 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/blossom_berry.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/blossom_berry.json index 5cff0483f..8be00bd3c 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/blossom_berry.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/blossom_berry.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 50 + "chance": 60 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/bolux_mushroom.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/bolux_mushroom.json index 42cd2d5c5..d7b0ae0b2 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/bolux_mushroom.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/bolux_mushroom.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 50 + "chance": 60 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/cave_pumpkin.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/cave_pumpkin.json index f571295d2..639a59c9c 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/cave_pumpkin.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/cave_pumpkin.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 50 + "chance": 60 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/chorus_mushroom.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/chorus_mushroom.json index 3419830cf..73f8b11f3 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/chorus_mushroom.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/chorus_mushroom.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 50 + "chance": 60 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/shadow_berry.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/shadow_berry.json index 298f9b0bd..510bb64d6 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/shadow_berry.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/shadow_berry.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 50 + "chance": 60 }, { "type": "minecraft:in_square" From 0da4ff3e8efcc573dad329c80f6e8a8a58bdd31c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 12 Aug 2025 11:44:43 +0100 Subject: [PATCH 029/158] hollow shell can be crushed for flux now --- kubejs/server_scripts/firmalife/tags.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/firmalife/tags.js b/kubejs/server_scripts/firmalife/tags.js index be575eae0..36da0e53d 100644 --- a/kubejs/server_scripts/firmalife/tags.js +++ b/kubejs/server_scripts/firmalife/tags.js @@ -18,10 +18,10 @@ const registerFirmaLifeItemTags = (event) => { event.add('tfc:foods/usable_in_salad', 'firmalife:food/pickled_egg') + event.add('tfc:fluxstone', 'firmalife:hollow_shell') + // Удаление тегов у руд event.removeAllTagsFrom("/tfc:ore/[^*]+/[^*]+/") - - } const registerFirmaLifeBlockTags = (event) => { From e717e9d0d62e9cdaab71b09d481faf011ff1b0f3 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 12 Aug 2025 11:52:13 +0100 Subject: [PATCH 030/158] removed volcano feature because it crashes --- kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index 337134484..cc0570446 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -28,7 +28,7 @@ [ "tfc:erosion" ], - "#tfc:feature/volcanoes", + [], [ "tfg:earth/geode/amethyst", "tfg:earth/geode/barite", From 63a1f0de76062d275bcbde3be5c7ba232636f942 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 12 Aug 2025 12:37:19 +0100 Subject: [PATCH 031/158] treeeeeeeeees --- kubejs/assets/beneath/lang/en_us.json | 2 + kubejs/assets/tfc/lang/en_us.json | 130 +++++++++--------- .../mars/surface/pitcher_plant.json | 68 +++++++++ .../mars/surface/torchflower.json | 40 ++++++ .../configured_feature/mars/tree/crimson.json | 10 ++ .../mars/tree/crimson_amber.json | 24 ++++ .../mars/tree/crimson_dead.json | 47 +++++++ .../mars/tree/crimson_rusticus.json | 24 ++++ .../mars/tree/crimson_sangnum.json | 24 ++++ .../configured_feature/mars/tree/warped.json | 10 ++ .../mars/tree/warped_amber.json | 24 ++++ .../mars/tree/warped_dead.json | 47 +++++++ .../mars/tree/warped_rusticus.json | 24 ++++ .../mars/tree/warped_sangnum.json | 24 ++++ .../mars/surface/amber_grass.json | 2 +- .../mars/surface/pitcher_plant.json | 19 +++ .../mars/surface/torchflower.json | 19 +++ .../placed_feature/mars/tree/crimson.json | 4 + .../mars/tree/crimson_amber.json | 4 + .../mars/tree/crimson_dead.json | 4 + .../mars/tree/crimson_rusticus.json | 4 + .../mars/tree/crimson_sangnum.json | 4 + .../placed_feature/mars/tree/warped.json | 4 + .../mars/tree/warped_amber.json | 4 + .../placed_feature/mars/tree/warped_dead.json | 4 + .../mars/tree/warped_rusticus.json | 4 + .../mars/tree/warped_sangnum.json | 4 + kubejs/server_scripts/ad_astra/tags.js | 16 ++- kubejs/server_scripts/beneath/tags.js | 10 ++ kubejs/server_scripts/main_server_script.js | 4 + kubejs/server_scripts/tfg/events.forests.js | 62 +++++++++ kubejs/server_scripts/tfg/tags.js | 4 + kubejs/startup_scripts/beneath/constants.js | 4 - 33 files changed, 601 insertions(+), 77 deletions(-) create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/surface/pitcher_plant.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/surface/torchflower.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_amber.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_dead.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_rusticus.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_sangnum.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_amber.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_dead.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_rusticus.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_sangnum.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/surface/pitcher_plant.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/surface/torchflower.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_amber.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_dead.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_rusticus.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_sangnum.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_amber.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_dead.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_rusticus.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_sangnum.json create mode 100644 kubejs/server_scripts/tfg/events.forests.js diff --git a/kubejs/assets/beneath/lang/en_us.json b/kubejs/assets/beneath/lang/en_us.json index 2b58fe4cc..059b62dfe 100644 --- a/kubejs/assets/beneath/lang/en_us.json +++ b/kubejs/assets/beneath/lang/en_us.json @@ -10,7 +10,9 @@ "block.beneath.crackrack": "Keratophyre", "block.beneath.soul_clay": "Muddy Clay", "block.beneath.wood.fallen_leaves.crimson": "Fallen Crimson Lamella", + "block.beneath.wood.leaves.crimson": "Crimson Lamella", "block.beneath.wood.fallen_leaves.warped": "Fallen Warped Lamella", + "block.beneath.wood.leaves.warped": "Warped Lamella", "item.beneath.cursed_hide": "Lavaproof Hide", "item.beneath.blackstone_brick": "Pyroxenite Brick", "item.beneath.cursecoal": "Anthracite", diff --git a/kubejs/assets/tfc/lang/en_us.json b/kubejs/assets/tfc/lang/en_us.json index 2d034321e..61aab90fe 100644 --- a/kubejs/assets/tfc/lang/en_us.json +++ b/kubejs/assets/tfc/lang/en_us.json @@ -1,67 +1,67 @@ { - "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", - "block.tfc.fluid.salt_water": "Sea Water", - "block.tfc.cauldron.salt_water": "Sea Water Cauldron", - "fluid.tfc.salt_water": "Sea Water", - "item.tfc.bucket.salt_water": "Sea Water Bucket", - "item.tfc.powder.saltpeter": "Saltpeter Powder", - "item.tfc.powder.sulfur": "Sulfur Powder", - "tfc.jei.raw_hide_knapping": "Raw Hide Knapping", - "metal.tfg.redstone": "Redstone", - "metal.tfg.red_alloy": "Red Alloy", - "metal.tfg.tin_alloy": "Tin Alloy", - "metal.tfg.lead": "Lead", - "metal.tfg.invar": "Invar", - "metal.tfg.potin": "Potin", - "metal.tfg.cobalt": "Cobalt", - "metal.tfg.cobalt_brass": "Cobalt Brass", - "metal.tfg.aluminium_silicate": "Aluminium Silicate", - "trim_material.tfc.almandine_tfc": "Almandine", - "trim_material.tfc.andradite_tfc": "Andradite", - "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", - "trim_material.tfc.cinnabar_tfc": "Cinnabar", - "trim_material.tfc.coal_tfc": "Coal", - "trim_material.tfc.diamond_tfc": "Diamond", - "trim_material.tfc.emerald_tfc": "Emerald", - "trim_material.tfc.green_sapphire_tfc": "Green Sapphire", - "trim_material.tfc.grossular_tfc": "Grossular", - "trim_material.tfc.rutile_tfc": "Rutile", - "trim_material.tfc.lazurite_tfc": "Lazurite", - "trim_material.tfc.pyrope_tfc": "Pyrope", - "trim_material.tfc.rock_salt_tfc": "Rock Salt", - "trim_material.tfc.ruby_tfc": "Ruby", - "trim_material.tfc.salt_tfc": "salt", - "trim_material.tfc.sapphire_tfc": "Sapphire", - "trim_material.tfc.sodalite_tfc": "Sodalite", - "trim_material.tfc.coke_tfc": "Coke", - "trim_material.tfc.spessartine_tfc": "Spessartine", - "trim_material.tfc.topaz_tfc": "Topaz", - "trim_material.tfc.uvarovite_tfc": "Uvarovite", - "trim_material.tfc.nether_quartz_tfc": "Nether Quartz", - "trim_material.tfc.certus_quartz_tfc": "Certus Quartz", - "trim_material.tfc.quartzite_tfc": "Quartzite", - "trim_material.tfc.realgar_tfc": "Realgar", - "trim_material.tfc.malachite_tfc": "Malachite", - "trim_material.tfc.glass_tfc": "Glass", - "trim_material.tfc.olivine_tfc": "Olivine", - "trim_material.tfc.opal_tfc": "Opal", - "trim_material.tfc.amethyst_tfc": "Amethyst", - "trim_material.tfc.lapis_tfc": "Lapis", - "trim_material.tfc.apatite_tfc": "Apatite", - "trim_material.tfc.red_garnet_tfc": "Red Garnet", - "trim_material.tfc.yellow_garnet_tfc": "Yellow Garnet", - "trim_material.tfc.monazite_tfc": "Monazite", - "trim_material.tfc.rose_quartz_tfc": "Rose Quartz", - "trim_material.tfc.fluix_tfc": "Fluix", - "trim_material.tfc.silver_tfc": "Silver", - "trim_material.tfc.sterling_silver_tfc": "Sterling Silver", - "trim_material.tfc.gold_tfc": "Gold", - "trim_material.tfc.rose_gold_tfc": "Rose Gold", - "trim_material.tfc.nickel_tfc": "Nickel", - "trim_material.tfc.platinum_tfc": "Platinum", - "trim_material.tfc.titanium_tfc": "Titanium", - "trim_material.tfc.bismuth_tfc": "Bismuth", - "trim_material.tfc.neutronium_tfc": "Neutronium", - "trim_material.tfc.pyrite_tfc": "Pyrite", - "trim_material.tfc.redx_tfc": "RedX" + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.tfc.fluid.salt_water": "Sea Water", + "block.tfc.cauldron.salt_water": "Sea Water Cauldron", + "fluid.tfc.salt_water": "Sea Water", + "item.tfc.bucket.salt_water": "Sea Water Bucket", + "item.tfc.powder.saltpeter": "Saltpeter Powder", + "item.tfc.powder.sulfur": "Sulfur Powder", + "tfc.jei.raw_hide_knapping": "Raw Hide Knapping", + "metal.tfg.redstone": "Redstone", + "metal.tfg.red_alloy": "Red Alloy", + "metal.tfg.tin_alloy": "Tin Alloy", + "metal.tfg.lead": "Lead", + "metal.tfg.invar": "Invar", + "metal.tfg.potin": "Potin", + "metal.tfg.cobalt": "Cobalt", + "metal.tfg.cobalt_brass": "Cobalt Brass", + "metal.tfg.aluminium_silicate": "Aluminium Silicate", + "trim_material.tfc.almandine_tfc": "Almandine", + "trim_material.tfc.andradite_tfc": "Andradite", + "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", + "trim_material.tfc.cinnabar_tfc": "Cinnabar", + "trim_material.tfc.coal_tfc": "Coal", + "trim_material.tfc.diamond_tfc": "Diamond", + "trim_material.tfc.emerald_tfc": "Emerald", + "trim_material.tfc.green_sapphire_tfc": "Green Sapphire", + "trim_material.tfc.grossular_tfc": "Grossular", + "trim_material.tfc.rutile_tfc": "Rutile", + "trim_material.tfc.lazurite_tfc": "Lazurite", + "trim_material.tfc.pyrope_tfc": "Pyrope", + "trim_material.tfc.rock_salt_tfc": "Rock Salt", + "trim_material.tfc.ruby_tfc": "Ruby", + "trim_material.tfc.salt_tfc": "salt", + "trim_material.tfc.sapphire_tfc": "Sapphire", + "trim_material.tfc.sodalite_tfc": "Sodalite", + "trim_material.tfc.coke_tfc": "Coke", + "trim_material.tfc.spessartine_tfc": "Spessartine", + "trim_material.tfc.topaz_tfc": "Topaz", + "trim_material.tfc.uvarovite_tfc": "Uvarovite", + "trim_material.tfc.nether_quartz_tfc": "Nether Quartz", + "trim_material.tfc.certus_quartz_tfc": "Certus Quartz", + "trim_material.tfc.quartzite_tfc": "Quartzite", + "trim_material.tfc.realgar_tfc": "Realgar", + "trim_material.tfc.malachite_tfc": "Malachite", + "trim_material.tfc.glass_tfc": "Glass", + "trim_material.tfc.olivine_tfc": "Olivine", + "trim_material.tfc.opal_tfc": "Opal", + "trim_material.tfc.amethyst_tfc": "Amethyst", + "trim_material.tfc.lapis_tfc": "Lapis", + "trim_material.tfc.apatite_tfc": "Apatite", + "trim_material.tfc.red_garnet_tfc": "Red Garnet", + "trim_material.tfc.yellow_garnet_tfc": "Yellow Garnet", + "trim_material.tfc.monazite_tfc": "Monazite", + "trim_material.tfc.rose_quartz_tfc": "Rose Quartz", + "trim_material.tfc.fluix_tfc": "Fluix", + "trim_material.tfc.silver_tfc": "Silver", + "trim_material.tfc.sterling_silver_tfc": "Sterling Silver", + "trim_material.tfc.gold_tfc": "Gold", + "trim_material.tfc.rose_gold_tfc": "Rose Gold", + "trim_material.tfc.nickel_tfc": "Nickel", + "trim_material.tfc.platinum_tfc": "Platinum", + "trim_material.tfc.titanium_tfc": "Titanium", + "trim_material.tfc.bismuth_tfc": "Bismuth", + "trim_material.tfc.neutronium_tfc": "Neutronium", + "trim_material.tfc.pyrite_tfc": "Pyrite", + "trim_material.tfc.redx_tfc": "RedX" } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pitcher_plant.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pitcher_plant.json new file mode 100644 index 000000000..058c49e57 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/pitcher_plant.json @@ -0,0 +1,68 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "tfc:if_then", + "config": { + "if": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:pitcher_plant", + "Properties": { + "half": "lower" + } + } + } + } + }, + "placement": [] + }, + "then": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:pitcher_plant", + "Properties": { + "half": "upper" + } + } + } + } + }, + "placement": [] + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "tfg:mars_soil" + } + ] + } + } + ] + }, + "tries": 8, + "xz_spread": 16, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/torchflower.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/torchflower.json new file mode 100644 index 000000000..4c58a4854 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/torchflower.json @@ -0,0 +1,40 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:torchflower" + } + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "tfg:mars_soil" + } + ] + } + } + ] + }, + "tries": 8, + "xz_spread": 16, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson.json new file mode 100644 index 000000000..40b85088f --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson.json @@ -0,0 +1,10 @@ +{ + "type": "tfc:multiple", + "config": { + "features": [ + "tfg:mars/tree/crimson_amber", + "tfg:mars/tree/crimson_rusticus", + "tfg:mars/tree/crimson_sangnum" + ] + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_amber.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_amber.json new file mode 100644 index 000000000..db306261e --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_amber.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:huge_fungus", + "config": { + "decor_state": { + "Name": "beneath:wood/leaves/crimson" + }, + "hat_state": { + "Name": "minecraft:nether_wart_block" + }, + "planted": false, + "replaceable_blocks": { + "type": "minecraft:replaceable" + }, + "stem_state": { + "Name": "beneath:wood/log/crimson", + "Properties": { + "axis": "y" + } + }, + "valid_base_block": { + "Name": "tfg:grass/amber_mycelium" + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_dead.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_dead.json new file mode 100644 index 000000000..57a31b85e --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_dead.json @@ -0,0 +1,47 @@ +{ + "type": "minecraft:tree", + "config": { + "decorators": [], + "dirt_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:mars_dirt" + } + }, + "foliage_placer": { + "type": "minecraft:blob_foliage_placer", + "height": 0, + "offset": 0, + "radius": 0 + }, + "foliage_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:air" + } + }, + "force_dirt": false, + "ignore_vines": true, + "minimum_size": { + "type": "minecraft:two_layers_feature_size", + "limit": 2, + "lower_size": 0, + "upper_size": 2 + }, + "trunk_placer": { + "type": "minecraft:straight_trunk_placer", + "base_height": 6, + "height_rand_a": 4, + "height_rand_b": 0 + }, + "trunk_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "beneath:wood/log/crimson", + "Properties": { + "axis": "y" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_rusticus.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_rusticus.json new file mode 100644 index 000000000..6ae00d9e9 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_rusticus.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:huge_fungus", + "config": { + "decor_state": { + "Name": "beneath:wood/leaves/crimson" + }, + "hat_state": { + "Name": "minecraft:nether_wart_block" + }, + "planted": false, + "replaceable_blocks": { + "type": "minecraft:replaceable" + }, + "stem_state": { + "Name": "beneath:wood/log/crimson", + "Properties": { + "axis": "y" + } + }, + "valid_base_block": { + "Name": "tfg:grass/rusticus_mycelium" + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_sangnum.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_sangnum.json new file mode 100644 index 000000000..3556eb889 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/crimson_sangnum.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:huge_fungus", + "config": { + "decor_state": { + "Name": "beneath:wood/leaves/crimson" + }, + "hat_state": { + "Name": "minecraft:nether_wart_block" + }, + "planted": false, + "replaceable_blocks": { + "type": "minecraft:replaceable" + }, + "stem_state": { + "Name": "beneath:wood/log/crimson", + "Properties": { + "axis": "y" + } + }, + "valid_base_block": { + "Name": "tfg:grass/sangnum_mycelium" + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped.json new file mode 100644 index 000000000..ae09354ad --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped.json @@ -0,0 +1,10 @@ +{ + "type": "tfc:multiple", + "config": { + "features": [ + "tfg:mars/tree/warped_amber", + "tfg:mars/tree/warped_rusticus", + "tfg:mars/tree/warped_sangnum" + ] + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_amber.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_amber.json new file mode 100644 index 000000000..4e373bad3 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_amber.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:huge_fungus", + "config": { + "decor_state": { + "Name": "beneath:wood/leaves/warped" + }, + "hat_state": { + "Name": "minecraft:warped_wart_block" + }, + "planted": false, + "replaceable_blocks": { + "type": "minecraft:replaceable" + }, + "stem_state": { + "Name": "beneath:wood/log/warped", + "Properties": { + "axis": "y" + } + }, + "valid_base_block": { + "Name": "tfg:grass/amber_mycelium" + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_dead.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_dead.json new file mode 100644 index 000000000..f32baa7d2 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_dead.json @@ -0,0 +1,47 @@ +{ + "type": "minecraft:tree", + "config": { + "decorators": [], + "dirt_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:mars_dirt" + } + }, + "foliage_placer": { + "type": "minecraft:blob_foliage_placer", + "height": 0, + "offset": 0, + "radius": 0 + }, + "foliage_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:air" + } + }, + "force_dirt": false, + "ignore_vines": true, + "minimum_size": { + "type": "minecraft:two_layers_feature_size", + "limit": 2, + "lower_size": 0, + "upper_size": 2 + }, + "trunk_placer": { + "type": "minecraft:straight_trunk_placer", + "base_height": 6, + "height_rand_a": 4, + "height_rand_b": 0 + }, + "trunk_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "beneath:wood/log/warped", + "Properties": { + "axis": "y" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_rusticus.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_rusticus.json new file mode 100644 index 000000000..5d8dae140 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_rusticus.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:huge_fungus", + "config": { + "decor_state": { + "Name": "beneath:wood/leaves/warped" + }, + "hat_state": { + "Name": "minecraft:warped_wart_block" + }, + "planted": false, + "replaceable_blocks": { + "type": "minecraft:replaceable" + }, + "stem_state": { + "Name": "beneath:wood/log/warped", + "Properties": { + "axis": "y" + } + }, + "valid_base_block": { + "Name": "tfg:grass/rusticus_mycelium" + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_sangnum.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_sangnum.json new file mode 100644 index 000000000..d06c69b7e --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/warped_sangnum.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:huge_fungus", + "config": { + "decor_state": { + "Name": "beneath:wood/leaves/warped" + }, + "hat_state": { + "Name": "minecraft:warped_wart_block" + }, + "planted": false, + "replaceable_blocks": { + "type": "minecraft:replaceable" + }, + "stem_state": { + "Name": "beneath:wood/log/warped", + "Properties": { + "axis": "y" + } + }, + "valid_base_block": { + "Name": "tfg:grass/sangnum_mycelium" + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/amber_grass.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/amber_grass.json index 758d5e645..d9f0a1579 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/amber_grass.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/amber_grass.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 8 + "count": 10 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pitcher_plant.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pitcher_plant.json new file mode 100644 index 000000000..003ab78db --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pitcher_plant.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:mars/surface/pitcher_plant", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/torchflower.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/torchflower.json new file mode 100644 index 000000000..19d41518f --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/torchflower.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:mars/surface/torchflower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson.json new file mode 100644 index 000000000..cdec23129 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/crimson", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_amber.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_amber.json new file mode 100644 index 000000000..c85334354 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_amber.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/crimson_amber", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_dead.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_dead.json new file mode 100644 index 000000000..60068ade0 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_dead.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/crimson_dead", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_rusticus.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_rusticus.json new file mode 100644 index 000000000..bde3f73d5 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_rusticus.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/crimson_rusticus", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_sangnum.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_sangnum.json new file mode 100644 index 000000000..d0c16ec7e --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/crimson_sangnum.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/crimson_sangnum", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped.json new file mode 100644 index 000000000..cdec23129 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/crimson", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_amber.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_amber.json new file mode 100644 index 000000000..349608694 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_amber.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/warped_amber", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_dead.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_dead.json new file mode 100644 index 000000000..041047393 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_dead.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/warped_dead", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_rusticus.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_rusticus.json new file mode 100644 index 000000000..5a4466843 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_rusticus.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/warped_rusticus", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_sangnum.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_sangnum.json new file mode 100644 index 000000000..c873e114b --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/warped_sangnum.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/warped_sangnum", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index a48b9fbb9..5588103bc 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -113,7 +113,7 @@ const registerAdAstraItemTags = (event) => { // these are log tags event.remove('ad_astra:aeronos_caps', 'ad_astra:aeronos_cap') event.remove('ad_astra:strophar_caps', 'ad_astra:strophar_cap') - + global.AD_ASTRA_WOOD.forEach(wood => { if (wood.log) { @@ -400,6 +400,7 @@ const registerAdAstraPlacedFeatures = (event) => { event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/flammalix") event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/lutebus") event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/orango") + event.add("tfg:mars_amber_small_plants", "tfg:mars/surface/torchflower") event.add("tfg:mars_rusticus_small_plants", "tfg:mars/crop/amber_root") event.add("tfg:mars_rusticus_small_plants", "tfg:mars/crop/blossom_berry") @@ -412,7 +413,9 @@ const registerAdAstraPlacedFeatures = (event) => { event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/lamellarium") event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/lutebus") event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/orango") + event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/pitcher_plant") event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/ruscus") + event.add("tfg:mars_rusticus_small_plants", "tfg:mars/surface/torchflower") event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/blossom_berry") event.add("tfg:mars_sangnum_small_plants", "tfg:mars/crop/bolux_mushroom") @@ -424,26 +427,25 @@ const registerAdAstraPlacedFeatures = (event) => { event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/flamaea") event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/globulagus") event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/lamellarium") + event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/pitcher_plant") event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/ruscus") event.add("tfg:mars_global_small_plants", "tfg:mars/surface/small_amaranita_mushroom") // TODO - event.add("tfg:mars_trees", "tfg:mars/surface/strophar_huge") - event.add("tfg:mars_trees", "tfg:mars/surface/aeronos_huge") - event.add("tfg:mars_trees", "species:alphacene_mushroom") + //event.add("tfg:mars_trees", "species:alphacene_mushroom") event.add("tfg:mars_global_small_plants", "tfg:mars/surface/aeronos_patch") event.add("tfg:mars_global_small_plants", "tfg:mars/surface/strophar_patch") - event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_trees") + event.add("tfg:mars_amber_vegetal_decoration", 'tfg:mars_forest') event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_amber_small_plants") event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_global_small_plants") - event.add("tfg:mars_rusticus_vegetal_decoration", "#tfg:mars_trees") + event.add("tfg:mars_rusticus_vegetal_decoration", 'tfg:mars_forest') event.add("tfg:mars_rusticus_vegetal_decoration", "#tfg:mars_rusticus_small_plants") event.add("tfg:mars_rusticus_vegetal_decoration", "#tfg:mars_global_small_plants") - event.add("tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_trees") + event.add("tfg:mars_sangnum_vegetal_decoration", 'tfg:mars_forest') event.add("tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_sangnum_small_plants") event.add("tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_global_small_plants") diff --git a/kubejs/server_scripts/beneath/tags.js b/kubejs/server_scripts/beneath/tags.js index 71c0b81c5..df455effa 100644 --- a/kubejs/server_scripts/beneath/tags.js +++ b/kubejs/server_scripts/beneath/tags.js @@ -20,6 +20,11 @@ const registerBeneathBlockTags = (event) => { event.add('beneath:blackstone_decor', 'minecraft:blackstone'); event.remove('beneath:blackstone') + + event.remove('minecraft:leaves', 'beneath:wood/leaves/crimson') + event.remove('minecraft:leaves', 'beneath:wood/leaves/warped') + event.add('tfg:do_not_destroy_in_space', 'beneath:wood/leaves/crimson') + event.add('tfg:do_not_destroy_in_space', 'beneath:wood/leaves/warped') } const registerBeneathItemTags = (event) => { @@ -37,4 +42,9 @@ const registerBeneathItemTags = (event) => { event.add('forge:mushrooms', '#beneath:mushrooms') event.remove('beneath:sparks_on_sulfur') + + event.remove('minecraft:leaves', 'beneath:wood/leaves/crimson') + event.remove('minecraft:leaves', 'beneath:wood/leaves/warped') + event.add('tfg:do_not_destroy_in_space', 'beneath:wood/leaves/crimson') + event.add('tfg:do_not_destroy_in_space', 'beneath:wood/leaves/warped') } \ No newline at end of file diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 919180713..6fd203e17 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -103,6 +103,10 @@ ServerEvents.tags('fluid', event => { registerVintageImprovementsFluidTags(event) }) +ServerEvents.tags('worldgen/configured_feature', event => { + registerTFGConfiguredFeatures(event) +}) + /** * Событие регистрации тегов структур. */ diff --git a/kubejs/server_scripts/tfg/events.forests.js b/kubejs/server_scripts/tfg/events.forests.js new file mode 100644 index 000000000..e663e10b4 --- /dev/null +++ b/kubejs/server_scripts/tfg/events.forests.js @@ -0,0 +1,62 @@ +// priority: 0 +"use strict"; + +TFCEvents.worldgenData(event => { + + event.forest('tfg:mars_forest', '#tfg:mars_forest_entries', + [ + event.forestTypesMapEntry('none', 0, 0, 0, 0, false, false, 0), + event.forestTypesMapEntry('sparse', [1, 3], 6, 0.08, 0, true, false, null), + event.forestTypesMapEntry('edge', 2, 10, null, 1, false, false, [0, 1]), + event.forestTypesMapEntry('normal', 5, 25, null, 1, true, false, null), + event.forestTypesMapEntry('old_growth', 7, 40, null, 1, false, true, [0, 1]) + ], + true, + placement => {} + ) + + event.forestEntry('tfg:mars/crimson_forest_entry', + climate => {}, // TODO: climate variation? + 'beneath:wood/wood/crimson', // bush log + 'beneath:wood/leaves/crimson', // bush leaves + 'beneath:wood/log/crimson', // fallen log + 'beneath:wood/fallen_leaves/crimson', // fallen leaves + [ // ground cover + 'minecraft:crimson_fungus', + 'beneath:wood/fallen_leaves/crimson', + 'beneath:wood/twig/crimson' + ], + 'tfg:mars/tree/crimson', // tree feature + 'tfg:mars/tree/crimson_dead', // dead tree feature + null, // old growth tree feature + null, // krummholz + null, // chance for old growth + null, // chance for old growth in non-old growth forests + null, // chance for a fallen tree + null, // chance for a dead tree + null, // true to spawn on ocean floor, false for world surface + placement => {} + ) + + event.forestEntry('tfg:mars/warped_forest_entry', + climate => {}, + 'beneath:wood/wood/warped', + 'beneath:wood/leaves/warped', + 'beneath:wood/log/warped', + 'beneath:wood/fallen_leaves/warped', + [ + 'minecraft:warped_fungus', + 'beneath:wood/fallen_leaves/warped', + 'beneath:wood/twig/warped' + ], + 'tfg:mars/tree/warped', + 'tfg:mars/tree/warped_dead', + null, null, null, null, null, null, null, + placement => {} + ) +}) + +function registerTFGForestConfiguredFeatures(event) { + event.add('tfg:mars_forest_entries', 'tfg:mars/crimson_forest_entry') + event.add('tfg:mars_forest_entries', 'tfg:mars/warped_forest_entry') +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 9070ccfa0..2bf19e011 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -590,6 +590,10 @@ const registerTFGBiomeTags = (event) => { // #endregion } +function registerTFGConfiguredFeatures(event) { + registerTFGForestConfiguredFeatures(event) +} + // Other space decoration is in ad_astra/tags.js const registerTFGPlacedFeatures = (event) => { diff --git a/kubejs/startup_scripts/beneath/constants.js b/kubejs/startup_scripts/beneath/constants.js index 9cb489194..86a0d999d 100644 --- a/kubejs/startup_scripts/beneath/constants.js +++ b/kubejs/startup_scripts/beneath/constants.js @@ -47,10 +47,6 @@ global.BENEATH_DISABLED_ITEMS = [ "beneath:wood/windmill/warped", "beneath:wood/boat/warped", - "beneath:wood/leaves/crimson", - "beneath:wood/fallen_leaves/crimson", "beneath:wood/sapling/crimson", - "beneath:wood/leaves/warped", - "beneath:wood/fallen_leaves/warped", "beneath:wood/sapling/warped" ]; \ No newline at end of file From b2a96fa67fa031036a8b3a58bb267ce28e6280bb Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 12 Aug 2025 12:49:39 +0100 Subject: [PATCH 032/158] use the same crimson/warped tree feature for old growth ones too --- kubejs/server_scripts/tfg/events.forests.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/tfg/events.forests.js b/kubejs/server_scripts/tfg/events.forests.js index e663e10b4..b7a3a61a3 100644 --- a/kubejs/server_scripts/tfg/events.forests.js +++ b/kubejs/server_scripts/tfg/events.forests.js @@ -28,7 +28,7 @@ TFCEvents.worldgenData(event => { ], 'tfg:mars/tree/crimson', // tree feature 'tfg:mars/tree/crimson_dead', // dead tree feature - null, // old growth tree feature + 'tfg:mars/tree/crimson', // old growth tree feature null, // krummholz null, // chance for old growth null, // chance for old growth in non-old growth forests @@ -51,7 +51,8 @@ TFCEvents.worldgenData(event => { ], 'tfg:mars/tree/warped', 'tfg:mars/tree/warped_dead', - null, null, null, null, null, null, null, + 'tfg:mars/tree/warped', + null, null, null, null, null, null, placement => {} ) }) From 76951b38f4eff2638cb3c8fae37aa42391c5d50a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Aug 2025 18:17:40 +0500 Subject: [PATCH 033/158] Merge pull request #1609 from TerraFirmaGreg-Team/dependabot/github_actions/dependencies-c622b6f1f3 Bump the dependencies group with 3 updates --- .github/workflows/build.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 175667515..8fd91a13c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: steps: - name: 📦 Checkout - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v5.0.0 with: fetch-depth: 0 @@ -215,7 +215,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v5.0.0 with: fetch-depth: 0 @@ -275,7 +275,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v5.0.0 - name: 🔄 Replace strings shell: bash @@ -287,7 +287,7 @@ jobs: sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/gui_main_menu.txt - name: 📝 Cache pakku - uses: actions/cache@v4.2.3 + uses: actions/cache@v4.2.4 id: cache with: path: build/.cache @@ -341,7 +341,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v5.0.0 - name: 🔄 Replace strings shell: bash @@ -354,7 +354,7 @@ jobs: sed -i -e "s/DEV/${VERSION}/g" .pakku/multimc-overrides/instance.cfg - name: 📝 Cache pakku - uses: actions/cache@v4.2.3 + uses: actions/cache@v4.2.4 id: cache with: path: build/.cache @@ -396,10 +396,10 @@ jobs: steps: - name: 📦 Checkout - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v5.0.0 - name: 📦 Download artifact - uses: actions/download-artifact@v4.3.0 + uses: actions/download-artifact@v5.0.0 with: merge-multiple: true @@ -473,7 +473,7 @@ jobs: fi - name: 📦 Download artifact - uses: actions/download-artifact@v4.3.0 + uses: actions/download-artifact@v5.0.0 with: merge-multiple: true @@ -523,7 +523,7 @@ jobs: fi - name: 📦 Download artifact - uses: actions/download-artifact@v4.3.0 + uses: actions/download-artifact@v5.0.0 with: merge-multiple: true From 60727603a6da12620cf85e6d566b5db54f9beab3 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Tue, 12 Aug 2025 22:17:57 +0500 Subject: [PATCH 034/158] Update LICENSE --- LICENSE | 827 +++++++++++--------------------------------------------- 1 file changed, 159 insertions(+), 668 deletions(-) diff --git a/LICENSE b/LICENSE index f288702d2..153d416dc 100644 --- a/LICENSE +++ b/LICENSE @@ -1,674 +1,165 @@ - GNU GENERAL PUBLIC LICENSE + GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. \ No newline at end of file From 9e9b5bfb55a0220da8ddfb297db6ba7163a5112f Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:45:38 -0500 Subject: [PATCH 035/158] stuff for core pr (#1612) * Add files via upload Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Add files via upload Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Add files via upload Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Add files via upload Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Add files via upload Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Add files via upload Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Add files via upload Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Add files via upload Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Add files via upload Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Update items.food.js Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Update constants.js Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Update data.js Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Update recipes.food.js Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> --------- Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> --- .../tfg/blockstates/large_nest_box.json | 140 +++++++++ .../blockstates/large_nest_box_warped.json | 140 +++++++++ .../large_nest_box/large_nest_box_empty.json | 75 +++++ .../large_nest_box_sniffer_0.json | 88 ++++++ .../large_nest_box_sniffer_1.json | 90 ++++++ .../large_nest_box_sniffer_2.json | 88 ++++++ .../large_nest_box_sniffer_3.json | 88 ++++++ .../large_nest_box_warped_empty.json | 75 +++++ .../large_nest_box_warped_sniffer_0.json | 88 ++++++ .../large_nest_box_warped_sniffer_1.json | 90 ++++++ .../large_nest_box_warped_sniffer_2.json | 88 ++++++ .../large_nest_box_warped_sniffer_3.json | 88 ++++++ .../tfg/models/item/large_nest_box.json | 287 ++++++++++++++++++ .../models/item/large_nest_box_warped.json | 287 ++++++++++++++++++ .../assets/tfg/models/item/sniffer_egg.json | 6 + .../models/item/spawn_egg/glacian_ram.json | 6 + .../tfg/models/item/spawn_egg/sniffer.json | 6 + .../block/large_nest/large_nest_sniffer_0.png | Bin 0 -> 3882 bytes .../large_nest_warped_sniffer_0.png | Bin 0 -> 8139 bytes .../item/food/cooked_glacian_mutton.png | Bin 0 -> 887 bytes .../item/food/cooked_sniffer_beef.png | Bin 0 -> 952 bytes .../textures/item/food/raw_glacian_mutton.png | Bin 0 -> 897 bytes .../textures/item/food/raw_sniffer_beef.png | Bin 0 -> 977 bytes .../tfg/loot_tables/entities/glacian_ram.json | 60 ++++ .../tfg/loot_tables/entities/sniffer.json | 60 ++++ kubejs/server_scripts/tfg/data.js | 28 +- kubejs/server_scripts/tfg/recipes.food.js | 6 + kubejs/startup_scripts/tfc/constants.js | 4 +- kubejs/startup_scripts/tfg/items.food.js | 32 +- 29 files changed, 1917 insertions(+), 3 deletions(-) create mode 100644 kubejs/assets/tfg/blockstates/large_nest_box.json create mode 100644 kubejs/assets/tfg/blockstates/large_nest_box_warped.json create mode 100644 kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_empty.json create mode 100644 kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_sniffer_0.json create mode 100644 kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_sniffer_1.json create mode 100644 kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_sniffer_2.json create mode 100644 kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_sniffer_3.json create mode 100644 kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_empty.json create mode 100644 kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_sniffer_0.json create mode 100644 kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_sniffer_1.json create mode 100644 kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_sniffer_2.json create mode 100644 kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_sniffer_3.json create mode 100644 kubejs/assets/tfg/models/item/large_nest_box.json create mode 100644 kubejs/assets/tfg/models/item/large_nest_box_warped.json create mode 100644 kubejs/assets/tfg/models/item/sniffer_egg.json create mode 100644 kubejs/assets/tfg/models/item/spawn_egg/glacian_ram.json create mode 100644 kubejs/assets/tfg/models/item/spawn_egg/sniffer.json create mode 100644 kubejs/assets/tfg/textures/block/large_nest/large_nest_sniffer_0.png create mode 100644 kubejs/assets/tfg/textures/block/large_nest/large_nest_warped_sniffer_0.png create mode 100644 kubejs/assets/tfg/textures/item/food/cooked_glacian_mutton.png create mode 100644 kubejs/assets/tfg/textures/item/food/cooked_sniffer_beef.png create mode 100644 kubejs/assets/tfg/textures/item/food/raw_glacian_mutton.png create mode 100644 kubejs/assets/tfg/textures/item/food/raw_sniffer_beef.png create mode 100644 kubejs/data/tfg/loot_tables/entities/glacian_ram.json create mode 100644 kubejs/data/tfg/loot_tables/entities/sniffer.json diff --git a/kubejs/assets/tfg/blockstates/large_nest_box.json b/kubejs/assets/tfg/blockstates/large_nest_box.json new file mode 100644 index 000000000..93f899574 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/large_nest_box.json @@ -0,0 +1,140 @@ +{ + "variants": { + "facing=north,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + "facing=north,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=north,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=north,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + + + "facing=south,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=south,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=south,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=south,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + + + "facing=east,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=east,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=east,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + "facing=east,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + + + "facing=west,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=west,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + + }, + "facing=west,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=west,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + + }, + + + "facing=north,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0" + }, + "facing=north,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 90 + }, + "facing=north,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 270 + }, + "facing=north,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 180 + }, + + "facing=south,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 180 + }, + "facing=south,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 270 + }, + "facing=south,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 90 + }, + "facing=south,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3" + }, + + "facing=east,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 90 + }, + "facing=east,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 180 + }, + "facing=east,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2" + }, + "facing=east,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 270 + }, + + "facing=west,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 270 + }, + "facing=west,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1" + + }, + "facing=west,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 180 + }, + "facing=west,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 90 + + } + + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/large_nest_box_warped.json b/kubejs/assets/tfg/blockstates/large_nest_box_warped.json new file mode 100644 index 000000000..89e95bf8a --- /dev/null +++ b/kubejs/assets/tfg/blockstates/large_nest_box_warped.json @@ -0,0 +1,140 @@ +{ + "variants": { + "facing=north,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + "facing=north,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=north,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=north,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + + + "facing=south,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=south,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=south,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=south,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + + + "facing=east,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=east,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=east,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + "facing=east,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + + + "facing=west,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=west,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + + }, + "facing=west,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=west,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + + }, + + + "facing=north,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0" + }, + "facing=north,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 90 + }, + "facing=north,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 270 + }, + "facing=north,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 180 + }, + + "facing=south,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 180 + }, + "facing=south,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 270 + }, + "facing=south,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 90 + }, + "facing=south,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3" + }, + + "facing=east,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 90 + }, + "facing=east,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 180 + }, + "facing=east,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2" + }, + "facing=east,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 270 + }, + + "facing=west,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 270 + }, + "facing=west,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1" + + }, + "facing=west,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 180 + }, + "facing=west,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 90 + + } + + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_empty.json b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_empty.json new file mode 100644 index 000000000..63a73a15f --- /dev/null +++ b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_empty.json @@ -0,0 +1,75 @@ +{ + "parent": "minecraft:block/block", + "credit": "made with BlockBench", + "textures": { + "texture": "tfg:block/large_nest/large_nest_sniffer_0", + "particle": "tfg:block/large_nest/large_nest_sniffer_0" + }, + "elements": [ + { + "from": [4, 1, 12], + "to": [16, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 2, 13]}, + "faces": { + "north": {"uv": [3.5, 6.25, 5, 6.5], "texture": "texture"}, + "east": {"uv": [3.25, 6.25, 3.5, 6.5], "texture": "texture"}, + "south": {"uv": [5.25, 6.25, 6.75, 6.5], "texture": "texture"}, + "west": {"uv": [5, 6.25, 5.25, 6.5], "texture": "texture"}, + "up": {"uv": [5, 6.25, 3.5, 6], "texture": "texture"}, + "down": {"uv": [6.5, 6, 5, 6.25], "texture": "texture"} + } + }, + { + "from": [3, 0, 0], + "to": [16, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 0.5, 6.5]}, + "faces": { + "north": {"uv": [3.375, 5, 5, 5.125], "texture": "texture"}, + "east": {"uv": [1.75, 5, 3.375, 5.125], "texture": "texture"}, + "south": {"uv": [6.625, 5, 8.25, 5.125], "texture": "texture"}, + "west": {"uv": [5, 5, 6.625, 5.125], "texture": "texture"}, + "up": {"uv": [5, 5, 3.375, 3.375], "texture": "texture"}, + "down": {"uv": [6.625, 3.375, 5, 5], "texture": "texture"} + } + }, + { + "from": [3, 3, 13], + "to": [16, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 3.5, 14]}, + "faces": { + "north": {"uv": [4.5, 5.375, 6.125, 5.5], "texture": "texture"}, + "east": {"uv": [4.25, 5.375, 4.5, 5.5], "texture": "texture"}, + "south": {"uv": [6.375, 5.375, 8, 5.5], "texture": "texture"}, + "west": {"uv": [6.125, 5.375, 6.375, 5.5], "texture": "texture"}, + "up": {"uv": [6.125, 5.375, 4.5, 5.125], "texture": "texture"}, + "down": {"uv": [7.75, 5.125, 6.125, 5.375], "texture": "texture"} + } + }, + { + "from": [1, 3, 0], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 3.5, 7.5]}, + "faces": { + "north": {"uv": [1.875, 7, 2.125, 7.125], "texture": "texture"}, + "east": {"uv": [0, 7, 1.875, 7.125], "texture": "texture"}, + "south": {"uv": [4, 7, 4.25, 7.125], "texture": "texture"}, + "west": {"uv": [2.125, 7, 4, 7.125], "texture": "texture"}, + "up": {"uv": [2.125, 7, 1.875, 5.125], "texture": "texture"}, + "down": {"uv": [2.375, 5.125, 2.125, 7], "texture": "texture"} + } + }, + { + "from": [2, 1, 0], + "to": [4, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 2, 7]}, + "faces": { + "north": {"uv": [5.75, 6.875, 6, 7.125], "texture": "texture"}, + "east": {"uv": [4, 6.875, 5.75, 7.125], "texture": "texture"}, + "south": {"uv": [7.75, 6.875, 8, 7.125], "texture": "texture"}, + "west": {"uv": [6, 6.875, 7.75, 7.125], "texture": "texture"}, + "up": {"uv": [6, 6.875, 5.75, 5.125], "texture": "texture"}, + "down": {"uv": [6.25, 5.125, 6, 6.875], "texture": "texture"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_sniffer_0.json b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_sniffer_0.json new file mode 100644 index 000000000..f69fe6584 --- /dev/null +++ b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_sniffer_0.json @@ -0,0 +1,88 @@ +{ + "parent": "minecraft:block/block", + "credit": "made with BlockBench", + "textures": { + "texture": "tfg:block/large_nest/large_nest_sniffer_0", + "particle": "tfg:block/large_nest/large_nest_sniffer_0" + }, + "elements": [ + { + "from": [4, 1, 12], + "to": [16, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 2, 13]}, + "faces": { + "north": {"uv": [3.5, 6.25, 5, 6.5], "texture": "texture"}, + "east": {"uv": [3.25, 6.25, 3.5, 6.5], "texture": "texture"}, + "south": {"uv": [5.25, 6.25, 6.75, 6.5], "texture": "texture"}, + "west": {"uv": [5, 6.25, 5.25, 6.5], "texture": "texture"}, + "up": {"uv": [5, 6.25, 3.5, 6], "texture": "texture"}, + "down": {"uv": [6.5, 6, 5, 6.25], "texture": "texture"} + } + }, + { + "from": [3, 0, 0], + "to": [16, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 0.5, 6.5]}, + "faces": { + "north": {"uv": [3.375, 5, 5, 5.125], "texture": "texture"}, + "east": {"uv": [1.75, 5, 3.375, 5.125], "texture": "texture"}, + "south": {"uv": [6.625, 5, 8.25, 5.125], "texture": "texture"}, + "west": {"uv": [5, 5, 6.625, 5.125], "texture": "texture"}, + "up": {"uv": [5, 5, 3.375, 3.375], "texture": "texture"}, + "down": {"uv": [6.625, 3.375, 5, 5], "texture": "texture"} + } + }, + { + "from": [3, 3, 13], + "to": [16, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 3.5, 14]}, + "faces": { + "north": {"uv": [4.5, 5.375, 6.125, 5.5], "texture": "texture"}, + "east": {"uv": [4.25, 5.375, 4.5, 5.5], "texture": "texture"}, + "south": {"uv": [6.375, 5.375, 8, 5.5], "texture": "texture"}, + "west": {"uv": [6.125, 5.375, 6.375, 5.5], "texture": "texture"}, + "up": {"uv": [6.125, 5.375, 4.5, 5.125], "texture": "texture"}, + "down": {"uv": [7.75, 5.125, 6.125, 5.375], "texture": "texture"} + } + }, + { + "from": [1, 3, 0], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 3.5, 7.5]}, + "faces": { + "north": {"uv": [1.875, 7, 2.125, 7.125], "texture": "texture"}, + "east": {"uv": [0, 7, 1.875, 7.125], "texture": "texture"}, + "south": {"uv": [4, 7, 4.25, 7.125], "texture": "texture"}, + "west": {"uv": [2.125, 7, 4, 7.125], "texture": "texture"}, + "up": {"uv": [2.125, 7, 1.875, 5.125], "texture": "texture"}, + "down": {"uv": [2.375, 5.125, 2.125, 7], "texture": "texture"} + } + }, + { + "from": [2, 1, 0], + "to": [4, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 2, 7]}, + "faces": { + "north": {"uv": [5.75, 6.875, 6, 7.125], "texture": "texture"}, + "east": {"uv": [4, 6.875, 5.75, 7.125], "texture": "texture"}, + "south": {"uv": [7.75, 6.875, 8, 7.125], "texture": "texture"}, + "west": {"uv": [6, 6.875, 7.75, 7.125], "texture": "texture"}, + "up": {"uv": [6, 6.875, 5.75, 5.125], "texture": "texture"}, + "down": {"uv": [6.25, 5.125, 6, 6.875], "texture": "texture"} + } + }, + { + "from": [6, 1, 1], + "to": [15, 14, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 1, 5]}, + "faces": { + "north": {"uv": [1.25, 1.25, 2.375, 2.875], "texture": "texture"}, + "east": {"uv": [0, 1.25, 1.25, 2.875], "texture": "texture"}, + "south": {"uv": [3.625, 1.25, 4.75, 2.875], "texture": "texture"}, + "west": {"uv": [2.375, 1.25, 3.625, 2.875], "texture": "texture"}, + "up": {"uv": [2.375, 1.25, 1.25, 0], "texture": "texture"}, + "down": {"uv": [3.5, 0, 2.375, 1.25], "texture": "texture"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_sniffer_1.json b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_sniffer_1.json new file mode 100644 index 000000000..01c129e58 --- /dev/null +++ b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_sniffer_1.json @@ -0,0 +1,90 @@ +{ + "parent": "minecraft:block/block", + "credit": "made with BlockBench", + "textures": { + "texture": "tfg:block/large_nest/large_nest_sniffer_0", + "particle": "tfg:block/large_nest/large_nest_sniffer_0" + }, + "elements": [ + { + "from": [4, 1, 12], + "to": [16, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 2, 13]}, + "faces": { + "north": {"uv": [3.5, 6.25, 5, 6.5], "texture": "texture"}, + "east": {"uv": [3.25, 6.25, 3.5, 6.5], "texture": "texture"}, + "south": {"uv": [5.25, 6.25, 6.75, 6.5], "texture": "texture"}, + "west": {"uv": [5, 6.25, 5.25, 6.5], "texture": "texture"}, + "up": {"uv": [5, 6.25, 3.5, 6], "texture": "texture"}, + "down": {"uv": [6.5, 6, 5, 6.25], "texture": "texture"} + } + }, + { + "from": [3, 0, 0], + "to": [16, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 0.5, 6.5]}, + "faces": { + "north": {"uv": [3.375, 5, 5, 5.125], "texture": "texture"}, + "east": {"uv": [1.75, 5, 3.375, 5.125], "texture": "texture"}, + "south": {"uv": [6.625, 5, 8.25, 5.125], "texture": "texture"}, + "west": {"uv": [5, 5, 6.625, 5.125], "texture": "texture"}, + "up": {"uv": [5, 5, 3.375, 3.375], "texture": "texture"}, + "down": {"uv": [6.625, 3.375, 5, 5], "texture": "texture"} + } + }, + { + "from": [3, 3, 13], + "to": [16, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 3.5, 14]}, + "faces": { + "north": {"uv": [4.5, 5.375, 6.125, 5.5], "texture": "texture"}, + "east": {"uv": [4.25, 5.375, 4.5, 5.5], "texture": "texture"}, + "south": {"uv": [6.375, 5.375, 8, 5.5], "texture": "texture"}, + "west": {"uv": [6.125, 5.375, 6.375, 5.5], "texture": "texture"}, + "up": {"uv": [6.125, 5.375, 4.5, 5.125], "texture": "texture"}, + "down": {"uv": [7.75, 5.125, 6.125, 5.375], "texture": "texture"} + } + }, + { + "from": [1, 3, 0], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 3.5, 7.5]}, + "faces": { + "north": {"uv": [1.875, 7, 2.125, 7.125], "texture": "texture"}, + "east": {"uv": [0, 7, 1.875, 7.125], "texture": "texture"}, + "south": {"uv": [4, 7, 4.25, 7.125], "texture": "texture"}, + "west": {"uv": [2.125, 7, 4, 7.125], "texture": "texture"}, + "up": {"uv": [2.125, 7, 1.875, 5.125], "texture": "texture"}, + "down": {"uv": [2.375, 5.125, 2.125, 7], "texture": "texture"} + } + }, + { + "from": [2, 1, 0], + "to": [4, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 2, 7]}, + "faces": { + "north": {"uv": [5.75, 6.875, 6, 7.125], "texture": "texture"}, + "east": {"uv": [4, 6.875, 5.75, 7.125], "texture": "texture"}, + "south": {"uv": [7.75, 6.875, 8, 7.125], "texture": "texture"}, + "west": {"uv": [6, 6.875, 7.75, 7.125], "texture": "texture"}, + "up": {"uv": [6, 6.875, 5.75, 5.125], "texture": "texture"}, + "down": {"uv": [6.25, 5.125, 6, 6.875], "texture": "texture"} + } + } + + , + { + "from": [9, 1, 2], + "to": [16, 12, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 1, 6]}, + "faces": { + "north": {"uv": [1.25, 1.25, 2.125, 2.625], "texture": "texture"}, + "east": {"uv": [0.125, 1.25, 1.25, 2.625], "texture": "texture"}, + "south": {"uv": [3.25, 1.25, 4.125, 2.625], "texture": "texture"}, + "west": {"uv": [2.125, 1.25, 3.25, 2.625], "texture": "texture"}, + "up": {"uv": [2.125, 1.25, 1.25, 0.125], "texture": "texture"}, + "down": {"uv": [3, 0.125, 2.125, 1.25], "texture": "texture"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_sniffer_2.json b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_sniffer_2.json new file mode 100644 index 000000000..4d990ecba --- /dev/null +++ b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_sniffer_2.json @@ -0,0 +1,88 @@ +{ + "parent": "minecraft:block/block", + "credit": "made with BlockBench", + "textures": { + "texture": "tfg:block/large_nest/large_nest_sniffer_0", + "particle": "tfg:block/large_nest/large_nest_sniffer_0" + }, + "elements": [ + { + "from": [4, 1, 12], + "to": [16, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 2, 13]}, + "faces": { + "north": {"uv": [3.5, 6.25, 5, 6.5], "texture": "texture"}, + "east": {"uv": [3.25, 6.25, 3.5, 6.5], "texture": "texture"}, + "south": {"uv": [5.25, 6.25, 6.75, 6.5], "texture": "texture"}, + "west": {"uv": [5, 6.25, 5.25, 6.5], "texture": "texture"}, + "up": {"uv": [5, 6.25, 3.5, 6], "texture": "texture"}, + "down": {"uv": [6.5, 6, 5, 6.25], "texture": "texture"} + } + }, + { + "from": [3, 0, 0], + "to": [16, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 0.5, 6.5]}, + "faces": { + "north": {"uv": [3.375, 5, 5, 5.125], "texture": "texture"}, + "east": {"uv": [1.75, 5, 3.375, 5.125], "texture": "texture"}, + "south": {"uv": [6.625, 5, 8.25, 5.125], "texture": "texture"}, + "west": {"uv": [5, 5, 6.625, 5.125], "texture": "texture"}, + "up": {"uv": [5, 5, 3.375, 3.375], "texture": "texture"}, + "down": {"uv": [6.625, 3.375, 5, 5], "texture": "texture"} + } + }, + { + "from": [3, 3, 13], + "to": [16, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 3.5, 14]}, + "faces": { + "north": {"uv": [4.5, 5.375, 6.125, 5.5], "texture": "texture"}, + "east": {"uv": [4.25, 5.375, 4.5, 5.5], "texture": "texture"}, + "south": {"uv": [6.375, 5.375, 8, 5.5], "texture": "texture"}, + "west": {"uv": [6.125, 5.375, 6.375, 5.5], "texture": "texture"}, + "up": {"uv": [6.125, 5.375, 4.5, 5.125], "texture": "texture"}, + "down": {"uv": [7.75, 5.125, 6.125, 5.375], "texture": "texture"} + } + }, + { + "from": [1, 3, 0], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 3.5, 7.5]}, + "faces": { + "north": {"uv": [1.875, 7, 2.125, 7.125], "texture": "texture"}, + "east": {"uv": [0, 7, 1.875, 7.125], "texture": "texture"}, + "south": {"uv": [4, 7, 4.25, 7.125], "texture": "texture"}, + "west": {"uv": [2.125, 7, 4, 7.125], "texture": "texture"}, + "up": {"uv": [2.125, 7, 1.875, 5.125], "texture": "texture"}, + "down": {"uv": [2.375, 5.125, 2.125, 7], "texture": "texture"} + } + }, + { + "from": [2, 1, 0], + "to": [4, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 2, 7]}, + "faces": { + "north": {"uv": [5.75, 6.875, 6, 7.125], "texture": "texture"}, + "east": {"uv": [4, 6.875, 5.75, 7.125], "texture": "texture"}, + "south": {"uv": [7.75, 6.875, 8, 7.125], "texture": "texture"}, + "west": {"uv": [6, 6.875, 7.75, 7.125], "texture": "texture"}, + "up": {"uv": [6, 6.875, 5.75, 5.125], "texture": "texture"}, + "down": {"uv": [6.25, 5.125, 6, 6.875], "texture": "texture"} + } + }, + { + "from": [7, 1, 0], + "to": [16, 13, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 1, 4]}, + "faces": { + "north": {"uv": [1.25, 1.25, 2.375, 2.75], "texture": "texture"}, + "east": {"uv": [0.25, 1.25, 1.25, 2.75], "texture": "texture"}, + "south": {"uv": [3.375, 1.25, 4.5, 2.75], "texture": "texture"}, + "west": {"uv": [2.375, 1.25, 3.375, 2.75], "texture": "texture"}, + "up": {"uv": [2.375, 1.25, 1.25, 0.25], "texture": "texture"}, + "down": {"uv": [3.5, 0.25, 2.375, 1.25], "texture": "texture"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_sniffer_3.json b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_sniffer_3.json new file mode 100644 index 000000000..1b17ce484 --- /dev/null +++ b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_sniffer_3.json @@ -0,0 +1,88 @@ +{ + "parent": "minecraft:block/block", + "credit": "made with BlockBench", + "textures": { + "texture": "tfg:block/large_nest/large_nest_sniffer_0", + "particle": "tfg:block/large_nest/large_nest_sniffer_0" + }, + "elements": [ + { + "from": [4, 1, 12], + "to": [16, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 2, 13]}, + "faces": { + "north": {"uv": [3.5, 6.25, 5, 6.5], "texture": "texture"}, + "east": {"uv": [3.25, 6.25, 3.5, 6.5], "texture": "texture"}, + "south": {"uv": [5.25, 6.25, 6.75, 6.5], "texture": "texture"}, + "west": {"uv": [5, 6.25, 5.25, 6.5], "texture": "texture"}, + "up": {"uv": [5, 6.25, 3.5, 6], "texture": "texture"}, + "down": {"uv": [6.5, 6, 5, 6.25], "texture": "texture"} + } + }, + { + "from": [3, 0, 0], + "to": [16, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 0.5, 6.5]}, + "faces": { + "north": {"uv": [3.375, 5, 5, 5.125], "texture": "texture"}, + "east": {"uv": [1.75, 5, 3.375, 5.125], "texture": "texture"}, + "south": {"uv": [6.625, 5, 8.25, 5.125], "texture": "texture"}, + "west": {"uv": [5, 5, 6.625, 5.125], "texture": "texture"}, + "up": {"uv": [5, 5, 3.375, 3.375], "texture": "texture"}, + "down": {"uv": [6.625, 3.375, 5, 5], "texture": "texture"} + } + }, + { + "from": [3, 3, 13], + "to": [16, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 3.5, 14]}, + "faces": { + "north": {"uv": [4.5, 5.375, 6.125, 5.5], "texture": "texture"}, + "east": {"uv": [4.25, 5.375, 4.5, 5.5], "texture": "texture"}, + "south": {"uv": [6.375, 5.375, 8, 5.5], "texture": "texture"}, + "west": {"uv": [6.125, 5.375, 6.375, 5.5], "texture": "texture"}, + "up": {"uv": [6.125, 5.375, 4.5, 5.125], "texture": "texture"}, + "down": {"uv": [7.75, 5.125, 6.125, 5.375], "texture": "texture"} + } + }, + { + "from": [1, 3, 0], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 3.5, 7.5]}, + "faces": { + "north": {"uv": [1.875, 7, 2.125, 7.125], "texture": "texture"}, + "east": {"uv": [0, 7, 1.875, 7.125], "texture": "texture"}, + "south": {"uv": [4, 7, 4.25, 7.125], "texture": "texture"}, + "west": {"uv": [2.125, 7, 4, 7.125], "texture": "texture"}, + "up": {"uv": [2.125, 7, 1.875, 5.125], "texture": "texture"}, + "down": {"uv": [2.375, 5.125, 2.125, 7], "texture": "texture"} + } + }, + { + "from": [2, 1, 0], + "to": [4, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 2, 7]}, + "faces": { + "north": {"uv": [5.75, 6.875, 6, 7.125], "texture": "texture"}, + "east": {"uv": [4, 6.875, 5.75, 7.125], "texture": "texture"}, + "south": {"uv": [7.75, 6.875, 8, 7.125], "texture": "texture"}, + "west": {"uv": [6, 6.875, 7.75, 7.125], "texture": "texture"}, + "up": {"uv": [6, 6.875, 5.75, 5.125], "texture": "texture"}, + "down": {"uv": [6.25, 5.125, 6, 6.875], "texture": "texture"} + } + }, + { + "from": [6, 1, 1], + "to": [16, 14, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 1, 5]}, + "faces": { + "north": {"uv": [1.125, 1.25, 2.375, 2.875], "texture": "texture"}, + "east": {"uv": [0, 1.25, 1.125, 2.875], "texture": "texture"}, + "south": {"uv": [3.5, 1.25, 4.75, 2.875], "texture": "texture"}, + "west": {"uv": [2.375, 1.25, 3.5, 2.875], "texture": "texture"}, + "up": {"uv": [2.375, 1.25, 1.125, 0.125], "texture": "texture"}, + "down": {"uv": [3.625, 0.125, 2.375, 1.25], "texture": "texture"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_empty.json b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_empty.json new file mode 100644 index 000000000..4f62f23f4 --- /dev/null +++ b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_empty.json @@ -0,0 +1,75 @@ +{ + "parent": "tfg:block/large_nest/large_nest_box_empty", + "credit": "made with BlockBench", + "textures": { + "texture": "tfg:block/large_nest/large_nest_warped_sniffer_0", + "particle": "tfg:block/large_nest/large_nest_warped_sniffer_0" + }, + "elements": [ + { + "from": [4, 1, 12], + "to": [16, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 2, 13]}, + "faces": { + "north": {"uv": [3.5, 6.25, 5, 6.5], "texture": "texture"}, + "east": {"uv": [3.25, 6.25, 3.5, 6.5], "texture": "texture"}, + "south": {"uv": [5.25, 6.25, 6.75, 6.5], "texture": "texture"}, + "west": {"uv": [5, 6.25, 5.25, 6.5], "texture": "texture"}, + "up": {"uv": [5, 6.25, 3.5, 6], "texture": "texture"}, + "down": {"uv": [6.5, 6, 5, 6.25], "texture": "texture"} + } + }, + { + "from": [3, 0, 0], + "to": [16, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 0.5, 6.5]}, + "faces": { + "north": {"uv": [3.375, 5, 5, 5.125], "texture": "texture"}, + "east": {"uv": [1.75, 5, 3.375, 5.125], "texture": "texture"}, + "south": {"uv": [6.625, 5, 8.25, 5.125], "texture": "texture"}, + "west": {"uv": [5, 5, 6.625, 5.125], "texture": "texture"}, + "up": {"uv": [5, 5, 3.375, 3.375], "texture": "texture"}, + "down": {"uv": [6.625, 3.375, 5, 5], "texture": "texture"} + } + }, + { + "from": [3, 3, 13], + "to": [16, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 3.5, 14]}, + "faces": { + "north": {"uv": [4.5, 5.375, 6.125, 5.5], "texture": "texture"}, + "east": {"uv": [4.25, 5.375, 4.5, 5.5], "texture": "texture"}, + "south": {"uv": [6.375, 5.375, 8, 5.5], "texture": "texture"}, + "west": {"uv": [6.125, 5.375, 6.375, 5.5], "texture": "texture"}, + "up": {"uv": [6.125, 5.375, 4.5, 5.125], "texture": "texture"}, + "down": {"uv": [7.75, 5.125, 6.125, 5.375], "texture": "texture"} + } + }, + { + "from": [1, 3, 0], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 3.5, 7.5]}, + "faces": { + "north": {"uv": [1.875, 7, 2.125, 7.125], "texture": "texture"}, + "east": {"uv": [0, 7, 1.875, 7.125], "texture": "texture"}, + "south": {"uv": [4, 7, 4.25, 7.125], "texture": "texture"}, + "west": {"uv": [2.125, 7, 4, 7.125], "texture": "texture"}, + "up": {"uv": [2.125, 7, 1.875, 5.125], "texture": "texture"}, + "down": {"uv": [2.375, 5.125, 2.125, 7], "texture": "texture"} + } + }, + { + "from": [2, 1, 0], + "to": [4, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 2, 7]}, + "faces": { + "north": {"uv": [5.75, 6.875, 6, 7.125], "texture": "texture"}, + "east": {"uv": [4, 6.875, 5.75, 7.125], "texture": "texture"}, + "south": {"uv": [7.75, 6.875, 8, 7.125], "texture": "texture"}, + "west": {"uv": [6, 6.875, 7.75, 7.125], "texture": "texture"}, + "up": {"uv": [6, 6.875, 5.75, 5.125], "texture": "texture"}, + "down": {"uv": [6.25, 5.125, 6, 6.875], "texture": "texture"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_sniffer_0.json b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_sniffer_0.json new file mode 100644 index 000000000..4992428ca --- /dev/null +++ b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_sniffer_0.json @@ -0,0 +1,88 @@ +{ + "parent": "minecraft:block/block", + "credit": "made with BlockBench", + "textures": { + "texture": "tfg:block/large_nest/large_nest_warped_sniffer_0", + "particle": "tfg:block/large_nest/large_nest_warped_sniffer_0" + }, + "elements": [ + { + "from": [4, 1, 12], + "to": [16, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 2, 13]}, + "faces": { + "north": {"uv": [3.5, 6.25, 5, 6.5], "texture": "texture"}, + "east": {"uv": [3.25, 6.25, 3.5, 6.5], "texture": "texture"}, + "south": {"uv": [5.25, 6.25, 6.75, 6.5], "texture": "texture"}, + "west": {"uv": [5, 6.25, 5.25, 6.5], "texture": "texture"}, + "up": {"uv": [5, 6.25, 3.5, 6], "texture": "texture"}, + "down": {"uv": [6.5, 6, 5, 6.25], "texture": "texture"} + } + }, + { + "from": [3, 0, 0], + "to": [16, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 0.5, 6.5]}, + "faces": { + "north": {"uv": [3.375, 5, 5, 5.125], "texture": "texture"}, + "east": {"uv": [1.75, 5, 3.375, 5.125], "texture": "texture"}, + "south": {"uv": [6.625, 5, 8.25, 5.125], "texture": "texture"}, + "west": {"uv": [5, 5, 6.625, 5.125], "texture": "texture"}, + "up": {"uv": [5, 5, 3.375, 3.375], "texture": "texture"}, + "down": {"uv": [6.625, 3.375, 5, 5], "texture": "texture"} + } + }, + { + "from": [3, 3, 13], + "to": [16, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 3.5, 14]}, + "faces": { + "north": {"uv": [4.5, 5.375, 6.125, 5.5], "texture": "texture"}, + "east": {"uv": [4.25, 5.375, 4.5, 5.5], "texture": "texture"}, + "south": {"uv": [6.375, 5.375, 8, 5.5], "texture": "texture"}, + "west": {"uv": [6.125, 5.375, 6.375, 5.5], "texture": "texture"}, + "up": {"uv": [6.125, 5.375, 4.5, 5.125], "texture": "texture"}, + "down": {"uv": [7.75, 5.125, 6.125, 5.375], "texture": "texture"} + } + }, + { + "from": [1, 3, 0], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 3.5, 7.5]}, + "faces": { + "north": {"uv": [1.875, 7, 2.125, 7.125], "texture": "texture"}, + "east": {"uv": [0, 7, 1.875, 7.125], "texture": "texture"}, + "south": {"uv": [4, 7, 4.25, 7.125], "texture": "texture"}, + "west": {"uv": [2.125, 7, 4, 7.125], "texture": "texture"}, + "up": {"uv": [2.125, 7, 1.875, 5.125], "texture": "texture"}, + "down": {"uv": [2.375, 5.125, 2.125, 7], "texture": "texture"} + } + }, + { + "from": [2, 1, 0], + "to": [4, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 2, 7]}, + "faces": { + "north": {"uv": [5.75, 6.875, 6, 7.125], "texture": "texture"}, + "east": {"uv": [4, 6.875, 5.75, 7.125], "texture": "texture"}, + "south": {"uv": [7.75, 6.875, 8, 7.125], "texture": "texture"}, + "west": {"uv": [6, 6.875, 7.75, 7.125], "texture": "texture"}, + "up": {"uv": [6, 6.875, 5.75, 5.125], "texture": "texture"}, + "down": {"uv": [6.25, 5.125, 6, 6.875], "texture": "texture"} + } + }, + { + "from": [6, 1, 1], + "to": [15, 14, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 1, 5]}, + "faces": { + "north": {"uv": [1.25, 1.25, 2.375, 2.875], "texture": "texture"}, + "east": {"uv": [0, 1.25, 1.25, 2.875], "texture": "texture"}, + "south": {"uv": [3.625, 1.25, 4.75, 2.875], "texture": "texture"}, + "west": {"uv": [2.375, 1.25, 3.625, 2.875], "texture": "texture"}, + "up": {"uv": [2.375, 1.25, 1.25, 0], "texture": "texture"}, + "down": {"uv": [3.5, 0, 2.375, 1.25], "texture": "texture"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_sniffer_1.json b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_sniffer_1.json new file mode 100644 index 000000000..fc25b685a --- /dev/null +++ b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_sniffer_1.json @@ -0,0 +1,90 @@ +{ + "parent": "minecraft:block/block", + "credit": "made with BlockBench", + "textures": { + "texture": "tfg:block/large_nest/large_nest_warped_sniffer_0", + "particle": "tfg:block/large_nest/large_nest_warped_sniffer_0" + }, + "elements": [ + { + "from": [4, 1, 12], + "to": [16, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 2, 13]}, + "faces": { + "north": {"uv": [3.5, 6.25, 5, 6.5], "texture": "texture"}, + "east": {"uv": [3.25, 6.25, 3.5, 6.5], "texture": "texture"}, + "south": {"uv": [5.25, 6.25, 6.75, 6.5], "texture": "texture"}, + "west": {"uv": [5, 6.25, 5.25, 6.5], "texture": "texture"}, + "up": {"uv": [5, 6.25, 3.5, 6], "texture": "texture"}, + "down": {"uv": [6.5, 6, 5, 6.25], "texture": "texture"} + } + }, + { + "from": [3, 0, 0], + "to": [16, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 0.5, 6.5]}, + "faces": { + "north": {"uv": [3.375, 5, 5, 5.125], "texture": "texture"}, + "east": {"uv": [1.75, 5, 3.375, 5.125], "texture": "texture"}, + "south": {"uv": [6.625, 5, 8.25, 5.125], "texture": "texture"}, + "west": {"uv": [5, 5, 6.625, 5.125], "texture": "texture"}, + "up": {"uv": [5, 5, 3.375, 3.375], "texture": "texture"}, + "down": {"uv": [6.625, 3.375, 5, 5], "texture": "texture"} + } + }, + { + "from": [3, 3, 13], + "to": [16, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 3.5, 14]}, + "faces": { + "north": {"uv": [4.5, 5.375, 6.125, 5.5], "texture": "texture"}, + "east": {"uv": [4.25, 5.375, 4.5, 5.5], "texture": "texture"}, + "south": {"uv": [6.375, 5.375, 8, 5.5], "texture": "texture"}, + "west": {"uv": [6.125, 5.375, 6.375, 5.5], "texture": "texture"}, + "up": {"uv": [6.125, 5.375, 4.5, 5.125], "texture": "texture"}, + "down": {"uv": [7.75, 5.125, 6.125, 5.375], "texture": "texture"} + } + }, + { + "from": [1, 3, 0], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 3.5, 7.5]}, + "faces": { + "north": {"uv": [1.875, 7, 2.125, 7.125], "texture": "texture"}, + "east": {"uv": [0, 7, 1.875, 7.125], "texture": "texture"}, + "south": {"uv": [4, 7, 4.25, 7.125], "texture": "texture"}, + "west": {"uv": [2.125, 7, 4, 7.125], "texture": "texture"}, + "up": {"uv": [2.125, 7, 1.875, 5.125], "texture": "texture"}, + "down": {"uv": [2.375, 5.125, 2.125, 7], "texture": "texture"} + } + }, + { + "from": [2, 1, 0], + "to": [4, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 2, 7]}, + "faces": { + "north": {"uv": [5.75, 6.875, 6, 7.125], "texture": "texture"}, + "east": {"uv": [4, 6.875, 5.75, 7.125], "texture": "texture"}, + "south": {"uv": [7.75, 6.875, 8, 7.125], "texture": "texture"}, + "west": {"uv": [6, 6.875, 7.75, 7.125], "texture": "texture"}, + "up": {"uv": [6, 6.875, 5.75, 5.125], "texture": "texture"}, + "down": {"uv": [6.25, 5.125, 6, 6.875], "texture": "texture"} + } + } + + , + { + "from": [9, 1, 2], + "to": [16, 12, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 1, 6]}, + "faces": { + "north": {"uv": [1.25, 1.25, 2.125, 2.625], "texture": "texture"}, + "east": {"uv": [0.125, 1.25, 1.25, 2.625], "texture": "texture"}, + "south": {"uv": [3.25, 1.25, 4.125, 2.625], "texture": "texture"}, + "west": {"uv": [2.125, 1.25, 3.25, 2.625], "texture": "texture"}, + "up": {"uv": [2.125, 1.25, 1.25, 0.125], "texture": "texture"}, + "down": {"uv": [3, 0.125, 2.125, 1.25], "texture": "texture"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_sniffer_2.json b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_sniffer_2.json new file mode 100644 index 000000000..c2e72ac8a --- /dev/null +++ b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_sniffer_2.json @@ -0,0 +1,88 @@ +{ + "parent": "minecraft:block/block", + "credit": "made with BlockBench", + "textures": { + "texture": "tfg:block/large_nest/large_nest_warped_sniffer_0", + "particle": "tfg:block/large_nest/large_nest_warped_sniffer_0" + }, + "elements": [ + { + "from": [4, 1, 12], + "to": [16, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 2, 13]}, + "faces": { + "north": {"uv": [3.5, 6.25, 5, 6.5], "texture": "texture"}, + "east": {"uv": [3.25, 6.25, 3.5, 6.5], "texture": "texture"}, + "south": {"uv": [5.25, 6.25, 6.75, 6.5], "texture": "texture"}, + "west": {"uv": [5, 6.25, 5.25, 6.5], "texture": "texture"}, + "up": {"uv": [5, 6.25, 3.5, 6], "texture": "texture"}, + "down": {"uv": [6.5, 6, 5, 6.25], "texture": "texture"} + } + }, + { + "from": [3, 0, 0], + "to": [16, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 0.5, 6.5]}, + "faces": { + "north": {"uv": [3.375, 5, 5, 5.125], "texture": "texture"}, + "east": {"uv": [1.75, 5, 3.375, 5.125], "texture": "texture"}, + "south": {"uv": [6.625, 5, 8.25, 5.125], "texture": "texture"}, + "west": {"uv": [5, 5, 6.625, 5.125], "texture": "texture"}, + "up": {"uv": [5, 5, 3.375, 3.375], "texture": "texture"}, + "down": {"uv": [6.625, 3.375, 5, 5], "texture": "texture"} + } + }, + { + "from": [3, 3, 13], + "to": [16, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 3.5, 14]}, + "faces": { + "north": {"uv": [4.5, 5.375, 6.125, 5.5], "texture": "texture"}, + "east": {"uv": [4.25, 5.375, 4.5, 5.5], "texture": "texture"}, + "south": {"uv": [6.375, 5.375, 8, 5.5], "texture": "texture"}, + "west": {"uv": [6.125, 5.375, 6.375, 5.5], "texture": "texture"}, + "up": {"uv": [6.125, 5.375, 4.5, 5.125], "texture": "texture"}, + "down": {"uv": [7.75, 5.125, 6.125, 5.375], "texture": "texture"} + } + }, + { + "from": [1, 3, 0], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 3.5, 7.5]}, + "faces": { + "north": {"uv": [1.875, 7, 2.125, 7.125], "texture": "texture"}, + "east": {"uv": [0, 7, 1.875, 7.125], "texture": "texture"}, + "south": {"uv": [4, 7, 4.25, 7.125], "texture": "texture"}, + "west": {"uv": [2.125, 7, 4, 7.125], "texture": "texture"}, + "up": {"uv": [2.125, 7, 1.875, 5.125], "texture": "texture"}, + "down": {"uv": [2.375, 5.125, 2.125, 7], "texture": "texture"} + } + }, + { + "from": [2, 1, 0], + "to": [4, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 2, 7]}, + "faces": { + "north": {"uv": [5.75, 6.875, 6, 7.125], "texture": "texture"}, + "east": {"uv": [4, 6.875, 5.75, 7.125], "texture": "texture"}, + "south": {"uv": [7.75, 6.875, 8, 7.125], "texture": "texture"}, + "west": {"uv": [6, 6.875, 7.75, 7.125], "texture": "texture"}, + "up": {"uv": [6, 6.875, 5.75, 5.125], "texture": "texture"}, + "down": {"uv": [6.25, 5.125, 6, 6.875], "texture": "texture"} + } + }, + { + "from": [7, 1, 0], + "to": [16, 13, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 1, 4]}, + "faces": { + "north": {"uv": [1.25, 1.25, 2.375, 2.75], "texture": "texture"}, + "east": {"uv": [0.25, 1.25, 1.25, 2.75], "texture": "texture"}, + "south": {"uv": [3.375, 1.25, 4.5, 2.75], "texture": "texture"}, + "west": {"uv": [2.375, 1.25, 3.375, 2.75], "texture": "texture"}, + "up": {"uv": [2.375, 1.25, 1.25, 0.25], "texture": "texture"}, + "down": {"uv": [3.5, 0.25, 2.375, 1.25], "texture": "texture"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_sniffer_3.json b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_sniffer_3.json new file mode 100644 index 000000000..39d71bf1c --- /dev/null +++ b/kubejs/assets/tfg/models/block/large_nest_box/large_nest_box_warped_sniffer_3.json @@ -0,0 +1,88 @@ +{ + "parent": "minecraft:block/block", + "credit": "made with BlockBench", + "textures": { + "texture": "tfg:block/large_nest/large_nest_warped_sniffer_0", + "particle": "tfg:block/large_nest/large_nest_warped_sniffer_0" + }, + "elements": [ + { + "from": [4, 1, 12], + "to": [16, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 2, 13]}, + "faces": { + "north": {"uv": [3.5, 6.25, 5, 6.5], "texture": "texture"}, + "east": {"uv": [3.25, 6.25, 3.5, 6.5], "texture": "texture"}, + "south": {"uv": [5.25, 6.25, 6.75, 6.5], "texture": "texture"}, + "west": {"uv": [5, 6.25, 5.25, 6.5], "texture": "texture"}, + "up": {"uv": [5, 6.25, 3.5, 6], "texture": "texture"}, + "down": {"uv": [6.5, 6, 5, 6.25], "texture": "texture"} + } + }, + { + "from": [3, 0, 0], + "to": [16, 1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 0.5, 6.5]}, + "faces": { + "north": {"uv": [3.375, 5, 5, 5.125], "texture": "texture"}, + "east": {"uv": [1.75, 5, 3.375, 5.125], "texture": "texture"}, + "south": {"uv": [6.625, 5, 8.25, 5.125], "texture": "texture"}, + "west": {"uv": [5, 5, 6.625, 5.125], "texture": "texture"}, + "up": {"uv": [5, 5, 3.375, 3.375], "texture": "texture"}, + "down": {"uv": [6.625, 3.375, 5, 5], "texture": "texture"} + } + }, + { + "from": [3, 3, 13], + "to": [16, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 3.5, 14]}, + "faces": { + "north": {"uv": [4.5, 5.375, 6.125, 5.5], "texture": "texture"}, + "east": {"uv": [4.25, 5.375, 4.5, 5.5], "texture": "texture"}, + "south": {"uv": [6.375, 5.375, 8, 5.5], "texture": "texture"}, + "west": {"uv": [6.125, 5.375, 6.375, 5.5], "texture": "texture"}, + "up": {"uv": [6.125, 5.375, 4.5, 5.125], "texture": "texture"}, + "down": {"uv": [7.75, 5.125, 6.125, 5.375], "texture": "texture"} + } + }, + { + "from": [1, 3, 0], + "to": [3, 4, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 3.5, 7.5]}, + "faces": { + "north": {"uv": [1.875, 7, 2.125, 7.125], "texture": "texture"}, + "east": {"uv": [0, 7, 1.875, 7.125], "texture": "texture"}, + "south": {"uv": [4, 7, 4.25, 7.125], "texture": "texture"}, + "west": {"uv": [2.125, 7, 4, 7.125], "texture": "texture"}, + "up": {"uv": [2.125, 7, 1.875, 5.125], "texture": "texture"}, + "down": {"uv": [2.375, 5.125, 2.125, 7], "texture": "texture"} + } + }, + { + "from": [2, 1, 0], + "to": [4, 3, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 2, 7]}, + "faces": { + "north": {"uv": [5.75, 6.875, 6, 7.125], "texture": "texture"}, + "east": {"uv": [4, 6.875, 5.75, 7.125], "texture": "texture"}, + "south": {"uv": [7.75, 6.875, 8, 7.125], "texture": "texture"}, + "west": {"uv": [6, 6.875, 7.75, 7.125], "texture": "texture"}, + "up": {"uv": [6, 6.875, 5.75, 5.125], "texture": "texture"}, + "down": {"uv": [6.25, 5.125, 6, 6.875], "texture": "texture"} + } + }, + { + "from": [6, 1, 1], + "to": [16, 14, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [14, 1, 5]}, + "faces": { + "north": {"uv": [1.125, 1.25, 2.375, 2.875], "texture": "texture"}, + "east": {"uv": [0, 1.25, 1.125, 2.875], "texture": "texture"}, + "south": {"uv": [3.5, 1.25, 4.75, 2.875], "texture": "texture"}, + "west": {"uv": [2.375, 1.25, 3.5, 2.875], "texture": "texture"}, + "up": {"uv": [2.375, 1.25, 1.125, 0.125], "texture": "texture"}, + "down": {"uv": [3.625, 0.125, 2.375, 1.25], "texture": "texture"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/large_nest_box.json b/kubejs/assets/tfg/models/item/large_nest_box.json new file mode 100644 index 000000000..36cb69cb7 --- /dev/null +++ b/kubejs/assets/tfg/models/item/large_nest_box.json @@ -0,0 +1,287 @@ +{ + "format_version": "1.9.0", + "parent": "block/block", + "credit": "Made with Blockbench", + "texture_size": [128, 128], + "textures": { + "2": "tfg:block/large_nest/large_nest_sniffer_0", + "particle": "tfg:block/large_nest/large_nest_sniffer_0" + }, + "display": { + "firstperson_righthand": { + "rotation": [ 0, 0 ,0], + "translation": [ 0, 8, 0], + "scale": [ 1, 1, 1 ] + } + }, + "elements": [ + { + "from": [8, 1, 1.5125], + "to": [14.5, 1.5, 8.0125], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 2, 2.8875]}, + "faces": { + "north": {"uv": [6.625, 5, 8.25, 5.125], "texture": "#2"}, + "east": {"uv": [5, 5, 6.625, 5.125], "texture": "#2"}, + "south": {"uv": [3.375, 5, 5, 5.125], "texture": "#2"}, + "west": {"uv": [1.75, 5, 3.375, 5.125], "texture": "#2"}, + "up": {"uv": [5, 5, 3.375, 3.375], "rotation": 180, "texture": "#2"}, + "down": {"uv": [6.625, 3.375, 5, 5], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [8, 1.5, 1.0125], + "to": [14, 2.5, 2.0125], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 2, 2.8875]}, + "faces": { + "north": {"uv": [5.25, 6.25, 6.75, 6.5], "texture": "#2"}, + "east": {"uv": [5, 6.25, 5.25, 6.5], "texture": "#2"}, + "south": {"uv": [3.5, 6.25, 5, 6.5], "texture": "#2"}, + "west": {"uv": [3.25, 6.25, 3.5, 6.5], "texture": "#2"}, + "up": {"uv": [5, 6.25, 3.5, 6], "rotation": 180, "texture": "#2"}, + "down": {"uv": [6.5, 6, 5, 6.25], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [8, 2.5, 0.5125], + "to": [14.5, 3, 1.5125], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 2, 2.8875]}, + "faces": { + "north": {"uv": [6.375, 5.375, 8, 5.5], "texture": "#2"}, + "east": {"uv": [6.125, 5.375, 6.375, 5.5], "texture": "#2"}, + "south": {"uv": [4.5, 5.375, 6.125, 5.5], "texture": "#2"}, + "west": {"uv": [4.25, 5.375, 4.5, 5.5], "texture": "#2"}, + "up": {"uv": [6.125, 5.375, 4.5, 5.125], "rotation": 180, "texture": "#2"}, + "down": {"uv": [7.75, 5.125, 6.125, 5.375], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [14, 1.5, 1.0125], + "to": [15, 2.5, 8.0125], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 2, 2.8875]}, + "faces": { + "north": {"uv": [7.75, 6.875, 8, 7.125], "texture": "#2"}, + "east": {"uv": [6, 6.875, 7.75, 7.125], "texture": "#2"}, + "south": {"uv": [5.75, 6.875, 6, 7.125], "texture": "#2"}, + "west": {"uv": [4, 6.875, 5.75, 7.125], "texture": "#2"}, + "up": {"uv": [6, 6.875, 5.75, 5.125], "rotation": 180, "texture": "#2"}, + "down": {"uv": [6.25, 5.125, 6, 6.875], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [14.5, 2.5, 0.5125], + "to": [15.5, 3, 8.0125], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 2, 2.8875]}, + "faces": { + "north": {"uv": [4, 7, 4.25, 7.125], "texture": "#2"}, + "east": {"uv": [2.125, 7, 4, 7.125], "texture": "#2"}, + "south": {"uv": [1.875, 7, 2.125, 7.125], "texture": "#2"}, + "west": {"uv": [0, 7, 1.875, 7.125], "texture": "#2"}, + "up": {"uv": [2.125, 7, 1.875, 5.125], "rotation": 180, "texture": "#2"}, + "down": {"uv": [2.375, 5.125, 2.125, 7], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [2, 1.5, 14], + "to": [8, 2.5, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 2, 14.5]}, + "faces": { + "north": {"uv": [3.5, 6.25, 5, 6.5], "texture": "#2"}, + "east": {"uv": [3.25, 6.25, 3.5, 6.5], "texture": "#2"}, + "south": {"uv": [5.25, 6.25, 6.75, 6.5], "texture": "#2"}, + "west": {"uv": [5, 6.25, 5.25, 6.5], "texture": "#2"}, + "up": {"uv": [5, 6.25, 3.5, 6], "texture": "#2"}, + "down": {"uv": [6.5, 6, 5, 6.25], "texture": "#2"} + } + }, + { + "from": [1.5, 1, 8], + "to": [8, 1.5, 14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [4.75, 1.25, 11.25]}, + "faces": { + "north": {"uv": [3.375, 5, 5, 5.125], "texture": "#2"}, + "east": {"uv": [1.75, 5, 3.375, 5.125], "texture": "#2"}, + "south": {"uv": [6.625, 5, 8.25, 5.125], "texture": "#2"}, + "west": {"uv": [5, 5, 6.625, 5.125], "texture": "#2"}, + "up": {"uv": [5, 5, 3.375, 3.375], "texture": "#2"}, + "down": {"uv": [6.625, 3.375, 5, 5], "texture": "#2"} + } + }, + { + "from": [1.5, 2.5, 14.5], + "to": [8, 3, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [4.75, 2.75, 15]}, + "faces": { + "north": {"uv": [4.5, 5.375, 6.125, 5.5], "texture": "#2"}, + "east": {"uv": [4.25, 5.375, 4.5, 5.5], "texture": "#2"}, + "south": {"uv": [6.375, 5.375, 8, 5.5], "texture": "#2"}, + "west": {"uv": [6.125, 5.375, 6.375, 5.5], "texture": "#2"}, + "up": {"uv": [6.125, 5.375, 4.5, 5.125], "texture": "#2"}, + "down": {"uv": [7.75, 5.125, 6.125, 5.375], "texture": "#2"} + } + }, + { + "from": [0.5, 2.5, 8], + "to": [1.5, 3, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 2.75, 11.75]}, + "faces": { + "north": {"uv": [1.875, 7, 2.125, 7.125], "texture": "#2"}, + "east": {"uv": [0, 7, 1.875, 7.125], "texture": "#2"}, + "south": {"uv": [4, 7, 4.25, 7.125], "texture": "#2"}, + "west": {"uv": [2.125, 7, 4, 7.125], "texture": "#2"}, + "up": {"uv": [2.125, 7, 1.875, 5.125], "texture": "#2"}, + "down": {"uv": [2.375, 5.125, 2.125, 7], "texture": "#2"} + } + }, + { + "from": [1, 1.5, 8], + "to": [2, 2.5, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [1.5, 2, 11.5]}, + "faces": { + "north": {"uv": [5.75, 6.875, 6, 7.125], "texture": "#2"}, + "east": {"uv": [4, 6.875, 5.75, 7.125], "texture": "#2"}, + "south": {"uv": [7.75, 6.875, 8, 7.125], "texture": "#2"}, + "west": {"uv": [6, 6.875, 7.75, 7.125], "texture": "#2"}, + "up": {"uv": [6, 6.875, 5.75, 5.125], "texture": "#2"}, + "down": {"uv": [6.25, 5.125, 6, 6.875], "texture": "#2"} + } + }, + { + "from": [14, 1.5, 8], + "to": [15, 2.5, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [13.125, 2, 13.45]}, + "faces": { + "north": {"uv": [3.25, 6.25, 3.5, 6.5], "texture": "#2"}, + "east": {"uv": [5.25, 6.25, 6.75, 6.5], "texture": "#2"}, + "south": {"uv": [5, 6.25, 5.25, 6.5], "texture": "#2"}, + "west": {"uv": [3.5, 6.25, 5, 6.5], "texture": "#2"}, + "up": {"uv": [5, 6.25, 3.5, 6], "rotation": 270, "texture": "#2"}, + "down": {"uv": [6.5, 6, 5, 6.25], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [8, 1, 8], + "to": [14.5, 1.5, 14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [13.125, 2, 13.45]}, + "faces": { + "north": {"uv": [1.75, 5, 3.375, 5.125], "texture": "#2"}, + "east": {"uv": [6.625, 5, 8.25, 5.125], "texture": "#2"}, + "south": {"uv": [5, 5, 6.625, 5.125], "texture": "#2"}, + "west": {"uv": [3.375, 5, 5, 5.125], "texture": "#2"}, + "up": {"uv": [5, 5, 3.375, 3.375], "rotation": 270, "texture": "#2"}, + "down": {"uv": [6.625, 3.375, 5, 5], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [14.5, 2.5, 8], + "to": [15.5, 3, 14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [13.125, 2, 13.45]}, + "faces": { + "north": {"uv": [4.25, 5.375, 4.5, 5.5], "texture": "#2"}, + "east": {"uv": [6.375, 5.375, 8, 5.5], "texture": "#2"}, + "south": {"uv": [6.125, 5.375, 6.375, 5.5], "texture": "#2"}, + "west": {"uv": [4.5, 5.375, 6.125, 5.5], "texture": "#2"}, + "up": {"uv": [6.125, 5.375, 4.5, 5.125], "rotation": 270, "texture": "#2"}, + "down": {"uv": [7.75, 5.125, 6.125, 5.375], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [8, 2.5, 14.5], + "to": [15.5, 3, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [13.125, 2, 13.45]}, + "faces": { + "north": {"uv": [0, 7, 1.875, 7.125], "texture": "#2"}, + "east": {"uv": [4, 7, 4.25, 7.125], "texture": "#2"}, + "south": {"uv": [2.125, 7, 4, 7.125], "texture": "#2"}, + "west": {"uv": [1.875, 7, 2.125, 7.125], "texture": "#2"}, + "up": {"uv": [2.125, 7, 1.875, 5.125], "rotation": 270, "texture": "#2"}, + "down": {"uv": [2.375, 5.125, 2.125, 7], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [8, 1.5, 14], + "to": [15, 2.5, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [13.125, 2, 13.45]}, + "faces": { + "north": {"uv": [4, 6.875, 5.75, 7.125], "texture": "#2"}, + "east": {"uv": [7.75, 6.875, 8, 7.125], "texture": "#2"}, + "south": {"uv": [6, 6.875, 7.75, 7.125], "texture": "#2"}, + "west": {"uv": [5.75, 6.875, 6, 7.125], "texture": "#2"}, + "up": {"uv": [6, 6.875, 5.75, 5.125], "rotation": 270, "texture": "#2"}, + "down": {"uv": [6.25, 5.125, 6, 6.875], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [1, 1.5, 2], + "to": [2, 2.5, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [2.875, 2, 3]}, + "faces": { + "north": {"uv": [5, 6.25, 5.25, 6.5], "texture": "#2"}, + "east": {"uv": [3.5, 6.25, 5, 6.5], "texture": "#2"}, + "south": {"uv": [3.25, 6.25, 3.5, 6.5], "texture": "#2"}, + "west": {"uv": [5.25, 6.25, 6.75, 6.5], "texture": "#2"}, + "up": {"uv": [5, 6.25, 3.5, 6], "rotation": 90, "texture": "#2"}, + "down": {"uv": [6.5, 6, 5, 6.25], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [1.5, 1, 1.5], + "to": [8, 1.5, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [2.875, 2, 3]}, + "faces": { + "north": {"uv": [5, 5, 6.625, 5.125], "texture": "#2"}, + "east": {"uv": [3.375, 5, 5, 5.125], "texture": "#2"}, + "south": {"uv": [1.75, 5, 3.375, 5.125], "texture": "#2"}, + "west": {"uv": [6.625, 5, 8.25, 5.125], "texture": "#2"}, + "up": {"uv": [5, 5, 3.375, 3.375], "rotation": 90, "texture": "#2"}, + "down": {"uv": [6.625, 3.375, 5, 5], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [0.5, 2.5, 1.5], + "to": [1.5, 3, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [2.875, 2, 3]}, + "faces": { + "north": {"uv": [6.125, 5.375, 6.375, 5.5], "texture": "#2"}, + "east": {"uv": [4.5, 5.375, 6.125, 5.5], "texture": "#2"}, + "south": {"uv": [4.25, 5.375, 4.5, 5.5], "texture": "#2"}, + "west": {"uv": [6.375, 5.375, 8, 5.5], "texture": "#2"}, + "up": {"uv": [6.125, 5.375, 4.5, 5.125], "rotation": 90, "texture": "#2"}, + "down": {"uv": [7.75, 5.125, 6.125, 5.375], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [0.5, 2.5, 0.5], + "to": [8, 3, 1.5], + "rotation": {"angle": 0, "axis": "y", "origin": [2.875, 2, 3]}, + "faces": { + "north": {"uv": [2.125, 7, 4, 7.125], "texture": "#2"}, + "east": {"uv": [1.875, 7, 2.125, 7.125], "texture": "#2"}, + "south": {"uv": [0, 7, 1.875, 7.125], "texture": "#2"}, + "west": {"uv": [4, 7, 4.25, 7.125], "texture": "#2"}, + "up": {"uv": [2.125, 7, 1.875, 5.125], "rotation": 90, "texture": "#2"}, + "down": {"uv": [2.375, 5.125, 2.125, 7], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [1, 1.5, 1], + "to": [8, 2.5, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [2.875, 2, 3]}, + "faces": { + "north": {"uv": [6, 6.875, 7.75, 7.125], "texture": "#2"}, + "east": {"uv": [5.75, 6.875, 6, 7.125], "texture": "#2"}, + "south": {"uv": [4, 6.875, 5.75, 7.125], "texture": "#2"}, + "west": {"uv": [7.75, 6.875, 8, 7.125], "texture": "#2"}, + "up": {"uv": [6, 6.875, 5.75, 5.125], "rotation": 90, "texture": "#2"}, + "down": {"uv": [6.25, 5.125, 6, 6.875], "rotation": 270, "texture": "#2"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [25.925, 2, -10.3625], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/large_nest_box_warped.json b/kubejs/assets/tfg/models/item/large_nest_box_warped.json new file mode 100644 index 000000000..13d691573 --- /dev/null +++ b/kubejs/assets/tfg/models/item/large_nest_box_warped.json @@ -0,0 +1,287 @@ +{ + "format_version": "1.9.0", + "parent": "block/block", + "credit": "Made with Blockbench", + "texture_size": [128, 128], + "textures": { + "2": "tfg:block/large_nest/large_nest_warped_sniffer_0", + "particle": "tfg:block/large_nest/large_nest_warped_sniffer_0" + }, + "display": { + "firstperson_righthand": { + "rotation": [ 0, 0 ,0], + "translation": [ 0, 8, 0], + "scale": [ 1, 1, 1 ] + } + }, + "elements": [ + { + "from": [8, 1, 1.5125], + "to": [14.5, 1.5, 8.0125], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 2, 2.8875]}, + "faces": { + "north": {"uv": [6.625, 5, 8.25, 5.125], "texture": "#2"}, + "east": {"uv": [5, 5, 6.625, 5.125], "texture": "#2"}, + "south": {"uv": [3.375, 5, 5, 5.125], "texture": "#2"}, + "west": {"uv": [1.75, 5, 3.375, 5.125], "texture": "#2"}, + "up": {"uv": [5, 5, 3.375, 3.375], "rotation": 180, "texture": "#2"}, + "down": {"uv": [6.625, 3.375, 5, 5], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [8, 1.5, 1.0125], + "to": [14, 2.5, 2.0125], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 2, 2.8875]}, + "faces": { + "north": {"uv": [5.25, 6.25, 6.75, 6.5], "texture": "#2"}, + "east": {"uv": [5, 6.25, 5.25, 6.5], "texture": "#2"}, + "south": {"uv": [3.5, 6.25, 5, 6.5], "texture": "#2"}, + "west": {"uv": [3.25, 6.25, 3.5, 6.5], "texture": "#2"}, + "up": {"uv": [5, 6.25, 3.5, 6], "rotation": 180, "texture": "#2"}, + "down": {"uv": [6.5, 6, 5, 6.25], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [8, 2.5, 0.5125], + "to": [14.5, 3, 1.5125], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 2, 2.8875]}, + "faces": { + "north": {"uv": [6.375, 5.375, 8, 5.5], "texture": "#2"}, + "east": {"uv": [6.125, 5.375, 6.375, 5.5], "texture": "#2"}, + "south": {"uv": [4.5, 5.375, 6.125, 5.5], "texture": "#2"}, + "west": {"uv": [4.25, 5.375, 4.5, 5.5], "texture": "#2"}, + "up": {"uv": [6.125, 5.375, 4.5, 5.125], "rotation": 180, "texture": "#2"}, + "down": {"uv": [7.75, 5.125, 6.125, 5.375], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [14, 1.5, 1.0125], + "to": [15, 2.5, 8.0125], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 2, 2.8875]}, + "faces": { + "north": {"uv": [7.75, 6.875, 8, 7.125], "texture": "#2"}, + "east": {"uv": [6, 6.875, 7.75, 7.125], "texture": "#2"}, + "south": {"uv": [5.75, 6.875, 6, 7.125], "texture": "#2"}, + "west": {"uv": [4, 6.875, 5.75, 7.125], "texture": "#2"}, + "up": {"uv": [6, 6.875, 5.75, 5.125], "rotation": 180, "texture": "#2"}, + "down": {"uv": [6.25, 5.125, 6, 6.875], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [14.5, 2.5, 0.5125], + "to": [15.5, 3, 8.0125], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 2, 2.8875]}, + "faces": { + "north": {"uv": [4, 7, 4.25, 7.125], "texture": "#2"}, + "east": {"uv": [2.125, 7, 4, 7.125], "texture": "#2"}, + "south": {"uv": [1.875, 7, 2.125, 7.125], "texture": "#2"}, + "west": {"uv": [0, 7, 1.875, 7.125], "texture": "#2"}, + "up": {"uv": [2.125, 7, 1.875, 5.125], "rotation": 180, "texture": "#2"}, + "down": {"uv": [2.375, 5.125, 2.125, 7], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [2, 1.5, 14], + "to": [8, 2.5, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 2, 14.5]}, + "faces": { + "north": {"uv": [3.5, 6.25, 5, 6.5], "texture": "#2"}, + "east": {"uv": [3.25, 6.25, 3.5, 6.5], "texture": "#2"}, + "south": {"uv": [5.25, 6.25, 6.75, 6.5], "texture": "#2"}, + "west": {"uv": [5, 6.25, 5.25, 6.5], "texture": "#2"}, + "up": {"uv": [5, 6.25, 3.5, 6], "texture": "#2"}, + "down": {"uv": [6.5, 6, 5, 6.25], "texture": "#2"} + } + }, + { + "from": [1.5, 1, 8], + "to": [8, 1.5, 14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [4.75, 1.25, 11.25]}, + "faces": { + "north": {"uv": [3.375, 5, 5, 5.125], "texture": "#2"}, + "east": {"uv": [1.75, 5, 3.375, 5.125], "texture": "#2"}, + "south": {"uv": [6.625, 5, 8.25, 5.125], "texture": "#2"}, + "west": {"uv": [5, 5, 6.625, 5.125], "texture": "#2"}, + "up": {"uv": [5, 5, 3.375, 3.375], "texture": "#2"}, + "down": {"uv": [6.625, 3.375, 5, 5], "texture": "#2"} + } + }, + { + "from": [1.5, 2.5, 14.5], + "to": [8, 3, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [4.75, 2.75, 15]}, + "faces": { + "north": {"uv": [4.5, 5.375, 6.125, 5.5], "texture": "#2"}, + "east": {"uv": [4.25, 5.375, 4.5, 5.5], "texture": "#2"}, + "south": {"uv": [6.375, 5.375, 8, 5.5], "texture": "#2"}, + "west": {"uv": [6.125, 5.375, 6.375, 5.5], "texture": "#2"}, + "up": {"uv": [6.125, 5.375, 4.5, 5.125], "texture": "#2"}, + "down": {"uv": [7.75, 5.125, 6.125, 5.375], "texture": "#2"} + } + }, + { + "from": [0.5, 2.5, 8], + "to": [1.5, 3, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [1, 2.75, 11.75]}, + "faces": { + "north": {"uv": [1.875, 7, 2.125, 7.125], "texture": "#2"}, + "east": {"uv": [0, 7, 1.875, 7.125], "texture": "#2"}, + "south": {"uv": [4, 7, 4.25, 7.125], "texture": "#2"}, + "west": {"uv": [2.125, 7, 4, 7.125], "texture": "#2"}, + "up": {"uv": [2.125, 7, 1.875, 5.125], "texture": "#2"}, + "down": {"uv": [2.375, 5.125, 2.125, 7], "texture": "#2"} + } + }, + { + "from": [1, 1.5, 8], + "to": [2, 2.5, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [1.5, 2, 11.5]}, + "faces": { + "north": {"uv": [5.75, 6.875, 6, 7.125], "texture": "#2"}, + "east": {"uv": [4, 6.875, 5.75, 7.125], "texture": "#2"}, + "south": {"uv": [7.75, 6.875, 8, 7.125], "texture": "#2"}, + "west": {"uv": [6, 6.875, 7.75, 7.125], "texture": "#2"}, + "up": {"uv": [6, 6.875, 5.75, 5.125], "texture": "#2"}, + "down": {"uv": [6.25, 5.125, 6, 6.875], "texture": "#2"} + } + }, + { + "from": [14, 1.5, 8], + "to": [15, 2.5, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [13.125, 2, 13.45]}, + "faces": { + "north": {"uv": [3.25, 6.25, 3.5, 6.5], "texture": "#2"}, + "east": {"uv": [5.25, 6.25, 6.75, 6.5], "texture": "#2"}, + "south": {"uv": [5, 6.25, 5.25, 6.5], "texture": "#2"}, + "west": {"uv": [3.5, 6.25, 5, 6.5], "texture": "#2"}, + "up": {"uv": [5, 6.25, 3.5, 6], "rotation": 270, "texture": "#2"}, + "down": {"uv": [6.5, 6, 5, 6.25], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [8, 1, 8], + "to": [14.5, 1.5, 14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [13.125, 2, 13.45]}, + "faces": { + "north": {"uv": [1.75, 5, 3.375, 5.125], "texture": "#2"}, + "east": {"uv": [6.625, 5, 8.25, 5.125], "texture": "#2"}, + "south": {"uv": [5, 5, 6.625, 5.125], "texture": "#2"}, + "west": {"uv": [3.375, 5, 5, 5.125], "texture": "#2"}, + "up": {"uv": [5, 5, 3.375, 3.375], "rotation": 270, "texture": "#2"}, + "down": {"uv": [6.625, 3.375, 5, 5], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [14.5, 2.5, 8], + "to": [15.5, 3, 14.5], + "rotation": {"angle": 0, "axis": "y", "origin": [13.125, 2, 13.45]}, + "faces": { + "north": {"uv": [4.25, 5.375, 4.5, 5.5], "texture": "#2"}, + "east": {"uv": [6.375, 5.375, 8, 5.5], "texture": "#2"}, + "south": {"uv": [6.125, 5.375, 6.375, 5.5], "texture": "#2"}, + "west": {"uv": [4.5, 5.375, 6.125, 5.5], "texture": "#2"}, + "up": {"uv": [6.125, 5.375, 4.5, 5.125], "rotation": 270, "texture": "#2"}, + "down": {"uv": [7.75, 5.125, 6.125, 5.375], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [8, 2.5, 14.5], + "to": [15.5, 3, 15.5], + "rotation": {"angle": 0, "axis": "y", "origin": [13.125, 2, 13.45]}, + "faces": { + "north": {"uv": [0, 7, 1.875, 7.125], "texture": "#2"}, + "east": {"uv": [4, 7, 4.25, 7.125], "texture": "#2"}, + "south": {"uv": [2.125, 7, 4, 7.125], "texture": "#2"}, + "west": {"uv": [1.875, 7, 2.125, 7.125], "texture": "#2"}, + "up": {"uv": [2.125, 7, 1.875, 5.125], "rotation": 270, "texture": "#2"}, + "down": {"uv": [2.375, 5.125, 2.125, 7], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [8, 1.5, 14], + "to": [15, 2.5, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [13.125, 2, 13.45]}, + "faces": { + "north": {"uv": [4, 6.875, 5.75, 7.125], "texture": "#2"}, + "east": {"uv": [7.75, 6.875, 8, 7.125], "texture": "#2"}, + "south": {"uv": [6, 6.875, 7.75, 7.125], "texture": "#2"}, + "west": {"uv": [5.75, 6.875, 6, 7.125], "texture": "#2"}, + "up": {"uv": [6, 6.875, 5.75, 5.125], "rotation": 270, "texture": "#2"}, + "down": {"uv": [6.25, 5.125, 6, 6.875], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [1, 1.5, 2], + "to": [2, 2.5, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [2.875, 2, 3]}, + "faces": { + "north": {"uv": [5, 6.25, 5.25, 6.5], "texture": "#2"}, + "east": {"uv": [3.5, 6.25, 5, 6.5], "texture": "#2"}, + "south": {"uv": [3.25, 6.25, 3.5, 6.5], "texture": "#2"}, + "west": {"uv": [5.25, 6.25, 6.75, 6.5], "texture": "#2"}, + "up": {"uv": [5, 6.25, 3.5, 6], "rotation": 90, "texture": "#2"}, + "down": {"uv": [6.5, 6, 5, 6.25], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [1.5, 1, 1.5], + "to": [8, 1.5, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [2.875, 2, 3]}, + "faces": { + "north": {"uv": [5, 5, 6.625, 5.125], "texture": "#2"}, + "east": {"uv": [3.375, 5, 5, 5.125], "texture": "#2"}, + "south": {"uv": [1.75, 5, 3.375, 5.125], "texture": "#2"}, + "west": {"uv": [6.625, 5, 8.25, 5.125], "texture": "#2"}, + "up": {"uv": [5, 5, 3.375, 3.375], "rotation": 90, "texture": "#2"}, + "down": {"uv": [6.625, 3.375, 5, 5], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [0.5, 2.5, 1.5], + "to": [1.5, 3, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [2.875, 2, 3]}, + "faces": { + "north": {"uv": [6.125, 5.375, 6.375, 5.5], "texture": "#2"}, + "east": {"uv": [4.5, 5.375, 6.125, 5.5], "texture": "#2"}, + "south": {"uv": [4.25, 5.375, 4.5, 5.5], "texture": "#2"}, + "west": {"uv": [6.375, 5.375, 8, 5.5], "texture": "#2"}, + "up": {"uv": [6.125, 5.375, 4.5, 5.125], "rotation": 90, "texture": "#2"}, + "down": {"uv": [7.75, 5.125, 6.125, 5.375], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [0.5, 2.5, 0.5], + "to": [8, 3, 1.5], + "rotation": {"angle": 0, "axis": "y", "origin": [2.875, 2, 3]}, + "faces": { + "north": {"uv": [2.125, 7, 4, 7.125], "texture": "#2"}, + "east": {"uv": [1.875, 7, 2.125, 7.125], "texture": "#2"}, + "south": {"uv": [0, 7, 1.875, 7.125], "texture": "#2"}, + "west": {"uv": [4, 7, 4.25, 7.125], "texture": "#2"}, + "up": {"uv": [2.125, 7, 1.875, 5.125], "rotation": 90, "texture": "#2"}, + "down": {"uv": [2.375, 5.125, 2.125, 7], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [1, 1.5, 1], + "to": [8, 2.5, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [2.875, 2, 3]}, + "faces": { + "north": {"uv": [6, 6.875, 7.75, 7.125], "texture": "#2"}, + "east": {"uv": [5.75, 6.875, 6, 7.125], "texture": "#2"}, + "south": {"uv": [4, 6.875, 5.75, 7.125], "texture": "#2"}, + "west": {"uv": [7.75, 6.875, 8, 7.125], "texture": "#2"}, + "up": {"uv": [6, 6.875, 5.75, 5.125], "rotation": 90, "texture": "#2"}, + "down": {"uv": [6.25, 5.125, 6, 6.875], "rotation": 270, "texture": "#2"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [25.925, 2, -10.3625], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/sniffer_egg.json b/kubejs/assets/tfg/models/item/sniffer_egg.json new file mode 100644 index 000000000..4ff54261b --- /dev/null +++ b/kubejs/assets/tfg/models/item/sniffer_egg.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/sniffer_egg" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/spawn_egg/glacian_ram.json b/kubejs/assets/tfg/models/item/spawn_egg/glacian_ram.json new file mode 100644 index 000000000..185724546 --- /dev/null +++ b/kubejs/assets/tfg/models/item/spawn_egg/glacian_ram.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/spawn_egg/moon_rabbit" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/spawn_egg/sniffer.json b/kubejs/assets/tfg/models/item/spawn_egg/sniffer.json new file mode 100644 index 000000000..185724546 --- /dev/null +++ b/kubejs/assets/tfg/models/item/spawn_egg/sniffer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/spawn_egg/moon_rabbit" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/large_nest/large_nest_sniffer_0.png b/kubejs/assets/tfg/textures/block/large_nest/large_nest_sniffer_0.png new file mode 100644 index 0000000000000000000000000000000000000000..b8f371f0e19252e7ef1d1ed3896253beb4536f59 GIT binary patch literal 3882 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 N002ovPDHLkV1i9;jY$9i literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/food/cooked_sniffer_beef.png b/kubejs/assets/tfg/textures/item/food/cooked_sniffer_beef.png new file mode 100644 index 0000000000000000000000000000000000000000..6e3a14577d2ef36f0b1c6549202b43a2b325e74a GIT binary patch literal 952 zcmV;p14sOcP)EX>4Tx04R}tkv&MmKpe$iQ>9f}9qb_Dkf92KT~x%eRIvyaN?V~-2a`*`ph-iL z;^HW{799LotU9+0Yt2!bCV?t+t|i_`?)_yP|2GN@QB1wrW+RV2J!5s zrE}gV4zZG?5T6rI8gxP8N3P2*zi}=)Ebz>bkx9)Hhls^u2g@DIN`^{2LmXCAjq-)8 z%L?Z$&T6H`TKD8H4CJ+yG}md4B90{_kc0>sHIz|-g$S)0DJD|1AM4^Dar{Yg$>b`7 zkz)Z>sE`~#_#gc4)+|gI z*1|`?;5Kk^-PYti;Bp5Te$pjFawIQJp-=$c&*+s{XM@9gd0Gp+u90F=aXw5QcB6#xJL24YJ`L;xKCT>v~PI4LLq000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2k8h24_CX>@2HM@dakSAh-}0004xNkls^?m6eq znYr+fkheDaosL^RkH%vGP;VvIjqt7o@z0pLky21SZ+z}lz|9`N;9=nJ8TwPuOa5uTFW>Am|r@0mGZLYD_7Umgf1%5vO;5yDL}WAo0000EX>4Tx04R}tkv&MmKpe$iQ>9f}9qb_Dkf92KT~x%eRIvyaN?V~-2a`*`ph-iL z;^HW{799LotU9+0Yt2!bCV?t+t|i_`?)_yP|2GN@QB1wrW+RV2J!5s zrE}gV4zZG?5T6rI8gxP8N3P2*zi}=)Ebz>bkx9)Hhls^u2g@DIN`^{2LmXCAjq-)8 z%L?Z$&T6H`TKD8H4CJ+yG}md4B90{_kc0>sHIz|-g$S)0DJD|1AM4^Dar{Yg$>b`7 zkz)Z>sE`~#_#gc4)+|gI z*1|`?;5Kk^-PYti;Bp5Te$pjFawIQJp-=$c&*+s{XM@9gd0Gp+u90F=aXw5QcB6#xJL24YJ`L;xKCT>v~PI4LLq000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2k8h24m&F_CX>@2HM@dakSAh-}00044NklYS~gWZdl8VS)ezR&aj{h$By z!hcrD$cvJZ7f&~J5xhm`0i-bL^4II(!K@hTAj8O7mlt&?x7p#N*s6C2d|4e?4v7jxpE+Wd~V9@A%HXR z;cGakz!ku>?5SdTgIc*NDi_6x|2HjL9&MUf0v^upMPhMjq8a3!C6<5y^1bEX>4Tx04R}tkv&MmKpe$iQ>9f}9qb_Dkf92KT~x%eRIvyaN?V~-2a`*`ph-iL z;^HW{799LotU9+0Yt2!bCV?t+t|i_`?)_yP|2GN@QB1wrW+RV2J!5s zrE}gV4zZG?5T6rI8gxP8N3P2*zi}=)Ebz>bkx9)Hhls^u2g@DIN`^{2LmXCAjq-)8 z%L?Z$&T6H`TKD8H4CJ+yG}md4B90{_kc0>sHIz|-g$S)0DJD|1AM4^Dar{Yg$>b`7 zkz)Z>sE`~#_#gc4)+|gI z*1|`?;5Kk^-PYti;Bp5Te$pjFawIQJp-=$c&*+s{XM@9gd0Gp+u90F=aXw5QcB6#xJL24YJ`L;xKCT>v~PI4LLq000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2k8h24_CX>@2HM@dakSAh-}0004~NklyLvwO-my38xk}nszzPw=i^EY8{p|-jZjE+z6b8U~rzgVU=7pbpTt#H&iB=>xYA)&rr zWomQrNpkEjgi}0*UgQU#skXWhJSNbK{37@Z7Qm-sKc3K500000NkvXXu0mjfW#YhL literal 0 HcmV?d00001 diff --git a/kubejs/data/tfg/loot_tables/entities/glacian_ram.json b/kubejs/data/tfg/loot_tables/entities/glacian_ram.json new file mode 100644 index 000000000..b42b5f472 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/entities/glacian_ram.json @@ -0,0 +1,60 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_glacian_mutton", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "tfc:animal_yield", + "min": 4, + "max": { + "type": "minecraft:uniform", + "min": 12, + "max": 18 + } + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 3, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfc:small_raw_hide" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/entities/sniffer.json b/kubejs/data/tfg/loot_tables/entities/sniffer.json new file mode 100644 index 000000000..9dd0b7197 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/entities/sniffer.json @@ -0,0 +1,60 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 2, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_sniffer_beef", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "tfc:animal_yield", + "min": 4, + "max": { + "type": "minecraft:uniform", + "min": 12, + "max": 18 + } + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 2, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 3, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfc:large_raw_hide" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index 4d1eabd3c..b5d6df690 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -140,6 +140,32 @@ const registerTFGFoodData = (event) => { food.decayModifier(2.25) }) + event.foodItem('tfg:food/raw_glacian_mutton', food => { + food.hunger(4) + food.protein(2.0) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_glacian_mutton', food => { + food.hunger(6) + food.saturation(3) + food.protein(5) + food.decayModifier(1.5) + }) + + event.foodItem('tfg:food/raw_sniffer_beef', food => { + food.hunger(4) + food.protein(2.0) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_sniffer_beef', food => { + food.hunger(6) + food.saturation(4) + food.protein(7) + food.decayModifier(1.5) + }) + // high-tech food global.FOOD_FRUIT.forEach(fruit => { @@ -512,4 +538,4 @@ const registerTFGFLPlanters = (event) => { ], null ) -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index 110edad0d..e24102fd8 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -910,6 +910,12 @@ function registerTFGFoodRecipes(event) { event.recipes.tfc.heating('betterend:cave_pumpkin_pie_raw', 200) .resultItem(TFC.isp.of('betterend:cave_pumpkin_pie').copyFood()) + event.recipes.tfc.heating('tfg:food/raw_glacian_mutton', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_glacian_mutton').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_sniffer_beef', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_sniffer_beef').copyFood()) + event.recipes.tfc.advanced_shapeless_crafting( TFC.itemStackProvider.of('4x betterend:cave_pumpkin_chunks').copyFood(), [TFC.ingredient.notRotten('betterend:cave_pumpkin'), '#forge:tools/hammers'], 'betterend:cave_pumpkin') diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 7c52bd704..3d7f4843a 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -916,7 +916,9 @@ global.TFC_MEAT_RECIPE_COMPONENTS = [ { input: 'betterend:bolux_mushroom_product', output: 'betterend:bolux_mushroom_cooked', name: 'bolux_mushroom' }, { input: 'betterend:chorus_mushroom_product', output: 'betterend:chorus_mushroom_cooked', name: 'chorus_mushroom' }, { input: 'betterend:shadow_berry_product', output: 'betterend:shadow_berry_cooked', name: 'shadow_berry' }, - { input: 'betterend:cave_pumpkin_pie_raw', output: 'betterend:cave_pumpkin_pie', name: 'cave_pumpkin_pie' } + { input: 'betterend:cave_pumpkin_pie_raw', output: 'betterend:cave_pumpkin_pie', name: 'cave_pumpkin_pie' }, + { input: 'tfg:food/raw_glacian_mutton', output: 'tfg:food/cooked_glacian_mutton', name: 'cooked_glacian_mutton' }, + { input: 'tfg:food/raw_sniffer_beef', output: 'tfg:food/cooked_sniffer_beef', name: 'cooked_sniffer_beef' } ]; global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = [ diff --git a/kubejs/startup_scripts/tfg/items.food.js b/kubejs/startup_scripts/tfg/items.food.js index c4ceaef7f..fb83495cd 100644 --- a/kubejs/startup_scripts/tfg/items.food.js +++ b/kubejs/startup_scripts/tfg/items.food.js @@ -90,6 +90,36 @@ function registerTFGFoodItems(event) { .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') + event.create('tfg:food/raw_glacian_mutton') + .translationKey('item.tfg.food.raw_glacian_mutton') + .texture('tfg:item/food/raw_glacian_mutton') + .food(food => food.hunger(2).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_glacian_mutton') + .translationKey('item.tfg.food.cooked_glacian_mutton') + .texture('tfg:item/food/cooked_glacian_mutton') + .food(food => food.hunger(6).saturation(10)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + event.create('tfg:food/raw_sniffer_beef') + .translationKey('item.tfg.food.raw_sniffer_beef') + .texture('tfg:item/food/raw_sniffer_beef') + .food(food => food.hunger(3).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_sniffer_beef') + .translationKey('item.tfg.food.cooked_sniffer_beef') + .texture('tfg:item/food/cooked_sniffer_beef') + .food(food => food.hunger(8).saturation(10)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + event.create('tfg:food/ice_soup') .translationKey('item.tfg.food.ice_soup') .texture('tfg:item/food/ice_soup') @@ -97,4 +127,4 @@ function registerTFGFoodItems(event) { ctx.player.give('tfc:ceramic/bowl') })) // intentionally not tagged as food -} \ No newline at end of file +} From a71a6e79e175994186279668ec546eb1648faf92 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 12 Aug 2025 22:55:03 +0100 Subject: [PATCH 036/158] small fixes --- CHANGELOG.md | 3 +++ kubejs/server_scripts/greate/recipes.js | 12 ++++++------ kubejs/server_scripts/gregtech/recipes.js | 8 ++++++-- kubejs/server_scripts/tfc/recipes.metals.js | 18 ++++++++++++++++++ 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f97c6f266..48e98305b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,12 @@ ### Changes - Complete rework of prospector's picks. (#1594) @Redeix - Rebalance Large Solar Array to make Mk2 circuit 2 viable, and buffed to LSA Mk3 circuit 2 (#1591) @TomPlop +- Added mechanical press recipes to weld weak steels @Pyritie ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop +- Fixed duplicate mixer recipes for rose gold and sterling silver @Pyritie +- Fixed mechanical mixers requiring an alloy that needed that tier of mixer @Pyritie ## [0.10.9] - 10-08-2025 ### Changes diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index c6cb6ddf9..f51c85dc5 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -637,14 +637,14 @@ function registerGreateRecipes(event) { A: '#gtceu:circuits/mv', B: 'greate:aluminium_shaft', C: 'gtceu:mv_machine_hull', - D: '#forge:plates/vanadium_steel', + D: '#forge:plates/cobalt_brass', E: 'gtceu:aluminium_whisk', F: '#forge:tools/wrenches', G: '#forge:tools/hammers' }).id('greate:shaped/aluminium_mechanical_mixer') event.recipes.gtceu.assembler('greate:aluminium_mechanical_mixer') - .itemInputs('greate:aluminium_shaft', '2x #gtceu:circuits/mv', 'gtceu:mv_machine_hull', 'gtceu:aluminium_whisk', '2x #forge:plates/vanadium_steel') + .itemInputs('greate:aluminium_shaft', '2x #gtceu:circuits/mv', 'gtceu:mv_machine_hull', 'gtceu:aluminium_whisk', '2x #forge:plates/cobalt_brass') .itemOutputs('greate:aluminium_mechanical_mixer') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) @@ -657,14 +657,14 @@ function registerGreateRecipes(event) { A: '#gtceu:circuits/hv', B: 'greate:stainless_steel_shaft', C: 'gtceu:hv_machine_hull', - D: '#forge:plates/blue_alloy', + D: '#forge:plates/vanadium_steel', E: 'gtceu:stainless_steel_whisk', F: '#forge:tools/wrenches', G: '#forge:tools/hammers' }).id('greate:shaped/stainless_steel_mechanical_mixer') event.recipes.gtceu.assembler('greate:stainless_steel_mechanical_mixer') - .itemInputs('greate:stainless_steel_shaft', '2x #gtceu:circuits/hv', 'gtceu:hv_machine_hull', 'gtceu:stainless_steel_whisk', '2x #forge:plates/blue_alloy') + .itemInputs('greate:stainless_steel_shaft', '2x #gtceu:circuits/hv', 'gtceu:hv_machine_hull', 'gtceu:stainless_steel_whisk', '2x #forge:plates/vanadium_steel') .itemOutputs('greate:stainless_steel_mechanical_mixer') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) @@ -677,14 +677,14 @@ function registerGreateRecipes(event) { A: '#gtceu:circuits/ev', B: 'greate:titanium_shaft', C: 'gtceu:ev_machine_hull', - D: '#forge:plates/ultimet', + D: '#forge:plates/blue_alloy', E: 'gtceu:titanium_whisk', F: '#forge:tools/wrenches', G: '#forge:tools/hammers' }).id('greate:shaped/titanium_mechanical_mixer') event.recipes.gtceu.assembler('greate:titanium_mechanical_mixer') - .itemInputs('greate:titanium_shaft', '2x #gtceu:circuits/ev', 'gtceu:ev_machine_hull', 'gtceu:titanium_whisk', '2x #forge:plates/ultimet') + .itemInputs('greate:titanium_shaft', '2x #gtceu:circuits/ev', 'gtceu:ev_machine_hull', 'gtceu:titanium_whisk', '2x #forge:plates/blue_alloy') .itemOutputs('greate:titanium_mechanical_mixer') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index d3503f3ac..2ddfce76e 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -525,10 +525,14 @@ const registerGTCEURecipes = (event) => { .EUt(5) // Исправление рецепта пыли серебра стерлинга - generateMixerRecipe(event, ['#forge:dusts/copper', '4x #forge:dusts/silver'], [], '5x gtceu:sterling_silver_dust', 1, [], 500, 7, 64, 'sterling_silver') + event.remove({ id: 'gtceu:mixer/sterling_silver' }) + generateMixerRecipe(event, ['#forge:dusts/copper', '4x #forge:dusts/silver'], [], '5x gtceu:sterling_silver_dust', + 1, [], 500, 7, 64, 'gtceu:mixer/sterling_silver') // Исправление рецепта пыли розовой бронзы - generateMixerRecipe(event, ['#forge:dusts/copper', '4x #forge:dusts/gold'], [], '5x gtceu:rose_gold_dust', 3, [], 500, 7, 64, 'rose_gold') + event.remove({ id: 'gtceu:mixer/rose_gold' }) + generateMixerRecipe(event, ['#forge:dusts/copper', '4x #forge:dusts/gold'], [], '5x gtceu:rose_gold_dust', + 3, [], 500, 7, 64, 'gtceu:mixer/rose_gold') //#region Рецепт ULV микросхемы diff --git a/kubejs/server_scripts/tfc/recipes.metals.js b/kubejs/server_scripts/tfc/recipes.metals.js index d201eb609..0a005c29c 100644 --- a/kubejs/server_scripts/tfc/recipes.metals.js +++ b/kubejs/server_scripts/tfc/recipes.metals.js @@ -162,6 +162,12 @@ function registerTFCMetalsRecipes(event) { .EUt(4) // Слабая сталь + Чугун -> Высокоуглеродная черная сталь + event.recipes.greate.compacting('tfc:metal/ingot/high_carbon_black_steel', + ['tfc:metal/ingot/weak_steel', 'tfc:metal/ingot/pig_iron', 'tfc:powder/flux']) + .heated() + .recipeTier(1) + .id(`greate:compacting/high_carbon_black_steel`) + event.recipes.gtceu.alloy_smelter('tfg/high_carbon_black_steel') .itemInputs('tfc:metal/ingot/weak_steel', 'tfc:metal/ingot/pig_iron') .itemOutputs('2x tfc:metal/ingot/high_carbon_black_steel') @@ -169,6 +175,12 @@ function registerTFCMetalsRecipes(event) { .EUt(4) // Слабая синяя сталь + Черная сталь -> Высокоуглеродная синяя сталь + event.recipes.greate.compacting('tfc:metal/ingot/high_carbon_blue_steel', + ['tfc:metal/ingot/weak_blue_steel', 'tfc:metal/ingot/black_steel', 'tfc:powder/flux']) + .heated() + .recipeTier(1) + .id(`greate:compacting/high_carbon_blue_steel`) + event.recipes.gtceu.alloy_smelter('tfg/high_carbon_blue_steel') .itemInputs('tfc:metal/ingot/weak_blue_steel', 'tfc:metal/ingot/black_steel') .itemOutputs('2x tfc:metal/ingot/high_carbon_blue_steel') @@ -176,6 +188,12 @@ function registerTFCMetalsRecipes(event) { .EUt(4) // Слабая красная сталь + Черная сталь -> Высокоуглеродная красная сталь + event.recipes.greate.compacting('tfc:metal/ingot/high_carbon_red_steel', + ['tfc:metal/ingot/weak_red_steel', 'tfc:metal/ingot/black_steel', 'tfc:powder/flux']) + .heated() + .recipeTier(1) + .id(`greate:compacting/high_carbon_red_steel`) + event.recipes.gtceu.alloy_smelter('tfg/high_carbon_red_steel') .itemInputs('tfc:metal/ingot/weak_red_steel', 'tfc:metal/ingot/black_steel') .itemOutputs('2x tfc:metal/ingot/high_carbon_red_steel') From 7fb821dae98a6cf2a6c2aacdce7bc171dd1bae97 Mon Sep 17 00:00:00 2001 From: Zippity Date: Tue, 12 Aug 2025 15:14:44 -0700 Subject: [PATCH 037/158] fix sharp tools not taking damage when cutting grass (#1614) Co-authored-by: Redeix --- kubejs/server_scripts/tfg/events.js | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/tfg/events.js b/kubejs/server_scripts/tfg/events.js index cc193ed06..77bd5d5f9 100644 --- a/kubejs/server_scripts/tfg/events.js +++ b/kubejs/server_scripts/tfg/events.js @@ -526,4 +526,23 @@ BlockEvents.rightClicked(event => { transformBlockWithItem(event, `tfc:rock/mossy_cobble/${stone}_wall`, `tfc:rock/cobble/${stone}_wall`, 'tfc:groundcover/pumice', true, 1, 'minecraft:item.axe.wax_off', 'minecraft:item_slime', true); }); }); -//#endregion \ No newline at end of file + +// Makes scythes, hoes, and knives take damage when cutting grass +BlockEvents.broken('tfc:mineable_with_sharp_tool', event => { + let player = event.player; + let toolUsed = player.mainHandItem; + + if (!toolUsed.hasTag('tfc:sharp_tools')) { + return; + } + + if (!player.isCreative()) { + toolUsed.damageValue++; + if (toolUsed.damageValue >= toolUsed.maxDamage) { + event.server.runCommandSilent(`playsound minecraft:item.shield.break player ${player.username} ${player.x} ${player.y} ${player.z} 1 1 1`); + toolUsed.count--; + } + } +}); + +//#endregion From 463784a90a435f13ded745879e4ae07ef5189a47 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 12 Aug 2025 23:37:43 +0100 Subject: [PATCH 038/158] nerfed ore crushing in a forge hammer to be a little less stupidly fast --- kubejs/server_scripts/gregtech/recipes.materials.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index b62db6537..60df5f9f7 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -436,7 +436,7 @@ function registerGTCEUMetalRecipes(event) { let hammerRecipe = event.recipes.gtceu.forge_hammer(`hammer_poor_raw_${material.getName()}_to_crushed_ore`) .itemInputs(poorOreItem) .category(GTRecipeCategories.ORE_FORGING) - .duration(10) + .duration(100) .EUt(16) if (material.hasProperty(PropertyKey.GEM)) { @@ -506,7 +506,7 @@ function registerGTCEUMetalRecipes(event) { let hammerRecipe = event.recipes.gtceu.forge_hammer(`hammer_raw_${material.getName()}_to_crushed_ore`) .itemInputs(normalOreItem) .category(GTRecipeCategories.ORE_FORGING) - .duration(10) + .duration(100) .EUt(16) if (material.hasProperty(PropertyKey.GEM)) { @@ -568,7 +568,7 @@ function registerGTCEUMetalRecipes(event) { let hammerRecipe = event.recipes.gtceu.forge_hammer(`hammer_rich_raw_${material.getName()}_to_crushed_ore`) .itemInputs(richOreItem) .category(GTRecipeCategories.ORE_FORGING) - .duration(10) + .duration(100) .EUt(16) if (material.hasProperty(PropertyKey.GEM)) { From fc357696786d81d88dc0584b9cc7fe8004c5cc3b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 13 Aug 2025 00:19:36 +0100 Subject: [PATCH 039/158] removed the lye to sodium hydroxide pot recipe, now it's vat-only #1615 --- kubejs/server_scripts/tfc/recipes.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index a84f4fe8a..9ce81ee01 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -208,10 +208,6 @@ const registerTFCRecipes = (event) => { generateMixerRecipe(event, '#forge:dusts/sodium_hydroxide', "#tfg:clean_water 1000", [], null, Fluid.of('tfc:lye', 1000), 100, 2, 64, 'lye_from_sodium_hydroxide') - event.recipes.tfc.pot([], Fluid.of('tfc:lye', 1000), 100, 80) - .itemOutput('gtceu:sodium_hydroxide_dust') - .id('tfg:pot/sodium_hydroxide') - event.recipes.firmalife.vat() .inputFluid(Fluid.of('tfc:lye', 1000)) .outputItem('gtceu:sodium_hydroxide_dust') From 848dc99bf8268926052b2b97c78aaca06c8bca72 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Wed, 13 Aug 2025 11:06:50 -0500 Subject: [PATCH 040/158] some modpack cleanup from glacian ram/sniffer (#1617) * whitespace changes * some animal compat * snifferified recipes * nest box recipe --- .../assets/tfg/models/item/sniffer_wool.json | 6 + .../entity/sniffer/sheared_sniffer.png | Bin 0 -> 8607 bytes .../assets/tfg/textures/item/sniffer_wool.png | Bin 0 -> 852 bytes .../tfg/loot_tables/entities/glacian_ram.json | 118 +++++++++--------- .../tfg/loot_tables/entities/sniffer.json | 118 +++++++++--------- kubejs/server_scripts/tfg/recipes.food.js | 5 +- .../tfg/recipes.miscellaneous.js | 38 +++++- kubejs/server_scripts/tfg/tags.js | 16 +++ 8 files changed, 179 insertions(+), 122 deletions(-) create mode 100644 kubejs/assets/tfg/models/item/sniffer_wool.json create mode 100644 kubejs/assets/tfg/textures/entity/sniffer/sheared_sniffer.png create mode 100644 kubejs/assets/tfg/textures/item/sniffer_wool.png diff --git a/kubejs/assets/tfg/models/item/sniffer_wool.json b/kubejs/assets/tfg/models/item/sniffer_wool.json new file mode 100644 index 000000000..ce0429cbd --- /dev/null +++ b/kubejs/assets/tfg/models/item/sniffer_wool.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/sniffer_wool" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/entity/sniffer/sheared_sniffer.png b/kubejs/assets/tfg/textures/entity/sniffer/sheared_sniffer.png new file mode 100644 index 0000000000000000000000000000000000000000..7bdc6c7c158fe5a9cac6f8d7077a0c1ca5c0d247 GIT binary patch literal 8607 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 Aod5s; literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/sniffer_wool.png b/kubejs/assets/tfg/textures/item/sniffer_wool.png new file mode 100644 index 0000000000000000000000000000000000000000..05346ed1673d9bf39eaa4943deb7ddc2b1d748e1 GIT binary patch literal 852 zcmV-a1FQUrP)EX>4Tx04R}tkv&MmKpe$iQ>8^(9IPPXkfA!+MMWG-6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|E;uQ=NQwVT3N2zhIPS;0dyl(!fY7Qj)$EG{s%9CP zWJ1grR>i<8f(S#vF#HlT^;C8-2hZ_!4omuZ#1c|SLxhY5s;I$2j8=^l6B*i1c=$&hf0|q}xvF5~ zSU?>rB*zc_2fw>DOVd+sQYZoRzu5N2I1tzc+D+U3KDO=l3E+PQuC%Vd-U8-6NpE(w z=n*iu4P0DzHF*!X+yO?Objgq$$xl-#m4Np%`lbRfbPEiuxxIDvaryw{sH^20;NTFL zC{y;j$Gd~Qz5RQp)87v@_HvH!58R6Y000JJOGiWi000000Qp0^e*gdg32;bRa{vG? zBLDy{BLR4&KXw2B00(qQO+^Rk2n_-o3j*b}iU0rr8FWQhbVF}#ZDnqB07G(RVRU6= zAa`kWXdp*PO;A^X4i^9b0WC>HK~y-)&62-M0%077pY!76@)jk8BSEcDYG?}#K?vFu zT3!1S8=Bg}p&vBV&>;~HX4-qFo|4=-y-jzR`hr`1w)YFq=Y4p;FZ^}1uz21@zGffY~gJ)pd8s#Ptb8K>zwqTWb&w z!x)}=(^y>vuM~XUJZYjW5N#1ZT%^1XUfDua0$|rGa^SQ8n7IDtKXEa3y&}!5sl0uo e*!7C!U*`uL?T5c<=^Cp50000 { event.add('forge:mars_stone_dusts', 'gtceu:granite_red_dust') event.add('forge:mars_stone_dusts', 'tfg:mars_stone_dust') + //Mars animal region + event.add('tfg:martian_eggs', 'tfg:sniffer_egg') + + event.add('tfg:martian_animal_foods', 'betterend:amber_root_product') + event.add('tfg:martian_animal_foods', 'betterend:blossom_berry_product') + event.add('tfg:martian_animal_foods', 'betterend:chorus_mushroom_product') + event.add('tfg:martian_animal_foods', 'betterend:shadow_berry_product') + event.add('tfg:martian_animal_foods', 'betterend:bolux_mushroom_product') + event.add('tfg:martian_animal_foods', 'betterend:cave_pumpkin_chunks') + + event.add('tfg:glacian_ram_food', '#tfg:martian_animal_foods') + event.add('tfg:sniffer_food', '#tfg:martian_animal_foods') + + //#endregion + + // #region 0.7.19 -> 0.9 conversion event.add('c:hidden_from_recipe_viewers', 'treetap:tap') event.add('c:hidden_from_recipe_viewers', 'tfcea:refrigerator') From d82addb351e5cc7109dda7854409847894b4a54d Mon Sep 17 00:00:00 2001 From: Redeix Date: Wed, 13 Aug 2025 12:47:12 -0500 Subject: [PATCH 041/158] prospecting vein particle (#1618) --- kubejs/assets/tfg/particles/ore_prospector_vein.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 kubejs/assets/tfg/particles/ore_prospector_vein.json diff --git a/kubejs/assets/tfg/particles/ore_prospector_vein.json b/kubejs/assets/tfg/particles/ore_prospector_vein.json new file mode 100644 index 000000000..74e1988cc --- /dev/null +++ b/kubejs/assets/tfg/particles/ore_prospector_vein.json @@ -0,0 +1,5 @@ +{ + "textures": [ + "tfg:ore_prospector_particle" + ] +} From 8787781f2777f6c76814b6ca32daf461cc5dc698 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 13 Aug 2025 21:29:56 +0100 Subject: [PATCH 042/158] this doesn't fix dyed toolbelts (#368), but it does fix the other long-standing issue with upgrading them --- config/toolbelt-common.toml | 4 ++-- defaultconfigs/toolbelt-server.toml | 2 +- kubejs/server_scripts/toolbelt/recipes.js | 23 +++++++++++++++++++---- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/config/toolbelt-common.toml b/config/toolbelt-common.toml index 7f42d7886..5febf8a57 100644 --- a/config/toolbelt-common.toml +++ b/config/toolbelt-common.toml @@ -1,13 +1,13 @@ [general] #If set to FALSE, support for sewing recipes will not be enabled regardless of the mod's presence. - enableSewingKitSupport = true + enableSewingKitSupport = false #If AUTO, the crafting and upgrade recipes will use the Sewing mechanics if the Sewing Kit mod is present. Off disables anvil upgrading regardless. #Allowed Values: OFF, AUTO, ON anvilUpgrading = "AUTO" #If AUTO, the belt and pouch crafting recipes will be disabled if the Sewing Kit mod is present, sewing recipes will be used instead. #Allowed Values: OFF, AUTO, ON - enableGridCraftingRecipes = "AUTO" + enableGridCraftingRecipes = "ON" #If AUTO, the belt slot will be disabled if Curios is present. If OFF, the belt slot will be disabled permanently. #Allowed Values: OFF, AUTO, ON customBeltSlotMode = "ON" diff --git a/defaultconfigs/toolbelt-server.toml b/defaultconfigs/toolbelt-server.toml index 936a23ea7..2224bd62b 100644 --- a/defaultconfigs/toolbelt-server.toml +++ b/defaultconfigs/toolbelt-server.toml @@ -3,7 +3,7 @@ #List of items to force-allow placing in the belt. Takes precedence over blacklist. whitelist = [] #List of items to disallow from placing in the belt. (whitelist takes precedence) - blacklist = [] + blacklist = ["tfclunchbox:lunchbox", "tfclunchbox:cooling_lunchbox", "tfclunchbox:electric_lunchbox", "sophisticatedbackpacks:backpack", "sophisticatedbackpacks:iron_backpack", "sophisticatedbackpacks:gold_backpack", "sophisticatedbackpacks:diamond_backpack", "sophisticatedbackpacks:netherite_backpack", "tfc:ceramic/cyan_glazed_vessel", "tfc:ceramic/purple_glazed_vessel", "tfc:ceramic/blue_glazed_vessel", "tfc:ceramic/brown_glazed_vessel", "tfc:ceramic/green_glazed_vessel", "tfc:ceramic/red_glazed_vessel", "tfc:ceramic/black_glazed_vessel", "tfc:ceramic/large_vessel/gray", "tfc:ceramic/large_vessel/pink", "tfc:ceramic/large_vessel/lime", "tfc:ceramic/large_vessel/yellow", "tfc:ceramic/large_vessel/light_blue", "tfc:ceramic/large_vessel/magenta", "tfc:ceramic/large_vessel/orange", "tfc:ceramic/large_vessel/white", "tfc:ceramic/large_vessel", "tfc:ceramic/large_vessel/light_gray", "tfc:ceramic/large_vessel/cyan", "tfc:ceramic/large_vessel/purple", "tfc:ceramic/large_vessel/blue", "tfc:ceramic/large_vessel/brown", "tfc:ceramic/large_vessel/green", "tfc:ceramic/large_vessel/red", "tfc:ceramic/large_vessel/black", "tfc:ceramic/vessel", "tfc:ceramic/light_gray_glazed_vessel", "tfc:ceramic/gray_glazed_vessel", "tfc:ceramic/pink_glazed_vessel", "tfc:ceramic/lime_glazed_vessel", "tfc:ceramic/yellow_glazed_vessel", "tfc:ceramic/light_blue_glazed_vessel", "tfc:ceramic/magenta_glazed_vessel", "tfc:ceramic/orange_glazed_vessel", "tfc:ceramic/white_glazed_vessel"] #When set to false, stackable items will no longer be allowed by default. allowAllNonStackableItems = true diff --git a/kubejs/server_scripts/toolbelt/recipes.js b/kubejs/server_scripts/toolbelt/recipes.js index edeaf6c45..416eb646d 100644 --- a/kubejs/server_scripts/toolbelt/recipes.js +++ b/kubejs/server_scripts/toolbelt/recipes.js @@ -14,7 +14,7 @@ const registerToolBeltRecipes = (event) => { ], { A: '#forge:string', B: '#forge:leather', - C: '#forge:plates/wrought_iron' + C: '#forge:bolts/rose_gold' }).id('tfg:toolbelt/shaped/pouch') // ToolBelt с размером 2 @@ -26,13 +26,28 @@ const registerToolBeltRecipes = (event) => { A: '#forge:string', B: '#forge:leather', C: '#forge:plates/wrought_iron' - }).id(`tfg:toolbelt/shaped/belt_${ 2}`) + }).id(`tfg:toolbelt/shaped/belt_${2}`) + + event.shapeless(Item.of('toolbelt:belt', {Size:3}), [ + Ingredient.of(Item.of('toolbelt:belt').strongNBT()), + 'toolbelt:pouch' + ]).id(`tfg:toolbelt/shaped/first_upgrade`) + + event.shapeless(Item.of('toolbelt:belt', {Size:3,Items:[]}), [ + Ingredient.of(Item.of('toolbelt:belt', {Items:[]}).strongNBT()), + 'toolbelt:pouch' + ]).id(`tfg:toolbelt/shaped/first_upgrade_alt`) // ToolBelt с размером 3 - 9 for (let i = 3; i < 10; i++) { event.shapeless(Item.of('toolbelt:belt', {Size:i}), [ - Ingredient.of(Item.of('toolbelt:belt', {Size:i-1}).strongNBT()).or(Ingredient.of(Item.of('toolbelt:belt', {Size:i-1,Items:[]}).strongNBT())), + Ingredient.of(Item.of('toolbelt:belt', {Size:i-1}).strongNBT()), 'toolbelt:pouch' - ]).id(`tfg:toolbelt/shaped/belt_${ i}`) + ]).id(`tfg:toolbelt/shaped/belt_${i}`) + + event.shapeless(Item.of('toolbelt:belt', {Size:i}), [ + Ingredient.of(Item.of('toolbelt:belt', {Size:i-1,Items:[]}).strongNBT()), + 'toolbelt:pouch' + ]).id(`tfg:toolbelt/shaped/belt_${i}_alt`) } } From 4cb712ceabf74ae100df7346df6e99489fd75655 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 13 Aug 2025 22:24:40 +0100 Subject: [PATCH 043/158] never mind! that actually wasn't that bad --- kubejs/server_scripts/toolbelt/recipes.js | 91 ++++++++++++----------- 1 file changed, 49 insertions(+), 42 deletions(-) diff --git a/kubejs/server_scripts/toolbelt/recipes.js b/kubejs/server_scripts/toolbelt/recipes.js index 416eb646d..94b1969f7 100644 --- a/kubejs/server_scripts/toolbelt/recipes.js +++ b/kubejs/server_scripts/toolbelt/recipes.js @@ -2,52 +2,59 @@ "use strict"; const registerToolBeltRecipes = (event) => { - - // Удаление всех рецептов мода - event.remove({ mod: 'toolbelt' }); - // Мешочек - event.shaped('toolbelt:pouch', [ - 'ACA', - 'B B', - 'ABA' - ], { - A: '#forge:string', - B: '#forge:leather', - C: '#forge:bolts/rose_gold' - }).id('tfg:toolbelt/shaped/pouch') + event.remove({ mod: 'toolbelt' }); - // ToolBelt с размером 2 - event.shaped(Item.of('toolbelt:belt', {Size:2}), [ - 'ABA', - 'B B', - 'BCB' - ], { - A: '#forge:string', - B: '#forge:leather', - C: '#forge:plates/wrought_iron' - }).id(`tfg:toolbelt/shaped/belt_${2}`) + event.shaped('toolbelt:pouch', [ + 'ACA', + 'BAB' + ], { + A: '#forge:string', + B: '#forge:leather', + C: '#forge:bolts/rose_gold' + }).id('tfg:toolbelt/shaped/pouch') - event.shapeless(Item.of('toolbelt:belt', {Size:3}), [ - Ingredient.of(Item.of('toolbelt:belt').strongNBT()), - 'toolbelt:pouch' - ]).id(`tfg:toolbelt/shaped/first_upgrade`) + event.shaped(Item.of('toolbelt:belt', { Size: 2 }), [ + 'ABA', + 'B B', + 'BCB' + ], { + A: '#forge:string', + B: '#forge:leather', + C: '#forge:plates/wrought_iron' + }).id(`tfg:toolbelt/shaped/belt_${2}`) - event.shapeless(Item.of('toolbelt:belt', {Size:3,Items:[]}), [ - Ingredient.of(Item.of('toolbelt:belt', {Items:[]}).strongNBT()), - 'toolbelt:pouch' - ]).id(`tfg:toolbelt/shaped/first_upgrade_alt`) - // ToolBelt с размером 3 - 9 - for (let i = 3; i < 10; i++) { - event.shapeless(Item.of('toolbelt:belt', {Size:i}), [ - Ingredient.of(Item.of('toolbelt:belt', {Size:i-1}).strongNBT()), - 'toolbelt:pouch' - ]).id(`tfg:toolbelt/shaped/belt_${i}`) + event.shapeless('toolbelt:belt', ['toolbelt:belt', 'toolbelt:pouch']) + .modifyResult((grid, result) => { + let orig = grid.find(Item.of('toolbelt:belt').ignoreNBT()) - event.shapeless(Item.of('toolbelt:belt', {Size:i}), [ - Ingredient.of(Item.of('toolbelt:belt', {Size:i-1,Items:[]}).strongNBT()), - 'toolbelt:pouch' - ]).id(`tfg:toolbelt/shaped/belt_${i}_alt`) - } + if (orig.nbt == null) { + orig.nbt = { Size: 3 }; + } + else { + if (orig.nbt.Size == null) { + orig.nbt = { Size: 3 }; + } + else { + orig.nbt.Size = orig.nbt.getInt("Size") + 1; + } + } + + return result.withNBT(orig.nbt); + }) + + + event.shapeless('toolbelt:belt', ['toolbelt:belt', 'tfc:powder/wood_ash']) + .modifyResult((grid, result) => { + let orig = grid.find(Item.of('toolbelt:belt').ignoreNBT()) + + if (orig.nbt == null || orig.nbt.display == null) { + return result; + } + else { + delete orig.nbt.display; + return result.withNBT(orig.nbt); + } + }) } From 85627439eb4658ef65ef199f24b3715b50636244 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 13 Aug 2025 22:28:34 +0100 Subject: [PATCH 044/158] changelog for toolbelt, removed the old tooltips too --- CHANGELOG.md | 2 ++ kubejs/client_scripts/tooltips.js | 12 +++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48e98305b..973a8b2ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,13 @@ - Complete rework of prospector's picks. (#1594) @Redeix - Rebalance Large Solar Array to make Mk2 circuit 2 viable, and buffed to LSA Mk3 circuit 2 (#1591) @TomPlop - Added mechanical press recipes to weld weak steels @Pyritie +- Added backpacks, lunchboxes, and vessels to the toolbelt's blacklist @Pyritie ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop - Fixed duplicate mixer recipes for rose gold and sterling silver @Pyritie - Fixed mechanical mixers requiring an alloy that needed that tier of mixer @Pyritie +- Finally fixed all the issues with upgrading the toolbelt - now you can safely dye and undye, upgrade with and without tools inside it, etc (#368) @Pyritie ## [0.10.9] - 10-08-2025 ### Changes diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 507207135..7f731e842 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -7,15 +7,6 @@ const registerTooltips = (event) => { event.addAdvanced(['minecraft:name_tag'], (item, advanced, text) => { text.add(1, [text.of('§7Used on a Scribing Table along with an item to name it, or with black dye to name the tag.')]) }) - event.addAdvanced(['toolbelt:belt'], (item, advanced, text) => { - text.add(1, [text.of('§7Press the §o§6Swap Tool§7 keybind to open the radial menu.')]), - text.add(2, [text.of(`§7You can also right click with it in hand to add or remove tools.`)]) - text.add(3, [text.of(`§cDo not dye this or you won't be able to upgrade.`)]) - }) - event.addAdvanced(['toolbelt:pouch'], (item, advanced, text) => { - text.add(1, [text.of('§7Used to upgrade your toolbelt to add more slots')]), - text.add(2, [text.of(`§7Can't be used with §cd§ey§ae§9d §rbelts or belts that have tools inside.`)]) - }) event.addAdvanced(['firmalife:bucket/yeast_starter'], (item, advanced, text) => { text.add(1, [text.of('§7Created with dried fruit')]) }) @@ -35,6 +26,9 @@ const registerTooltips = (event) => { text.add(1, text.of('This machine has a §2Perfect Overclock§r!')), text.add(2, text.of(`The interior is customizable! Check the multiblock preview in JEI.`)) }) + event.addAdvanced(['gtceu:large_chemical_reactor'], (item, advanced, text) => { + text.add(1, text.of('This machine has a §2Perfect Overclock§r!')) + }) event.addAdvanced(['gtceu:nether_dome'], (item, advanced, text) => { text.add(1, text.of('§7Artificial enviroment to simulate the Nether.')), text.add(2, text.of(`§7The interior is customizable! Check the multiblock preview in JEI.`)) From af5e279954577141992d85d4eb40f51562937392 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 13 Aug 2025 22:31:18 +0100 Subject: [PATCH 045/158] moon rabbits can eat chorus fruit now --- CHANGELOG.md | 1 + kubejs/server_scripts/minecraft/tags.js | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 973a8b2ca..b7bf53774 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Rebalance Large Solar Array to make Mk2 circuit 2 viable, and buffed to LSA Mk3 circuit 2 (#1591) @TomPlop - Added mechanical press recipes to weld weak steels @Pyritie - Added backpacks, lunchboxes, and vessels to the toolbelt's blacklist @Pyritie +- Moon rabbits can eat chorus fruit now @Pyritie ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index 3e6d0e5e2..57861a2b4 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -54,6 +54,9 @@ const registerMinecraftItemTags = (event) => { event.add('tfc:foods/usable_in_salad', 'minecraft:glow_berries') event.add('tfc:foods/usable_in_salad', 'minecraft:chorus_fruit') event.add('tfc:foods/usable_in_salad', 'minecraft:popped_chorus_fruit') + + event.add('tfc:rabbit_food', 'minecraft:chorus_fruit') + event.add('tfc:rabbit_food', 'minecraft:popped_chorus_fruit') event.add('tfc:rock/raw', 'minecraft:deepslate') event.add('tfc:rock/raw', 'minecraft:blackstone') From 8657cc38b1dfabac55b44002ada778d20a53f5d5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 13 Aug 2025 22:33:28 +0100 Subject: [PATCH 046/158] fixed a dupe with certus quartz --- CHANGELOG.md | 1 + kubejs/server_scripts/gregtech/recipes.materials.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7bf53774..3125c8f7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Fixed duplicate mixer recipes for rose gold and sterling silver @Pyritie - Fixed mechanical mixers requiring an alloy that needed that tier of mixer @Pyritie - Finally fixed all the issues with upgrading the toolbelt - now you can safely dye and undye, upgrade with and without tools inside it, etc (#368) @Pyritie +- Fixed a dupe with certus quartz @Pyritie ## [0.10.9] - 10-08-2025 ### Changes diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index 60df5f9f7..10e47891b 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -775,7 +775,7 @@ function registerGTCEUMetalRecipes(event) { .id(`shapeless/mortar_chipped_${material.getName()}`) let amount = 9; - if (material === GTMaterials.NetherQuartz || material === GTMaterials.Amethyst) + if (material === GTMaterials.NetherQuartz || material === GTMaterials.CertusQuartz || material === GTMaterials.Amethyst) amount = 4; event.recipes.greate.pressing(ChemicalHelper.get(TagPrefix.gem, material, amount), ChemicalHelper.get(TagPrefix.block, material, 1)) From 6bba775be02134bf9608b20e85c311891a23cf5f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 13 Aug 2025 22:51:43 +0100 Subject: [PATCH 047/158] mushroom and bamboo EGH recipes, also changed them all to the appropriate kind of water --- CHANGELOG.md | 1 + kubejs/server_scripts/beneath/recipes.js | 8 ++++++++ kubejs/server_scripts/firmalife/recipes.js | 4 ++-- kubejs/server_scripts/minecraft/recipes.js | 13 ++++++++++++ kubejs/server_scripts/tfc/recipes.js | 24 +++++++++++----------- 5 files changed, 36 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3125c8f7f..996191b22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Added mechanical press recipes to weld weak steels @Pyritie - Added backpacks, lunchboxes, and vessels to the toolbelt's blacklist @Pyritie - Moon rabbits can eat chorus fruit now @Pyritie +- Added electric greenhouse recipes for mushrooms and bamboo (#1610) @Pyritie ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop diff --git a/kubejs/server_scripts/beneath/recipes.js b/kubejs/server_scripts/beneath/recipes.js index cbe2c6a8f..7af049fcc 100644 --- a/kubejs/server_scripts/beneath/recipes.js +++ b/kubejs/server_scripts/beneath/recipes.js @@ -75,6 +75,14 @@ const registerBeneathRecipes = (event) => { '64x beneath:wood/log/crimson', 'tfg:green_house/crimson_fungus', 'ad_astra:mars', 8, '16x minecraft:nether_wart_block', GTValues.VA[GTValues.MV]) + Ingredient.of('#beneath:mushrooms').stacks.forEach(element => { + const itemId = element.id; + const recipeId = `greenhouse_${itemId.replace(':', '_')}`; + + generateGreenHouseRecipe(event, element.withCount(4), '#tfc:any_fresh_water', 8000, element.withCount(24), + recipeId, 'minecraft:the_nether', 8, element.withCount(4), GTValues.VH[GTValues.LV]); + }); + // don't pass in the items like doors, trapdoors etc because beneath already has good recipes for those woodBuilder(event, 'crimson', 'beneath:wood/lumber/crimson', '#tfc:crimson_logs', 'beneath:wood/log/crimson', 'beneath:wood/stripped_log/crimson', 'beneath:wood/planks/crimson', null, diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 97703d632..97b87ad98 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -477,13 +477,13 @@ const registerFirmaLifeRecipes = (event) => { // Семена фруктов global.FIRMALIFE_GREENHOUSE_FRUIT_RECIPE_COMPONENTS.forEach(element => { - generateGreenHouseRecipe(event, element.input, '#tfg:clean_water', element.fluid_amount, element.output, + generateGreenHouseRecipe(event, element.input, '#tfc:any_fresh_water', element.fluid_amount, element.output, element.name, 'minecraft:overworld', 8, null, GTValues.VA[GTValues.LV]) }) // Семена ягод global.FIRMALIFE_GREENHOUSE_BERRY_RECIPE_COMPONENTS.forEach(element => { - generateGreenHouseRecipe(event, element.input, '#tfg:clean_water', element.fluid_amount, element.output, + generateGreenHouseRecipe(event, element.input, '#tfc:any_fresh_water', element.fluid_amount, element.output, element.name, null, 8, null, GTValues.VA[GTValues.LV]) }) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 6f7b2a40a..800a59dcf 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -1143,4 +1143,17 @@ const registerMinecraftRecipes = (event) => { .duration(50) .EUt(2) }) + + // Greenhouse + generateGreenHouseRecipe(event, '8x minecraft:bamboo', '#tfc:any_fresh_water', 4000, + '64x minecraft:bamboo', 'bamboo', 'minecraft:overworld', 8, + '8x minecraft:bamboo', GTValues.VA[GTValues.LV]) + + generateGreenHouseRecipe(event, '4x minecraft:red_mushroom', '#tfc:any_fresh_water', 4000, + '24x minecraft:red_mushroom', 'red_mushroom', 'minecraft:the_nether', 8, + '4x minecraft:red_mushroom', GTValues.VA[GTValues.LV]) + + generateGreenHouseRecipe(event, '4x minecraft:brown_mushroom', '#tfc:any_fresh_water', 4000, + '24x minecraft:brown_mushroom', 'brown_mushroom', 'minecraft:the_nether', 8, + '4x minecraft:brown_mushroom', GTValues.VA[GTValues.LV]) } diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 9ce81ee01..392a74016 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -57,31 +57,31 @@ const registerTFCRecipes = (event) => { // Дерево global.TFC_WOOD_TYPES.forEach(wood => { - generateGreenHouseRecipe(event, `8x tfc:wood/sapling/${wood}`, '#tfg:clean_water', 16000, `64x tfc:wood/log/${wood}`, - `tfg:greenhouse/${wood}`, 'minecraft:overworld', 16, null, GTValues.VH[GTValues.LV]) + generateGreenHouseRecipe(event, `8x tfc:wood/sapling/${wood}`, '#tfc:any_fresh_water', 16000, `64x tfc:wood/log/${wood}`, + `tfg:greenhouse/${wood}`, 'minecraft:overworld', 16, `8x tfc:wood/sapling/${wood}`, GTValues.VH[GTValues.LV]) }) global.AFC_SAPLINGS.forEach(x => { - generateGreenHouseRecipe(event, `8x afc:wood/sapling/${x.sapling}`, '#tfg:clean_water', 16000, `64x ${x.log}`, - `tfg:greenhouse/${x.sapling}`, 'minecraft:overworld', 16, null, GTValues.VH[GTValues.LV]) + generateGreenHouseRecipe(event, `8x afc:wood/sapling/${x.sapling}`, '#tfc:any_fresh_water', 16000, `64x ${x.log}`, + `tfg:greenhouse/${x.sapling}`, 'minecraft:overworld', 16, `8x afc:wood/sapling/${x.sapling}`, GTValues.VH[GTValues.LV]) }) // Семена фруктов global.TFC_GREENHOUSE_FRUIT_RECIPE_COMPONENTS.forEach(element => { - generateGreenHouseRecipe(event, element.input, '#tfg:clean_water', element.fluid_amount, element.output, - element.name, 'minecraft:overworld', 8, null, GTValues.VH[GTValues.LV]) + generateGreenHouseRecipe(event, element.input, '#tfc:any_fresh_water', element.fluid_amount, element.output, + element.name, 'minecraft:overworld', 8, element.input, GTValues.VH[GTValues.LV]) }) // Семена овощей global.TFC_GREENHOUSE_VEGETABLE_RECIPE_COMPONENTS.forEach(element => { - generateGreenHouseRecipe(event, element.input, '#tfg:clean_water', element.fluid_amount, element.output, - element.name, null, 8, null, GTValues.VH[GTValues.LV]) + generateGreenHouseRecipe(event, element.input, '#tfc:any_fresh_water', element.fluid_amount, element.output, + element.name, null, 8, element.input, GTValues.VH[GTValues.LV]) }) // Семена ягод global.TFC_GREENHOUSE_BERRY_RECIPE_COMPONENTS.forEach(element => { - generateGreenHouseRecipe(event, element.input, '#tfg:clean_water', element.fluid_amount, element.output, - element.name, null, 8, null, GTValues.VH[GTValues.LV]) + generateGreenHouseRecipe(event, element.input, '#tfc:any_fresh_water', element.fluid_amount, element.output, + element.name, null, 8, element.input, GTValues.VH[GTValues.LV]) }) // Растения @@ -89,8 +89,8 @@ const registerTFCRecipes = (event) => { const itemId = element.id; const recipeId = `greenhouse_${itemId.replace(':', '_')}`; - generateGreenHouseRecipe(event, itemId, '#tfg:clean_water', 8000, `8x ${itemId}`, - recipeId, null, 8, null, GTValues.VH[GTValues.LV]); + generateGreenHouseRecipe(event, itemId, '#tfc:any_fresh_water', 8000, `8x ${itemId}`, + recipeId, null, 8, `8x ${itemId}`, GTValues.VH[GTValues.LV]); }); //#endregion From 365fe1e5ca9cf458b163f3ebfe7ce1d73018a444 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 13 Aug 2025 23:08:01 +0100 Subject: [PATCH 048/158] moved golden apples to the food processor --- CHANGELOG.md | 1 + kubejs/server_scripts/minecraft/recipes.js | 28 ---------------------- kubejs/server_scripts/tfg/recipes.food.js | 17 +++++++++++++ 3 files changed, 18 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 996191b22..c4e73c764 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Fixed mechanical mixers requiring an alloy that needed that tier of mixer @Pyritie - Finally fixed all the issues with upgrading the toolbelt - now you can safely dye and undye, upgrade with and without tools inside it, etc (#368) @Pyritie - Fixed a dupe with certus quartz @Pyritie +- Moved the golden apple recipe over to the food processor so it respects food expiry data @Pyritie ## [0.10.9] - 10-08-2025 ### Changes diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 800a59dcf..92108d98c 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -288,34 +288,6 @@ const registerMinecraftRecipes = (event) => { //#endregion - //#region Выход: Золотое яблоко - - event.recipes.gtceu.chemical_reactor('golden_apple') - .itemInputs('tfc:food/green_apple', '8x #forge:ingots/gold') - .itemOutputs('minecraft:golden_apple') - .duration(50) - .EUt(30) - - event.recipes.gtceu.large_chemical_reactor('golden_apple') - .itemInputs('tfc:food/green_apple', '8x #forge:ingots/gold') - .itemOutputs('minecraft:golden_apple') - .duration(50) - .EUt(30) - - event.recipes.gtceu.chemical_reactor('golden_apple_1') - .itemInputs('tfc:food/red_apple', '8x #forge:ingots/gold') - .itemOutputs('minecraft:golden_apple') - .duration(50) - .EUt(30) - - event.recipes.gtceu.large_chemical_reactor('golden_apple_1') - .itemInputs('tfc:food/red_apple', '8x #forge:ingots/gold') - .itemOutputs('minecraft:golden_apple') - .duration(50) - .EUt(30) - - //#endregion - //#region Выход: Компаратор // Компаратор diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index 09075ca13..071822eec 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -880,6 +880,23 @@ function registerTFGFoodRecipes(event) { .id(`tfg:mortar/salt`) //#endregion + + //#region Выход: Золотое яблоко + + processorRecipe('golden_apple_from_red', 30 * 20, GTValues.VA[GTValues.HV], { + itemInputs: ['tfc:food/red_apple'], + fluidInputs: [Fluid.of('gtceu:gold', 144 * 8)], + itemOutputs: ['minecraft:golden_apple'], + circuit: 5 + }) + processorRecipe('golden_apple_from_green', 30 * 20, GTValues.VA[GTValues.HV], { + itemInputs: ['tfc:food/green_apple'], + fluidInputs: [Fluid.of('gtceu:gold', 144 * 8)], + itemOutputs: ['minecraft:golden_apple'], + circuit: 5 + }) + + //#endregion //#region New foods From 7ae68a1636bf771f03a893b9e4b3402f670435fe Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 13 Aug 2025 23:17:33 +0100 Subject: [PATCH 049/158] unification with pumpkin pie stuff --- kubejs/server_scripts/betterend/tags.js | 1 + kubejs/server_scripts/tfg/recipes.food.js | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/betterend/tags.js b/kubejs/server_scripts/betterend/tags.js index a8810133a..a7cc94002 100644 --- a/kubejs/server_scripts/betterend/tags.js +++ b/kubejs/server_scripts/betterend/tags.js @@ -28,6 +28,7 @@ function registerBetterEndItemTags(event) { event.add('tfc:foods', 'betterend:cave_pumpkin_pie_dough') event.add('tfc:foods', 'betterend:cave_pumpkin_pie_raw') event.add('tfc:foods', 'betterend:cave_pumpkin_pie') + event.add('firmalife:foods/washable', 'betterend:cave_pumpkin_pie_raw') event.add('firmalife:foods/washable', 'betterend:cave_pumpkin_pie') event.add('tfc:foods', 'betterend:chorus_mushroom_product') diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index 071822eec..f3d7eb3c0 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -683,8 +683,8 @@ function registerTFGFoodRecipes(event) { }) processorRecipe("raw_pumpkin_pie", 20, 8, { - itemInputs: ["firmalife:food/pumpkin_pie_dough", "firmalife:pie_pan"], - itemOutputs: ["firmalife:raw_pumpkin_pie"], + itemInputs: ["firmalife:food/pumpkin_pie_dough", "#firmalife:pie_pans"], + itemOutputs: ["firmalife:food/raw_pumpkin_pie"], itemOutputProvider: TFC.isp.of("firmalife:food/raw_pumpkin_pie").copyFood() }) @@ -961,6 +961,12 @@ function registerTFGFoodRecipes(event) { '#firmalife:pie_pans' ]).id(`tfg:shapeless/cave_pumpkin_pie_raw`) + processorRecipe("raw_cave_pumpkin_pie", 20, 8, { + itemInputs: [`betterend:cave_pumpkin_pie_dough`, "#firmalife:pie_pans"], + itemOutputs: ["betterend:cave_pumpkin_pie_raw"], + itemOutputProvider: TFC.isp.of("betterend:cave_pumpkin_pie_raw").copyFood() + }) + //#endregion // Food processing machine recipes From 55a2d32aea9da637eb360435b345a11a96ccc58c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 13 Aug 2025 23:19:31 +0100 Subject: [PATCH 050/158] langs --- kubejs/assets/tfg/lang/en_us.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 2bd81758f..b6a45ec2f 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -876,7 +876,9 @@ "tfg.toast.ore_prospector_message": "Ores found within %s §6blocks in this direction: %s", "tooltip.tfg.ore_prospector_stats": "Scan Range: %s, Cross Section: %s x %s.", "tooltip.tfg.ore_prospector_count": "This prospector will display ore counts.", - "tooltip.tfg.ore_prospector_xray": "This prospector will display an x-ray view of ore blocks.", + "tooltip.tfg.ore_prospector_xray": "This prospector will display a %s x-ray view of ore blocks.", + "tooltip.tfg.ore_prospector_mode_vein": "per-vein", + "tooltip.tfg.ore_prospector_mode_block": "per-block", "tfg.hangglider.disabled_dimension": "You can't use a hang glider here!", "tfc.jei.flint_knapping": "Flint Knapping", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "Dyeing", @@ -2749,7 +2751,7 @@ "quests.tfg_tips.portable_storage.desc": "In your travels, you may explore a whole &olot&r and end up picking up a lot of junk. This quest branch provides several options for expanding your on-the-go inventory.", "quests.tfg_tips.toolbelt.title": "Toolbelt and Pouches", "quests.tfg_tips.toolbelt.subtitle": "Those tools sure take up a lot of space, let's fix that!", - "quests.tfg_tips.toolbelt.desc": "With a &dToolbelt&r, you'll be able to manage multiple tools without wasting inventory slots! This handy item can go into a special &3Toolbelt Slot&r in your &4Curios menu&r. You can insert and retrieve tools with a &ckeybind.&r It starts with only two slots, but more can be added by adding &aBelt Pouches&r.\n\n&lDue to a bug with this mod, it's not possible to upgrade your &dToolbelt&f if it's been dyed or has tools inside. Empty it first!", + "quests.tfg_tips.toolbelt.desc": "With a &dToolbelt&r, you'll be able to manage multiple tools without wasting inventory slots! This handy item can go into a special &3Toolbelt Slot&r in your &4Curios menu&r. You can insert and retrieve tools with a &ckeybind.&r It starts with only two slots, but more can be added by adding &aBelt Pouches&r.", "quests.tfg_tips.maxed_out_toolbelt.title": "ALL THE TOOLS", "quests.tfg_tips.maxed_out_toolbelt.subtitle": "That belt must be very heavy at this point...", "quests.tfg_tips.maxed_out_toolbelt.desc": "A &dToolbelt&r can hold 7 extra Pouches, that's 9 tools in one belt!", From 8ee23fc3e1a7b9642b26d958a797e600c474c719 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 14 Aug 2025 09:08:48 +0100 Subject: [PATCH 051/158] fixes #1620 --- .../configured_feature/nether/surface/mangrove_tree.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/surface/mangrove_tree.json b/kubejs/data/tfg/worldgen/configured_feature/nether/surface/mangrove_tree.json index bb51057d2..ae2906d8e 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/surface/mangrove_tree.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/surface/mangrove_tree.json @@ -108,7 +108,7 @@ "trunk_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "tfc:wood/wood/mangrove", + "Name": "tfc:wood/log/mangrove", "Properties": { "axis": "y" } From f0466e53bd2db2046b649d37a621e64bf5f86359 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 14 Aug 2025 20:28:16 +0100 Subject: [PATCH 052/158] finally killed off all damascus steel recipes --- .../gregtech/recipes.materials.js | 3 +- .../gregtech/recipes.removes.js | 2 +- .../vintage_improvements/recipes.js | 2 +- kubejs/startup_scripts/gtceu/constants.js | 483 +++++++++--------- 4 files changed, 246 insertions(+), 244 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index 10e47891b..cc7a5edee 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -1155,7 +1155,8 @@ function registerGTCEUMetalRecipes(event) { if (material === GTMaterials.get("andesite_alloy") || material === GTMaterials.get("refined_radiance") || material === GTMaterials.get("shadow_steel") - || material === GTMaterials.get("chromatic_compound")) + || material === GTMaterials.get("chromatic_compound") + || material === GTMaterials.DamascusSteel) { return; } const toolProperty = material.getProperty(PropertyKey.TOOL) diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index db93fb94c..21f0b09f3 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -738,7 +738,7 @@ function removeGTCEURecipes(event) { event.remove({ id: `gtceu:assembler/${material}_pressure_plate` }) }) - event.remove({ output: 'gtceu:damascus_steel_crowbar'}) + event.remove({ id: /^gtceu:.*damascus_steel.*/ }) //removes metal armor const armor = [ diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index a2308bf06..f92a66ae4 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -520,7 +520,7 @@ function registerVintageImprovementsRecipes(event) { // Skip glass too if (r.inputs.item[0].content.ingredient.item === "gtceu:glass_dust") return // And this - if (r.inputs.item[0].content.ingredient.item === "gtceu:damascus_steel_ingot") return + if (r.inputs.item[0].content.ingredient.tag === "#forge:ingots/damascus_steel") return let input = r.inputs.item[0].content.ingredient; input.count = r.inputs.item[0].content.count; diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 3284fb561..fcc65cafb 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -4,186 +4,186 @@ //#region Disabled Items /** @global */ global.GTCEU_DISABLED_ITEMS = [ - // Пыль пшеницы (Wheat Dusts) - 'gtceu:wheat_dust', - 'gtceu:small_wheat_dust', - 'gtceu:tiny_wheat_dust', - 'gtceu:dough', + // Пыль пшеницы (Wheat Dusts) + 'gtceu:wheat_dust', + 'gtceu:small_wheat_dust', + 'gtceu:tiny_wheat_dust', + 'gtceu:dough', - // Bronze Machines - 'gtceu:bronze_brick_casing', - 'gtceu:lp_steam_miner', - 'gtceu:lp_steam_extractor', - 'gtceu:lp_steam_macerator', - 'gtceu:lp_steam_compressor', - 'gtceu:lp_steam_forge_hammer', - 'gtceu:lp_steam_furnace', - 'gtceu:lp_steam_alloy_smelter', - 'gtceu:lp_steam_rock_crusher', - 'gtceu:lp_steam_solid_boiler', - 'gtceu:lp_steam_liquid_boiler', - 'gtceu:lp_steam_solar_boiler', - 'gtceu:charcoal_pile_igniter', + // Bronze Machines + 'gtceu:bronze_brick_casing', + 'gtceu:lp_steam_miner', + 'gtceu:lp_steam_extractor', + 'gtceu:lp_steam_macerator', + 'gtceu:lp_steam_compressor', + 'gtceu:lp_steam_forge_hammer', + 'gtceu:lp_steam_furnace', + 'gtceu:lp_steam_alloy_smelter', + 'gtceu:lp_steam_rock_crusher', + 'gtceu:lp_steam_solid_boiler', + 'gtceu:lp_steam_liquid_boiler', + 'gtceu:lp_steam_solar_boiler', + 'gtceu:charcoal_pile_igniter', - // Примитивная помпа (Primitive Pump) - 'gtceu:infinite_water_cover', - 'gtceu:ender_fluid_link_cover', - 'gtceu:pump_deck', - 'gtceu:pump_hatch', - 'gtceu:primitive_pump', + // Примитивная помпа (Primitive Pump) + 'gtceu:infinite_water_cover', + 'gtceu:ender_fluid_link_cover', + 'gtceu:pump_deck', + 'gtceu:pump_hatch', + 'gtceu:primitive_pump', - // Другое (Other) - 'gtceu:flint_mortar', - 'gtceu:flint_knife', - 'gtceu:firebrick', - 'gtceu:firebricks', - 'gtceu:fireclay_dust', - 'gtceu:small_fireclay_dust', - 'gtceu:tiny_fireclay_dust', - 'gtceu:compressed_fireclay', - 'gtceu:wood_drum', - 'gtceu:primitive_blast_furnace', - 'gtceu:iron_pickaxe', - 'gtceu:iron_pickaxe_head', - 'gtceu:brittle_charcoal', - - 'gtceu:wood_screwdriver_tip', - 'gtceu:wood_wrench_tip', - 'gtceu:wood_drill_head', - 'gtceu:wood_chainsaw_head', + // Другое (Other) + 'gtceu:flint_mortar', + 'gtceu:flint_knife', + 'gtceu:firebrick', + 'gtceu:firebricks', + 'gtceu:fireclay_dust', + 'gtceu:small_fireclay_dust', + 'gtceu:tiny_fireclay_dust', + 'gtceu:compressed_fireclay', + 'gtceu:wood_drum', + 'gtceu:primitive_blast_furnace', + 'gtceu:iron_pickaxe', + 'gtceu:iron_pickaxe_head', + 'gtceu:brittle_charcoal', - 'gtceu:stone_drill_head', - 'gtceu:stone_chainsaw_head', - 'gtceu:stone_buzz_saw_blade', - 'gtceu:stone_wrench_tip', + 'gtceu:wood_screwdriver_tip', + 'gtceu:wood_wrench_tip', + 'gtceu:wood_drill_head', + 'gtceu:wood_chainsaw_head', - 'gtceu:netherite_nugget', - 'gtceu:tiny_netherite_dust', - 'gtceu:small_netherite_dust', - 'gtceu:netherite_dust', + 'gtceu:stone_drill_head', + 'gtceu:stone_chainsaw_head', + 'gtceu:stone_buzz_saw_blade', + 'gtceu:stone_wrench_tip', - 'gtceu:treated_wood_hanging_sign', - 'gtceu:treated_wood_boat', - 'gtceu:treated_wood_chest_boat', - 'gtceu:treated_wood_sign', + 'gtceu:netherite_nugget', + 'gtceu:tiny_netherite_dust', + 'gtceu:small_netherite_dust', + 'gtceu:netherite_dust', - 'gtceu:rubber_sapling', - 'gtceu:rubber_log', - 'gtceu:rubber_leaves', - 'gtceu:rubber_planks', - 'gtceu:stripped_rubber_log', - 'gtceu:rubber_wood', - 'gtceu:stripped_rubber_wood', - 'gtceu:rubber_slab', - 'gtceu:rubber_fence', - 'gtceu:rubber_fence_gate', - 'gtceu:rubber_sign', - 'gtceu:rubber_hanging_sign', - 'gtceu:rubber_pressure_plate', - 'gtceu:rubber_trapdoor', - 'gtceu:rubber_door', - 'gtceu:rubber_stairs', - 'gtceu:rubber_button', - 'gtceu:rubber_boat', - 'gtceu:rubber_chest_boat', + 'gtceu:treated_wood_hanging_sign', + 'gtceu:treated_wood_boat', + 'gtceu:treated_wood_chest_boat', + 'gtceu:treated_wood_sign', - 'gtceu:mv_solar_panel', - 'gtceu:hv_solar_panel', - 'gtceu:ev_solar_panel', - 'gtceu:iv_solar_panel', - 'gtceu:luv_solar_panel', - 'gtceu:zpm_solar_panel', - 'gtceu:uv_solar_panel', + 'gtceu:rubber_sapling', + 'gtceu:rubber_log', + 'gtceu:rubber_leaves', + 'gtceu:rubber_planks', + 'gtceu:stripped_rubber_log', + 'gtceu:rubber_wood', + 'gtceu:stripped_rubber_wood', + 'gtceu:rubber_slab', + 'gtceu:rubber_fence', + 'gtceu:rubber_fence_gate', + 'gtceu:rubber_sign', + 'gtceu:rubber_hanging_sign', + 'gtceu:rubber_pressure_plate', + 'gtceu:rubber_trapdoor', + 'gtceu:rubber_door', + 'gtceu:rubber_stairs', + 'gtceu:rubber_button', + 'gtceu:rubber_boat', + 'gtceu:rubber_chest_boat', - 'gtceu:lv_air_scrubber', - 'gtceu:mv_air_scrubber', - 'gtceu:hv_air_scrubber', - 'gtceu:ev_air_scrubber', + 'gtceu:mv_solar_panel', + 'gtceu:hv_solar_panel', + 'gtceu:ev_solar_panel', + 'gtceu:iv_solar_panel', + 'gtceu:luv_solar_panel', + 'gtceu:zpm_solar_panel', + 'gtceu:uv_solar_panel', - 'gtceu:lv_world_accelerator', - 'gtceu:mv_world_accelerator', - 'gtceu:hv_world_accelerator', - 'gtceu:ev_world_accelerator', - 'gtceu:iv_world_accelerator', - 'gtceu:luv_world_accelerator', - 'gtceu:zpm_world_accelerator', - 'gtceu:uv_world_accelerator', + 'gtceu:lv_air_scrubber', + 'gtceu:mv_air_scrubber', + 'gtceu:hv_air_scrubber', + 'gtceu:ev_air_scrubber', - 'gtceu:compressed_clay', + 'gtceu:lv_world_accelerator', + 'gtceu:mv_world_accelerator', + 'gtceu:hv_world_accelerator', + 'gtceu:ev_world_accelerator', + 'gtceu:iv_world_accelerator', + 'gtceu:luv_world_accelerator', + 'gtceu:zpm_world_accelerator', + 'gtceu:uv_world_accelerator', - 'gtceu:damascus_steel_nugget', - 'gtceu:damascus_steel_ingot', - 'gtceu:damascus_steel_block', - 'gtceu:damascus_steel_plate', - 'gtceu:double_damascus_steel_plate', - 'gtceu:damascus_steel_gear', - 'gtceu:damascus_steel_buzzsaw_blade', - 'gtceu:damascus_steel_drill_head', - 'gtceu:damascus_steel_chainsaw_head', - 'gtceu:damascus_steel_bolt', - 'gtceu:damascus_steel_screw', - 'gtceu:damascus_steel_rod', - 'gtceu:long_damascus_steel_rod', - 'gtceu:damascus_steel_dust', - 'gtceu:small_damascus_steel_dust', - 'gtceu:tiny_damascus_steel_dust', - 'gtceu:lv_damascus_steel_drill', - 'gtceu:mv_damascus_steel_drill', - 'gtceu:hv_damascus_steel_drill', - 'gtceu:ev_damascus_steel_drill', - 'gtceu:iv_damascus_steel_drill', - 'gtceu:lv_damascus_steel_chainsaw', - 'gtceu:damascus_steel_buzzsaw', - 'gtceu:damascus_steel_bucket', + 'gtceu:compressed_clay', - //armor - 'gtceu:bronze_helmet', - 'gtceu:bronze_chestplate', - 'gtceu:bronze_leggings', - 'gtceu:bronze_boots', - 'gtceu:steel_helmet', - 'gtceu:steel_chestplate', - 'gtceu:steel_leggings', - 'gtceu:steel_boots', - 'gtceu:titanium_helmet', - 'gtceu:titanium_chestplate', - 'gtceu:titanium_leggings', - 'gtceu:titanium_boots', + 'gtceu:damascus_steel_nugget', + 'gtceu:damascus_steel_ingot', + 'gtceu:damascus_steel_block', + 'gtceu:damascus_steel_plate', + 'gtceu:double_damascus_steel_plate', + 'gtceu:damascus_steel_gear', + 'gtceu:damascus_steel_buzzsaw_blade', + 'gtceu:damascus_steel_drill_head', + 'gtceu:damascus_steel_chainsaw_head', + 'gtceu:damascus_steel_bolt', + 'gtceu:damascus_steel_screw', + 'gtceu:damascus_steel_rod', + 'gtceu:long_damascus_steel_rod', + 'gtceu:damascus_steel_dust', + 'gtceu:small_damascus_steel_dust', + 'gtceu:tiny_damascus_steel_dust', + 'gtceu:lv_damascus_steel_drill', + 'gtceu:mv_damascus_steel_drill', + 'gtceu:hv_damascus_steel_drill', + 'gtceu:ev_damascus_steel_drill', + 'gtceu:iv_damascus_steel_drill', + 'gtceu:lv_damascus_steel_chainsaw', + 'gtceu:damascus_steel_buzzsaw', + 'gtceu:damascus_steel_bucket', - // Huh - 'gtceu:wax_dust', - 'gtceu:small_wax_dust', - 'gtceu:tiny_wax_dust', + //armor + 'gtceu:bronze_helmet', + 'gtceu:bronze_chestplate', + 'gtceu:bronze_leggings', + 'gtceu:bronze_boots', + 'gtceu:steel_helmet', + 'gtceu:steel_chestplate', + 'gtceu:steel_leggings', + 'gtceu:steel_boots', + 'gtceu:titanium_helmet', + 'gtceu:titanium_chestplate', + 'gtceu:titanium_leggings', + 'gtceu:titanium_boots', - // Sculk - 'gtceu:tiny_echo_shard_dust', - 'gtceu:small_echo_shard_dust', - 'gtceu:echo_shard_dust', - 'gtceu:chipped_echo_shard_gem', - 'gtceu:flawed_echo_shard_gem', - 'gtceu:flawless_echo_shard_gem', - 'gtceu:exquisite_echo_shard_gem', - 'gtceu:echo_shard_plate', - 'gtceu:echo_shard_rod', - 'gtceu:echo_shard_block', - 'gtceu:tiny_sculk_dust', - 'gtceu:small_sculk_dust', - 'gtceu:sculk_dust', + // Huh + 'gtceu:wax_dust', + 'gtceu:small_wax_dust', + 'gtceu:tiny_wax_dust', - // Ender eye - 'gtceu:ender_eye_plate', - 'gtceu:ender_eye_block', - 'gtceu:ender_eye_dust', - 'gtceu:small_ender_eye_dust', - 'gtceu:tiny_ender_eye_dust', + // Sculk + 'gtceu:tiny_echo_shard_dust', + 'gtceu:small_echo_shard_dust', + 'gtceu:echo_shard_dust', + 'gtceu:chipped_echo_shard_gem', + 'gtceu:flawed_echo_shard_gem', + 'gtceu:flawless_echo_shard_gem', + 'gtceu:exquisite_echo_shard_gem', + 'gtceu:echo_shard_plate', + 'gtceu:echo_shard_rod', + 'gtceu:echo_shard_block', + 'gtceu:tiny_sculk_dust', + 'gtceu:small_sculk_dust', + 'gtceu:sculk_dust', - // Marble - 'gtceu:marble', - 'gtceu:marble_cobblestone', - 'gtceu:mossy_marble_cobblestone', - 'gtceu:marble_bricks', - 'gtceu:cracked_marble_bricks', - 'gtceu:mossy_marble_bricks' + // Ender eye + 'gtceu:ender_eye_plate', + 'gtceu:ender_eye_block', + 'gtceu:ender_eye_dust', + 'gtceu:small_ender_eye_dust', + 'gtceu:tiny_ender_eye_dust', + + // Marble + 'gtceu:marble', + 'gtceu:marble_cobblestone', + 'gtceu:mossy_marble_cobblestone', + 'gtceu:marble_bricks', + 'gtceu:cracked_marble_bricks', + 'gtceu:mossy_marble_bricks' ]; //#endregion @@ -191,18 +191,19 @@ global.GTCEU_DISABLED_ITEMS = [ //#region Hidden Items /** @global */ global.GTCEU_HIDED_ITEMS = [ - 'gtceu:netherrack_dust', - 'gtceu:small_netherrack_dust', - 'gtceu:tiny_netherrack_dust', - 'gtceu:lv_damascus_steel_wirecutter', - 'gtceu:hv_damascus_steel_wirecutter', - 'gtceu:iv_damascus_steel_wirecutter', - 'gtceu:lv_damascus_steel_wrench', - 'gtceu:hv_damascus_steel_wrench', - 'gtceu:iv_damascus_steel_wrench', - 'gtceu:lv_damascus_steel_screwdriver', + 'gtceu:netherrack_dust', + 'gtceu:small_netherrack_dust', + 'gtceu:tiny_netherrack_dust', + 'gtceu:lv_damascus_steel_wirecutter', + 'gtceu:hv_damascus_steel_wirecutter', + 'gtceu:iv_damascus_steel_wirecutter', + 'gtceu:damascus_steel_wrench_tip', + 'gtceu:lv_damascus_steel_wrench', + 'gtceu:hv_damascus_steel_wrench', + 'gtceu:iv_damascus_steel_wrench', + 'gtceu:lv_damascus_steel_screwdriver', - 'gtceu:sus_record' + 'gtceu:sus_record' ]; //#endregion @@ -229,29 +230,29 @@ global.GTCEU_ARMORS = [ //#region Extruder Molds /** @global */ global.TFG_EXTRUDER_MOLDS = [ - 'tfg:mining_hammer_head_extruder_mold', - 'tfg:sword_head_extruder_mold', - 'tfg:pickaxe_head_extruder_mold', - 'tfg:shovel_head_extruder_mold', - 'tfg:axe_head_extruder_mold', - 'tfg:hoe_head_extruder_mold', - 'tfg:scythe_head_extruder_mold', - 'tfg:file_head_extruder_mold', - 'tfg:hammer_head_extruder_mold', - 'tfg:saw_head_extruder_mold', - 'tfg:knife_head_extruder_mold', - 'tfg:butchery_knife_head_extruder_mold', - 'tfg:spade_head_extruder_mold', - 'tfg:propick_head_extruder_mold', - 'tfg:javelin_head_extruder_mold', - 'tfg:chisel_head_extruder_mold', - 'tfg:mace_head_extruder_mold', - 'tfg:mattock_head_extruder_mold', - 'tfg:fish_hook_extruder_mold', - 'tfg:whisk_extruder_mold', - 'tfg:screwdriver_tip_extruder_mold', - 'tfg:wrench_tip_extruder_mold', - 'tfg:wire_cutter_head_extruder_mold', + 'tfg:mining_hammer_head_extruder_mold', + 'tfg:sword_head_extruder_mold', + 'tfg:pickaxe_head_extruder_mold', + 'tfg:shovel_head_extruder_mold', + 'tfg:axe_head_extruder_mold', + 'tfg:hoe_head_extruder_mold', + 'tfg:scythe_head_extruder_mold', + 'tfg:file_head_extruder_mold', + 'tfg:hammer_head_extruder_mold', + 'tfg:saw_head_extruder_mold', + 'tfg:knife_head_extruder_mold', + 'tfg:butchery_knife_head_extruder_mold', + 'tfg:spade_head_extruder_mold', + 'tfg:propick_head_extruder_mold', + 'tfg:javelin_head_extruder_mold', + 'tfg:chisel_head_extruder_mold', + 'tfg:mace_head_extruder_mold', + 'tfg:mattock_head_extruder_mold', + 'tfg:fish_hook_extruder_mold', + 'tfg:whisk_extruder_mold', + 'tfg:screwdriver_tip_extruder_mold', + 'tfg:wrench_tip_extruder_mold', + 'tfg:wire_cutter_head_extruder_mold', 'tfg:small_casing_extruder_mold', 'tfg:shell_casing_extruder_mold', 'tfg:large_casing_extruder_mold' @@ -261,70 +262,70 @@ global.TFG_EXTRUDER_MOLDS = [ //#region Casting Molds /** @global */ global.TFG_CASTING_MOLDS = [ - 'tfg:lamp_casting_mold', - 'tfg:trapdoor_casting_mold', - 'tfg:chain_casting_mold', - 'tfg:bell_casting_mold' + 'tfg:lamp_casting_mold', + 'tfg:trapdoor_casting_mold', + 'tfg:chain_casting_mold', + 'tfg:bell_casting_mold' ]; //#endregion //#region Ore Bearing Stone /** @global */ global.ORE_BEARING_STONES = [ - 'gabbro', - 'shale', - 'claystone', - 'limestone', - 'conglomerate', - 'dolomite', - 'chert', - 'chalk', - 'rhyolite', - 'dacite', - 'quartzite', - 'slate', - 'phyllite', - 'schist', - 'gneiss', - 'marble', - 'basalt', - 'diorite', - 'andesite', - 'granite', + 'gabbro', + 'shale', + 'claystone', + 'limestone', + 'conglomerate', + 'dolomite', + 'chert', + 'chalk', + 'rhyolite', + 'dacite', + 'quartzite', + 'slate', + 'phyllite', + 'schist', + 'gneiss', + 'marble', + 'basalt', + 'diorite', + 'andesite', + 'granite', - 'deepslate', - 'pyroxenite', - 'dripstone', + 'deepslate', + 'pyroxenite', + 'dripstone', - 'moon_stone', - 'moon_deepslate', - 'mars_stone', - 'venus_stone', - 'mercury_stone', - 'glacio_stone' + 'moon_stone', + 'moon_deepslate', + 'mars_stone', + 'venus_stone', + 'mercury_stone', + 'glacio_stone' ]; //#endregion //#region Add Circuits /** @global */ global.ADD_CIRCUIT = [ - {recipeId: 'gtceu:chemical_reactor/tetrafluoroethylene_from_chloroform', circuitNumber: 1}, - {recipeId: 'gtceu:chemical_reactor/hydrofluoric_acid_from_elements', circuitNumber: 2}, + { recipeId: 'gtceu:chemical_reactor/tetrafluoroethylene_from_chloroform', circuitNumber: 1 }, + { recipeId: 'gtceu:chemical_reactor/hydrofluoric_acid_from_elements', circuitNumber: 2 }, ]; //#endregion //#region Superconductors /** @global */ global.GTCEU_SUPERCONDUCTORS = [ - {name: 'manganese_phosphide', materialId: 'ManganesePhosphide'}, - {name: 'magnesium_diboride', materialId: 'MagnesiumDiboride'}, - {name: 'mercury_barium_calcium_cuprate', materialId: 'MercuryBariumCalciumCuprate'}, - {name: 'uranium_triplatinum', materialId: 'UraniumTriplatinum'}, - {name: 'samarium_iron_arsenic_oxide', materialId: 'SamariumIronArsenicOxide'}, - {name: 'indium_tin_barium_titanium_cuprate', materialId: 'IndiumTinBariumTitaniumCuprate'}, - {name: 'uranium_rhodium_dinaquadide', materialId: 'UraniumRhodiumDinaquadide'}, - {name: 'enriched_naquadah_trinium_europium_duranide', materialId: 'EnrichedNaquadahTriniumEuropiumDuranide'}, - {name: 'ruthenium_trinium_americium_neutronate', materialId: 'RutheniumTriniumAmericiumNeutronate'} + { name: 'manganese_phosphide', materialId: 'ManganesePhosphide' }, + { name: 'magnesium_diboride', materialId: 'MagnesiumDiboride' }, + { name: 'mercury_barium_calcium_cuprate', materialId: 'MercuryBariumCalciumCuprate' }, + { name: 'uranium_triplatinum', materialId: 'UraniumTriplatinum' }, + { name: 'samarium_iron_arsenic_oxide', materialId: 'SamariumIronArsenicOxide' }, + { name: 'indium_tin_barium_titanium_cuprate', materialId: 'IndiumTinBariumTitaniumCuprate' }, + { name: 'uranium_rhodium_dinaquadide', materialId: 'UraniumRhodiumDinaquadide' }, + { name: 'enriched_naquadah_trinium_europium_duranide', materialId: 'EnrichedNaquadahTriniumEuropiumDuranide' }, + { name: 'ruthenium_trinium_americium_neutronate', materialId: 'RutheniumTriniumAmericiumNeutronate' } ] //#endregion From 5ad5a6c8924f066e0b2be1a0ac0af82935769c40 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 14 Aug 2025 20:35:38 +0100 Subject: [PATCH 053/158] buffed EGH sapling amount --- CHANGELOG.md | 2 ++ kubejs/server_scripts/beneath/recipes.js | 4 ++-- kubejs/server_scripts/tfc/recipes.js | 6 +++--- kubejs/server_scripts/tfg/recipes.space.js | 2 ++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4e73c764..86de43061 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Added backpacks, lunchboxes, and vessels to the toolbelt's blacklist @Pyritie - Moon rabbits can eat chorus fruit now @Pyritie - Added electric greenhouse recipes for mushrooms and bamboo (#1610) @Pyritie +- Increased amount of saplings that the electric greenhouse returns to be more in line with create-based tree farms @Pyritie ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop @@ -16,6 +17,7 @@ - Finally fixed all the issues with upgrading the toolbelt - now you can safely dye and undye, upgrade with and without tools inside it, etc (#368) @Pyritie - Fixed a dupe with certus quartz @Pyritie - Moved the golden apple recipe over to the food processor so it respects food expiry data @Pyritie +- Removed some remaining swine-steel crafting recipes @Pyritie ## [0.10.9] - 10-08-2025 ### Changes diff --git a/kubejs/server_scripts/beneath/recipes.js b/kubejs/server_scripts/beneath/recipes.js index 7af049fcc..56bc7f415 100644 --- a/kubejs/server_scripts/beneath/recipes.js +++ b/kubejs/server_scripts/beneath/recipes.js @@ -70,10 +70,10 @@ const registerBeneathRecipes = (event) => { generateGreenHouseRecipe(event, '8x minecraft:warped_fungus', 'tfg:semiheavy_ammoniacal_water', 16000, '64x beneath:wood/log/warped', 'tfg:green_house/warped_fungus', 'ad_astra:mars', 8, - '16x minecraft:warped_wart_block', GTValues.VA[GTValues.MV]) + '32x minecraft:warped_wart_block', GTValues.VA[GTValues.MV]) generateGreenHouseRecipe(event, '8x minecraft:crimson_fungus', 'tfg:semiheavy_ammoniacal_water', 16000, '64x beneath:wood/log/crimson', 'tfg:green_house/crimson_fungus', 'ad_astra:mars', 8, - '16x minecraft:nether_wart_block', GTValues.VA[GTValues.MV]) + '32x minecraft:nether_wart_block', GTValues.VA[GTValues.MV]) Ingredient.of('#beneath:mushrooms').stacks.forEach(element => { const itemId = element.id; diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 392a74016..3a5fadb02 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -58,12 +58,12 @@ const registerTFCRecipes = (event) => { // Дерево global.TFC_WOOD_TYPES.forEach(wood => { generateGreenHouseRecipe(event, `8x tfc:wood/sapling/${wood}`, '#tfc:any_fresh_water', 16000, `64x tfc:wood/log/${wood}`, - `tfg:greenhouse/${wood}`, 'minecraft:overworld', 16, `8x tfc:wood/sapling/${wood}`, GTValues.VH[GTValues.LV]) + `tfg:greenhouse/${wood}`, 'minecraft:overworld', 16, `32x tfc:wood/sapling/${wood}`, GTValues.VH[GTValues.LV]) }) global.AFC_SAPLINGS.forEach(x => { generateGreenHouseRecipe(event, `8x afc:wood/sapling/${x.sapling}`, '#tfc:any_fresh_water', 16000, `64x ${x.log}`, - `tfg:greenhouse/${x.sapling}`, 'minecraft:overworld', 16, `8x afc:wood/sapling/${x.sapling}`, GTValues.VH[GTValues.LV]) + `tfg:greenhouse/${x.sapling}`, 'minecraft:overworld', 16, `32x afc:wood/sapling/${x.sapling}`, GTValues.VH[GTValues.LV]) }) // Семена фруктов @@ -90,7 +90,7 @@ const registerTFCRecipes = (event) => { const recipeId = `greenhouse_${itemId.replace(':', '_')}`; generateGreenHouseRecipe(event, itemId, '#tfc:any_fresh_water', 8000, `8x ${itemId}`, - recipeId, null, 8, `8x ${itemId}`, GTValues.VH[GTValues.LV]); + recipeId, null, 8, `16x ${itemId}`, GTValues.VH[GTValues.LV]); }); //#endregion diff --git a/kubejs/server_scripts/tfg/recipes.space.js b/kubejs/server_scripts/tfg/recipes.space.js index d596ffbe0..d92daedef 100644 --- a/kubejs/server_scripts/tfg/recipes.space.js +++ b/kubejs/server_scripts/tfg/recipes.space.js @@ -106,6 +106,7 @@ function registerTFGSpaceRecipes(event) { .itemOutputs('64x minecraft:chorus_fruit') .chancedOutput('8x tfg:lunar_chorus_flower', 750, 0) .chancedOutput('8x tfg:lunar_chorus_flower', 500, 0) + .chancedOutput('8x tfg:lunar_chorus_flower', 750, 0) .duration(36000) // 30 mins .circuit(1) .EUt(GTValues.VA[GTValues.MV]) @@ -117,6 +118,7 @@ function registerTFGSpaceRecipes(event) { .itemOutputs('64x minecraft:chorus_fruit') .chancedOutput('8x tfg:lunar_chorus_flower', 4000, 0) .chancedOutput('8x tfg:lunar_chorus_flower', 3000, 0) + .chancedOutput('8x tfg:lunar_chorus_flower', 4000, 0) .duration(12000) // 10 mins .circuit(2) .EUt(GTValues.VA[GTValues.MV]) From fa9b9687ab8a2ec9a36b2994908d83e8515422a0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 14 Aug 2025 20:38:00 +0100 Subject: [PATCH 054/158] fixed maple log centrifuge recipe to be the right kind of wood pulp --- kubejs/server_scripts/afc/recipes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/afc/recipes.js b/kubejs/server_scripts/afc/recipes.js index 7e3acf87a..1ef18f35f 100644 --- a/kubejs/server_scripts/afc/recipes.js +++ b/kubejs/server_scripts/afc/recipes.js @@ -291,7 +291,7 @@ const registerAFCRecipes = (event) => { .itemInputs('#tfc:maple_logs') .chancedOutput('afc:maple_sugar', 7500, 0) .chancedOutput('gtceu:plant_ball', 3750, 0) - .chancedOutput('gtceu:wood_dust', 2500, 0) + .chancedOutput('gtceu:hardwood_dust', 2500, 0) .outputFluids(Fluid.of('gtceu:methane', 60), Fluid.of('afc:maple_syrup', 100)) .duration(20*20) .EUt(GTValues.VA[GTValues.MV]) @@ -300,7 +300,7 @@ const registerAFCRecipes = (event) => { .itemInputs('#tfc:birch_logs') .chancedOutput('afc:birch_sugar', 7500, 0) .chancedOutput('gtceu:plant_ball', 3750, 0) - .chancedOutput('gtceu:wood_dust', 2500, 0) + .chancedOutput('gtceu:hardwood_dust', 2500, 0) .outputFluids(Fluid.of('gtceu:methane', 60), Fluid.of('afc:birch_syrup', 100)) .duration(20*20) .EUt(GTValues.VA[GTValues.MV]) From ffcc45475ed7933c416e34561f9170802c57e017 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 14 Aug 2025 20:51:36 +0100 Subject: [PATCH 055/158] #1625 and #1623 Related Work Items: #16, #1625 --- CHANGELOG.md | 2 ++ kubejs/server_scripts/gregtech/recipes.js | 13 ++++++++++--- kubejs/server_scripts/tfc/tags.js | 1 + kubejs/server_scripts/tfg/tags.js | 4 ++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86de43061..35765aa48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ - Moon rabbits can eat chorus fruit now @Pyritie - Added electric greenhouse recipes for mushrooms and bamboo (#1610) @Pyritie - Increased amount of saplings that the electric greenhouse returns to be more in line with create-based tree farms @Pyritie +- Firmalife mixing bowls can now be placed on tool racks (#1623) @Pyritie +- Fixed recipe for pyroxenite button (again) (#1625) @Pyritie ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 2ddfce76e..4d7fc9cf0 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1378,12 +1378,19 @@ const registerGTCEURecipes = (event) => { .EUt(GTValues.VA[GTValues.LV]) // Buttons - event.replaceOutput({ id: 'gtceu:cutter/blackstone_button' }, 'minecraft:polished_blackstone_button', '6x minecraft:polished_blackstone_button') - event.replaceOutput({ id: 'gtceu:cutter/blackstone_button_water' }, 'minecraft:polished_blackstone_button', '6x minecraft:polished_blackstone_button') - event.replaceOutput({ id: 'gtceu:cutter/blackstone_button_distilled_water' }, 'minecraft:polished_blackstone_button', '6x minecraft:polished_blackstone_button') removeCutterRecipe(event, 'blackstone_button') removeCutterRecipe(event, 'blackstone_button_water') removeCutterRecipe(event, 'blackstone_button_distilled_water') + removeCutterRecipe(event, 'cut_polished_blackstone_brickslab_into_button') + removeCutterRecipe(event, 'cut_polished_blackstone_brickslab_into_button_water') + removeCutterRecipe(event, 'cut_polished_blackstone_brickslab_into_button_distilled_water') + + event.recipes.gtceu.cutter('tfg:blackstone_button') + .itemInputs('minecraft:polished_blackstone_pressure_plate') + .itemOutputs('6x minecraft:polished_blackstone_button') + .EUt(7) + .duration(100) + event.replaceOutput({ id: 'gtceu:cutter/bamboo_button' }, 'minecraft:bamboo_button', '6x minecraft:bamboo_button') event.replaceOutput({ id: 'gtceu:cutter/bamboo_button_water' }, 'minecraft:bamboo_button', '6x minecraft:bamboo_button') diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index dacd213d5..9b7427fe0 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -59,6 +59,7 @@ const registerTFCItemTags = (event) => { event.add('tfc:usable_on_tool_rack', 'waterflasks:iron_flask') event.add('tfc:usable_on_tool_rack', 'waterflasks:red_steel_flask') event.add('tfc:usable_on_tool_rack', 'tfc:wool_cloth') + event.add('tfc:usable_on_tool_rack', 'firmalife:mixing_bowl') // Ингредиенты для закваски event.add('tfg:ferments_to_rennet', 'tfc:food/soybean') diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 9ec621689..1e47a216e 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -296,6 +296,10 @@ const registerTFGItemTags = (event) => { event.add('tfc:grass', 'tfg:grass/rusticus_mycelium') event.add('tfc:grass', 'tfg:grass/sangnum_mycelium') event.add('tfc:farmland', 'tfg:grass/mars_farmland') + event.add('minecraft:mineable/shovel', 'tfg:grass/mars_dirt') + event.add('minecraft:mineable/shovel', 'tfg:grass/amber_mycelium') + event.add('minecraft:mineable/shovel', 'tfg:grass/rusticus_mycelium') + event.add('minecraft:mineable/shovel', 'tfg:grass/sangnum_mycelium') // #endregion // Mars stone dust From 3e114430239200eba30ed9005146e896b3980f32 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 14 Aug 2025 21:03:02 +0100 Subject: [PATCH 056/158] locometal refactor #1624 --- CHANGELOG.md | 1 + .../railways/recipes.locometal.js | 57 +++++++++++++++---- 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35765aa48..e1783d136 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Increased amount of saplings that the electric greenhouse returns to be more in line with create-based tree farms @Pyritie - Firmalife mixing bowls can now be placed on tool racks (#1623) @Pyritie - Fixed recipe for pyroxenite button (again) (#1625) @Pyritie +- Refactored locometal recipes to use stonecutters, metal plated locometal is now also much cheaper (#1624) @Pyritie ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop diff --git a/kubejs/server_scripts/railways/recipes.locometal.js b/kubejs/server_scripts/railways/recipes.locometal.js index 1dcf3dfda..46394b419 100644 --- a/kubejs/server_scripts/railways/recipes.locometal.js +++ b/kubejs/server_scripts/railways/recipes.locometal.js @@ -22,10 +22,10 @@ const locometalBase = { const registerRailwaysLocometalRecipes = (event) => { for (let locometal in locometalBase) { - event.recipes.create.cutting(`8x railways:${locometal}`, '#forge:storage_blocks/iron').processingTime(200); - event.recipes.create.cutting(`16x railways:${locometal}`, '#forge:storage_blocks/wrought_iron').processingTime(200); - event.recipes.create.cutting(`24x railways:${locometal}`, '#forge:storage_blocks/steel').processingTime(200); - event.recipes.create.cutting(`railways:${locometal}`, `#railways:palettes/cycle_groups/base`).processingTime(20); + event.stonecutting(`8x railways:${locometal}`, '#forge:storage_blocks/iron'); + event.stonecutting(`16x railways:${locometal}`, '#forge:storage_blocks/wrought_iron'); + event.stonecutting(`24x railways:${locometal}`, '#forge:storage_blocks/steel'); + event.stonecutting(`railways:${locometal}`, `#railways:palettes/cycle_groups/base`); event.recipes.gtceu.chemical_bath(`tfg:undying/locometal/${locometal}`) .itemInputs(Item.of(locometalDyeGroups[`${locometal}`], 1)) .inputFluids(Fluid.of(`gtceu:chlorine`, 18)) @@ -35,9 +35,27 @@ const registerRailwaysLocometalRecipes = (event) => { .category(GTRecipeCategories.CHEM_DYES) } - event.recipes.create.item_application(`railways:iron_wrapped_locometal`, [`#railways:palettes/cycle_groups/base`, '#forge:plates/wrought_iron']); - event.recipes.create.item_application(`railways:copper_wrapped_locometal`, [`#railways:palettes/cycle_groups/base`, '#forge:plates/copper']); - event.recipes.create.item_application(`railways:brass_wrapped_locometal`, [`#railways:palettes/cycle_groups/base`, '#forge:plates/brass']) + event.recipes.gtceu.chemical_bath(`railways:iron_wrapped_locometal`) + .itemInputs(`#railways:palettes/cycle_groups/base`) + .inputFluids('gtceu:wrought_iron 18') + .itemOutputs('railways:iron_wrapped_locometal') + .duration(20) + .EUt(24) + .category(GTRecipeCategories.CHEM_DYES); + event.recipes.gtceu.chemical_bath(`railways:copper_wrapped_locometal`) + .itemInputs(`#railways:palettes/cycle_groups/base`) + .inputFluids('gtceu:copper 18') + .itemOutputs('railways:copper_wrapped_locometal') + .duration(20) + .EUt(24) + .category(GTRecipeCategories.CHEM_DYES); + event.recipes.gtceu.chemical_bath(`railways:brass_wrapped_locometal`) + .itemInputs(`#railways:palettes/cycle_groups/base`) + .inputFluids('gtceu:brass 18') + .itemOutputs('railways:brass_wrapped_locometal') + .duration(20) + .EUt(24) + .category(GTRecipeCategories.CHEM_DYES); event.recipes.gtceu.chemical_bath(`tfg:undying/brass_wrapped_locometal`) .itemInputs('#railways:palettes/dye_groups/brass_wrapped_slashed') @@ -99,9 +117,28 @@ const registerRailwaysLocometalRecipes = (event) => { .EUt(24) .category(GTRecipeCategories.CHEM_DYES); }; - event.recipes.create.item_application(`railways:${dye}_iron_wrapped_locometal`, [`#railways:palettes/cycle_groups/${dye}`, '#forge:plates/wrought_iron']); - event.recipes.create.item_application(`railways:${dye}_copper_wrapped_locometal`, [`#railways:palettes/cycle_groups/${dye}`, '#forge:plates/copper']); - event.recipes.create.item_application(`railways:${dye}_brass_wrapped_locometal`, [`#railways:palettes/cycle_groups/${dye}`, '#forge:plates/brass']); + + event.recipes.gtceu.chemical_bath(`railways:${dye}_iron_wrapped_locometal`) + .itemInputs(`#railways:palettes/cycle_groups/${dye}`) + .inputFluids('gtceu:wrought_iron 18') + .itemOutputs(`railways:${dye}_iron_wrapped_locometal`) + .duration(20) + .EUt(24) + .category(GTRecipeCategories.CHEM_DYES); + event.recipes.gtceu.chemical_bath(`railways:${dye}_copper_wrapped_locometal`) + .itemInputs(`#railways:palettes/cycle_groups/${dye}`) + .inputFluids('gtceu:copper 18') + .itemOutputs(`railways:${dye}_copper_wrapped_locometal`) + .duration(20) + .EUt(24) + .category(GTRecipeCategories.CHEM_DYES); + event.recipes.gtceu.chemical_bath(`railways:${dye}_brass_wrapped_locometal`) + .itemInputs(`#railways:palettes/cycle_groups/${dye}`) + .inputFluids('gtceu:brass 18') + .itemOutputs(`railways:${dye}_brass_wrapped_locometal`) + .duration(20) + .EUt(24) + .category(GTRecipeCategories.CHEM_DYES); event.recipes.gtceu.chemical_bath(`tfg:brass_locometal_bathing/${dye}`) .itemInputs('#railways:palettes/dye_groups/brass_wrapped_slashed') From f594b8a27e585379d72edb95c9a07fe1fb326c4e Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 14 Aug 2025 21:38:41 +0100 Subject: [PATCH 057/158] added gun quest to HV --- .../quests/chapters/hv__high_voltage.snbt | 100 +++++++++++--- .../quests/chapters/lv__low_voltage.snbt | 1 + kubejs/assets/tfc/lang/en_us.json | 130 +++++++++--------- kubejs/assets/tfg/lang/en_us.json | 30 +++- 4 files changed, 172 insertions(+), 89 deletions(-) diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index 996dc5e6c..7602d6132 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -626,28 +626,18 @@ icon: "minecraft:tnt" id: "2B7B214EDE0B45A2" size: 1.0d - tasks: [ - { - id: "04BF6A36E965C348" - item: "minecraft:tnt" - type: "item" + tasks: [{ + id: "69AFBED9D1866F49" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(minecraft:tnt)item(gtceu:industrial_tnt)item(gtceu:powderbarrel)item(gtceu:dynamite))" + } } - { - id: "162CDC2567F6D6A8" - item: "gtceu:industrial_tnt" - type: "item" - } - { - id: "4CFB597542DD0194" - item: "gtceu:dynamite" - type: "item" - } - { - id: "0BF4703D1DBAA5B7" - item: "gtceu:powderbarrel" - type: "item" - } - ] + title: "{quests.high_voltage.tnt.task}" + type: "item" + }] title: "{quests.high_voltage.tnt.title}" x: 3.5d y: 3.0d @@ -1241,6 +1231,74 @@ x: 6.0d y: 3.5d } + { + dependencies: ["3FBDC8552F7D8008"] + description: ["{quests.high_voltage.gun.desc}"] + id: "74C6DD5F67B1731F" + optional: true + shape: "heart" + subtitle: "{quests.high_voltage.gun.subtitle}" + tasks: [ + { + disable_toast: true + id: "00B3B5D0D419F8E9" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "item(tacz:modern_kinetic_gun)" + } + } + match_nbt: false + title: "{quests.high_voltage.gun.task1}" + type: "item" + } + { + id: "7485BE99651C8334" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(tfg:absorption_salvo)item(tfg:resistance_salvo)item(tfg:instant_health_salvo)item(tfg:regeneration_tablet)item(tfg:speed_tablet)item(tfcagedalcohol:bucket/aged_beer)item(tfcagedalcohol:bucket/aged_vodka)item(tfcagedalcohol:bucket/aged_sake)item(tfcagedalcohol:bucket/aged_rum))" + } + } + optional_task: true + title: "{quests.high_voltage.gun.task2}" + type: "item" + } + { + id: "2B1D15C7E99C9DDC" + item: { + Count: 1 + ForgeCaps: { + "tfc:food": { + creationDate: -2L + foodData: { + dairy: 0.0f + decay: 0.0f + food: 0 + fruit: 0.0f + grain: 0.0f + meat: 0.0f + sat: 0.0f + veg: 0.0f + water: 0.0f + } + ingredients: [ ] + traits: [ ] + } + } + id: "tfg:food/meal_bag" + } + match_nbt: false + optional_task: true + type: "item" + } + ] + title: "{quests.high_voltage.gun.title}" + x: 10.0d + y: -4.0d + } ] subtitle: ["{quests.high_voltage.subtitle}"] title: "{quests.high_voltage}" diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/config/ftbquests/quests/chapters/lv__low_voltage.snbt index 12d69cd73..e6a9f762a 100644 --- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt +++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt @@ -674,6 +674,7 @@ "ftbfiltersystem:filter": "or(nbt(fuzzy:{fluid:{FluidName:\"gtceu:rubber\"}})nbt(fuzzy:{Fluid:{FluidName:\"gtceu:rubber\"}})item(gtceu:rubber_bucket))" } } + title: "{quests.low_voltage.lv_chemical_reactor.task}" type: "item" } ] diff --git a/kubejs/assets/tfc/lang/en_us.json b/kubejs/assets/tfc/lang/en_us.json index 61aab90fe..2d034321e 100644 --- a/kubejs/assets/tfc/lang/en_us.json +++ b/kubejs/assets/tfc/lang/en_us.json @@ -1,67 +1,67 @@ { - "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", - "block.tfc.fluid.salt_water": "Sea Water", - "block.tfc.cauldron.salt_water": "Sea Water Cauldron", - "fluid.tfc.salt_water": "Sea Water", - "item.tfc.bucket.salt_water": "Sea Water Bucket", - "item.tfc.powder.saltpeter": "Saltpeter Powder", - "item.tfc.powder.sulfur": "Sulfur Powder", - "tfc.jei.raw_hide_knapping": "Raw Hide Knapping", - "metal.tfg.redstone": "Redstone", - "metal.tfg.red_alloy": "Red Alloy", - "metal.tfg.tin_alloy": "Tin Alloy", - "metal.tfg.lead": "Lead", - "metal.tfg.invar": "Invar", - "metal.tfg.potin": "Potin", - "metal.tfg.cobalt": "Cobalt", - "metal.tfg.cobalt_brass": "Cobalt Brass", - "metal.tfg.aluminium_silicate": "Aluminium Silicate", - "trim_material.tfc.almandine_tfc": "Almandine", - "trim_material.tfc.andradite_tfc": "Andradite", - "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", - "trim_material.tfc.cinnabar_tfc": "Cinnabar", - "trim_material.tfc.coal_tfc": "Coal", - "trim_material.tfc.diamond_tfc": "Diamond", - "trim_material.tfc.emerald_tfc": "Emerald", - "trim_material.tfc.green_sapphire_tfc": "Green Sapphire", - "trim_material.tfc.grossular_tfc": "Grossular", - "trim_material.tfc.rutile_tfc": "Rutile", - "trim_material.tfc.lazurite_tfc": "Lazurite", - "trim_material.tfc.pyrope_tfc": "Pyrope", - "trim_material.tfc.rock_salt_tfc": "Rock Salt", - "trim_material.tfc.ruby_tfc": "Ruby", - "trim_material.tfc.salt_tfc": "salt", - "trim_material.tfc.sapphire_tfc": "Sapphire", - "trim_material.tfc.sodalite_tfc": "Sodalite", - "trim_material.tfc.coke_tfc": "Coke", - "trim_material.tfc.spessartine_tfc": "Spessartine", - "trim_material.tfc.topaz_tfc": "Topaz", - "trim_material.tfc.uvarovite_tfc": "Uvarovite", - "trim_material.tfc.nether_quartz_tfc": "Nether Quartz", - "trim_material.tfc.certus_quartz_tfc": "Certus Quartz", - "trim_material.tfc.quartzite_tfc": "Quartzite", - "trim_material.tfc.realgar_tfc": "Realgar", - "trim_material.tfc.malachite_tfc": "Malachite", - "trim_material.tfc.glass_tfc": "Glass", - "trim_material.tfc.olivine_tfc": "Olivine", - "trim_material.tfc.opal_tfc": "Opal", - "trim_material.tfc.amethyst_tfc": "Amethyst", - "trim_material.tfc.lapis_tfc": "Lapis", - "trim_material.tfc.apatite_tfc": "Apatite", - "trim_material.tfc.red_garnet_tfc": "Red Garnet", - "trim_material.tfc.yellow_garnet_tfc": "Yellow Garnet", - "trim_material.tfc.monazite_tfc": "Monazite", - "trim_material.tfc.rose_quartz_tfc": "Rose Quartz", - "trim_material.tfc.fluix_tfc": "Fluix", - "trim_material.tfc.silver_tfc": "Silver", - "trim_material.tfc.sterling_silver_tfc": "Sterling Silver", - "trim_material.tfc.gold_tfc": "Gold", - "trim_material.tfc.rose_gold_tfc": "Rose Gold", - "trim_material.tfc.nickel_tfc": "Nickel", - "trim_material.tfc.platinum_tfc": "Platinum", - "trim_material.tfc.titanium_tfc": "Titanium", - "trim_material.tfc.bismuth_tfc": "Bismuth", - "trim_material.tfc.neutronium_tfc": "Neutronium", - "trim_material.tfc.pyrite_tfc": "Pyrite", - "trim_material.tfc.redx_tfc": "RedX" + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.tfc.fluid.salt_water": "Sea Water", + "block.tfc.cauldron.salt_water": "Sea Water Cauldron", + "fluid.tfc.salt_water": "Sea Water", + "item.tfc.bucket.salt_water": "Sea Water Bucket", + "item.tfc.powder.saltpeter": "Saltpeter Powder", + "item.tfc.powder.sulfur": "Sulfur Powder", + "tfc.jei.raw_hide_knapping": "Raw Hide Knapping", + "metal.tfg.redstone": "Redstone", + "metal.tfg.red_alloy": "Red Alloy", + "metal.tfg.tin_alloy": "Tin Alloy", + "metal.tfg.lead": "Lead", + "metal.tfg.invar": "Invar", + "metal.tfg.potin": "Potin", + "metal.tfg.cobalt": "Cobalt", + "metal.tfg.cobalt_brass": "Cobalt Brass", + "metal.tfg.aluminium_silicate": "Aluminium Silicate", + "trim_material.tfc.almandine_tfc": "Almandine", + "trim_material.tfc.andradite_tfc": "Andradite", + "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", + "trim_material.tfc.cinnabar_tfc": "Cinnabar", + "trim_material.tfc.coal_tfc": "Coal", + "trim_material.tfc.diamond_tfc": "Diamond", + "trim_material.tfc.emerald_tfc": "Emerald", + "trim_material.tfc.green_sapphire_tfc": "Green Sapphire", + "trim_material.tfc.grossular_tfc": "Grossular", + "trim_material.tfc.rutile_tfc": "Rutile", + "trim_material.tfc.lazurite_tfc": "Lazurite", + "trim_material.tfc.pyrope_tfc": "Pyrope", + "trim_material.tfc.rock_salt_tfc": "Rock Salt", + "trim_material.tfc.ruby_tfc": "Ruby", + "trim_material.tfc.salt_tfc": "salt", + "trim_material.tfc.sapphire_tfc": "Sapphire", + "trim_material.tfc.sodalite_tfc": "Sodalite", + "trim_material.tfc.coke_tfc": "Coke", + "trim_material.tfc.spessartine_tfc": "Spessartine", + "trim_material.tfc.topaz_tfc": "Topaz", + "trim_material.tfc.uvarovite_tfc": "Uvarovite", + "trim_material.tfc.nether_quartz_tfc": "Nether Quartz", + "trim_material.tfc.certus_quartz_tfc": "Certus Quartz", + "trim_material.tfc.quartzite_tfc": "Quartzite", + "trim_material.tfc.realgar_tfc": "Realgar", + "trim_material.tfc.malachite_tfc": "Malachite", + "trim_material.tfc.glass_tfc": "Glass", + "trim_material.tfc.olivine_tfc": "Olivine", + "trim_material.tfc.opal_tfc": "Opal", + "trim_material.tfc.amethyst_tfc": "Amethyst", + "trim_material.tfc.lapis_tfc": "Lapis", + "trim_material.tfc.apatite_tfc": "Apatite", + "trim_material.tfc.red_garnet_tfc": "Red Garnet", + "trim_material.tfc.yellow_garnet_tfc": "Yellow Garnet", + "trim_material.tfc.monazite_tfc": "Monazite", + "trim_material.tfc.rose_quartz_tfc": "Rose Quartz", + "trim_material.tfc.fluix_tfc": "Fluix", + "trim_material.tfc.silver_tfc": "Silver", + "trim_material.tfc.sterling_silver_tfc": "Sterling Silver", + "trim_material.tfc.gold_tfc": "Gold", + "trim_material.tfc.rose_gold_tfc": "Rose Gold", + "trim_material.tfc.nickel_tfc": "Nickel", + "trim_material.tfc.platinum_tfc": "Platinum", + "trim_material.tfc.titanium_tfc": "Titanium", + "trim_material.tfc.bismuth_tfc": "Bismuth", + "trim_material.tfc.neutronium_tfc": "Neutronium", + "trim_material.tfc.pyrite_tfc": "Pyrite", + "trim_material.tfc.redx_tfc": "RedX" } \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index b6a45ec2f..f9044e1e4 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -328,6 +328,9 @@ "block.tfg.sandstone.stairs.smooth.fluorapatite.yellow": "Smooth Yellow Fluorapatite Sandstone Stairs", "block.tfg.sandstone.fluorapatite.yellow": "Cut Yellow Fluorapatite Sandstone", "block.tfg.sandstone.smooth.chiseled.fluorapatite.yellow": "Chiseled Yellow Fluorapatite Sandstone", + "block.tfg.large_nest_box": "Large Crimson Nest", + "tfg.block_entity.large_nest_box": "Large Nest Box", + "block.tfg.large_nest_box_warped": "Large Warped Nest", "fluid.tfg.nether_slurry": "Nether Slurry", "fluid.tfg.enriched_nether_slurry": "Enriched Nether Slurry", "fluid.tfg.ender_slurry": "Ender Slurry", @@ -481,6 +484,12 @@ "item.tfg.food.calorie_paste": "Calorie Paste", "item.tfg.food.meal_bag": "Meal Bag", "item.tfg.food.ice_soup": "Ice Soup", + "item.tfg.food.raw_glacian_mutton": "Raw Glacian Mutton", + "item.tfg.food.cooked_glacian_mutton": "Cooked Glacian Mutton", + "item.tfg.spawn_egg.glacian_ram": "Glacian Spawn Egg", + "item.tfg.food.raw_sniffer_beef": "Raw Sniffer Beef", + "item.tfg.food.cooked_sniffer_beef": "Cooked Sniffer Beef", + "item.tfg.spawn_egg.sniffer": "Sniffer Spawn Egg", "item.tfg.roasted_sunflower_seeds": "Roasted Sunflower Seeds", "item.tfg.sunflower_seeds": "Sunflower Seed", "item.tfg.sunflower_product": "Sunflower Cap", @@ -524,7 +533,9 @@ "item.tfg.wood.lumber.aeronos": "Aeronos Lumber", "item.tfg.wood.lumber.strophar": "Strophar Lumber", "item.tfg.wood.lumber.glacian": "Glacian Lumber", - "item.tfg.aes_polyurethane": "AES Reinforced R-Polyurethane Foam", + "item.tfg.glacian_wool": "Glacian Ram Wool", + "item.tfg.sniffer_wool": "Mineral Rich Tufts", + "item.tfg.aes_polyurethane": "Bio-AES Reinforced R-Polyurethane Foam", "item.tfg.mli_shielding": "Multi-Layer Insulated Shielding", "item.tfg.rocket_cone_t3": "Advanced Rocket Nose Cone", "item.tfg.rocket_fin_t3": "Advanced Rocket Fin", @@ -741,6 +752,12 @@ "tfg.tooltip.moon_rabbit_variant.cyan": "Seafoam Fur", "tfg.tooltip.moon_rabbit_variant.purple": "Lavender Fur", "tfg.tooltip.moon_rabbit_variant.sofu": "Sundae Fur", + "entity.tfg.glacian_ram.male": "Glacian Ram", + "entity.tfg.glacian_ram.female": "Glacian Ewe", + "tfg.tooltip.attribution.glacian_ram": "§9§oCredit: Ad Astra", + "entity.tfg.sniffer.male": "Sniffer", + "entity.tfg.sniffer.female": "Sniffer", + "tfg.tooltip.attribution.sniffer": "§9§oCredit: Minecraft", "item.treetap.tap": "Deprecated Item, Craft to Upgrade", "item.gtceu.zinc_ingot": "Deprecated Item, Craft to Upgrade", "item.gtceu.brass_ingot": "Deprecated Item, Craft to Upgrade", @@ -1380,6 +1397,7 @@ "quests.high_voltage.lcr.desc.2": "There are also &3LCR&r exclusive recipes. For example, &dRadon&r can only be made in the LCR right now.\n\nAll &dOverclocks&r in the &3LCR&r are &6100%% efficient&r (known as Perfect overclocks); each overclock will &5quadruple the speed&r, as opposed to doubling it.\n\nThe &3LCR&r has yet another &6advantage&r. You can use &32 Energy Hatches&r to allow it to run recipes of the &5next tier&r, similar to the &3Electric Blast Furnace&r.", "quests.high_voltage.lcr.desc.3": "&9Tip:&r Given the amount of LCRs you may end up using, why not try utilising &dwallsharing&r to its full potential?\n\nYou could share one 2A (standard) &3Energy Hatch&r between 2 LCRs.\n\nYou might want to share &3Input/Output Hatches&r, but make sure each LCR is running the correct recipe.\n\nKeep in mind Maintenance hatches are not sharable.", "quests.high_voltage.tnt.title": "TNT", + "quests.high_voltage.tnt.task": "Any explosive", "quests.high_voltage.tnt.desc.1": "Get ready to make some explosives, as they will be required for the &cImplosion Compressor&r. You have four options, from easy to hardest, but we advise you to work towards the &dIndustrial TNT&r whenever you can.", "quests.high_voltage.tnt.desc.2": "&cTNT&r (Trinitrotoluene) can't be prepared with the usual Gunpowder and Sand anymore. Instead, you'll have to produce &aGelled Toluene&r and react it with Sulfuric Acid to make TNT.\n\nUsing the &3HV Chemical Reactor&r recipe will double the yield of &aGelled Toluene&r at the cost of requiring additional inputs.", "quests.high_voltage.tnt.desc.3": "We don't have any easy tips to give you for &aToluene&r. It's going to be tricky no matter which route you take.\n\nThat being said, don't miss out on the direct &aHeavy Fuel&r to &aToluene&r recipe in the single block &3Distillery&r.\n\n&aToluene&r can also optionally be used in &5EV&r to make &dGasoline&r.\n\n&cTNT&r is used in the &3Implosion Compressor&r to make Gems. It also blows stuff up.", @@ -1472,6 +1490,11 @@ "quests.high_voltage.welcome_moon.title": "I'm on the &3Moon&r!", "quests.high_voltage.welcome_moon.subtitle": "Hope you have everything to come back", "quests.high_voltage.welcome_moon.desc": "&2Congrats&r, you’ve successfully landed on the &7Moon&r!\nHere, you’ll find &bCertus Quartz&r veins and the meteors that allow you to begin unlocking &dAE2&r.\n\nBut that’s not all — some veins here have much higher density than those on Earth.\n\nFor instance, you can easily find &6Ilmenite&r, &7Bauxite&r, &7Aluminium&r, and &5Chromite&r veins on the Moon.\nEstablishing a small base here will be crucial to keep progressing.\n\nYour biggest challenge will be transporting resources, as there are no easy cross-dimensional tools like the &5Ender Chest&r or &dAE2 Quantum Link&r just yet.\n\nWe hope you're well prepared, unless you want to craft a second rocket and space suit just to go collect your corpse!", + "quests.high_voltage.gun.title": "Bring a gun", + "quests.high_voltage.gun.subtitle": "And if that don't work, use more gun", + "quests.high_voltage.gun.task1": "Any gun", + "quests.high_voltage.gun.task2": "Any medicine or aged alcohol", + "quests.high_voltage.gun.desc": "Getting a little too comfortable on Earth? You won't be alone on the moon, so make sure you're well prepared to defend yourself - you'll need more than just a sword or some stone javelins.\n\nPick out a nice gun (if you're not sure, we recommend the &o\"Clockwork\" Sniper&r), craft some ammo, and maybe try out some attachments if you're feeling fancy.\n\nIt's also a good idea to bring some nutritious food to raise your max HP (try the meal bags!) as well as some alcohol and medicine for buffs and healing.", "quests.low_voltage": "&7LV&r - Low Voltage", "quests.low_voltage.subtitle": "Tame electricity and begin your GregTech journey", "quests.low_voltage.lv_machine_hull.title": "Your second machine hull", @@ -1496,7 +1519,7 @@ "quests.low_voltage.lbb.subtitle": "Boom, boom, boom, boom", "quests.low_voltage.lbb.desc.1": "The &3Large Boiler&r is an &6optional&r big-boy variant of the Small Boilers. It runs off solid or liquid fuel.\n\nIf you want Steam-based power production, this is an alternative to the Create Steam Engine. Later power options are listed in the &bMV&r chapter.\n\nAt the moment, due to a bug in GTCEu, this machine is prevented from ever exploding, but you should set it up so it never runs out of water like your Small Boilers, so it doesn't explode when the bug is fixed.", "quests.low_voltage.lbb.desc.2": "Once fully heated up, the &3LBB&r produces 800 Steam per tick, which is &d400EU/t&r after conversion, or 12.5 Basic Steam Turbines. Such (relatively!) immense power comes at the cost of &la lot&r of burnable fuel. &5With this in consideration&r, the GUI lets you &9throttle&r the Boiler down to 25 percent power for 200 Steam per tick. That's &d100EU/t&r, or slightly above 3 Basic Steam Turbines.\n\nWe recommend holding off making this until you're ready to power your EBF.", - "quests.low_voltage.lbb.desc.3": "In TerraFirmaGreg, you have a few options for fuel. You can use a Hose Pulley to pull infinite &cLava&r out of a deep underground lake, or set up a tree farm to give infinite &8Charcoal&r and &8Creosote&r. Lastly, there are huge surface-level &8Coal&r veins that you can extract with some automated mining machines and turn into Coke and significantly more Creosote than charcoal.", + "quests.low_voltage.lbb.desc.3": "In TerraFirmaGreg, you have a few options for fuel. You can use a Hose Pulley to pull Lava out of a deep underground lake, or set up a tree farm to give Charcoal and Creosote. Lastly, there are huge surface-level Coal veins that you can extract with some automated mining machines and turn into Coke and significantly more Creosote than charcoal.", "quests.low_voltage.lv_polariser.title": "Basic Polariser", "quests.low_voltage.lv_polariser.subtitle": "The Polarizer polarizes!", "quests.low_voltage.lv_polariser.desc": "One of the cheapest - if not the cheapest - &7LV&r machine. Use this to make &6Redstone-free Magnetic Rods&r for your Motors. Whenever you start to batch your Motors, this machine will save you stacks and stacks of Redstone.", @@ -1688,6 +1711,7 @@ "quests.low_voltage.lv_extractor.desc.2": "&l&3Lore:&r&o Did you notice this machine doubles as both an Extractor and a Fluid Extractor? The two of them were separate machines in previous versions of GregTech.", "quests.low_voltage.lv_chemical_reactor.title": "Basic Chemical Reactor", "quests.low_voltage.lv_chemical_reactor.subtitle": "Chemistry for dummies", + "quests.low_voltage.lv_chemical_reactor.task": "Liquid Rubber", "quests.low_voltage.lv_chemical_reactor.desc.1": "The &3Chemical Reactor&r will be required for &la lot&r of recipes.\n\nLet's give it a spin - why don't we use your freshly made Chemical Reactor to unlock a new, &6better recipe for Rubber&r? Rubber is &dunusable&r as a Fluid, so you will need to make another machine to process it further.", "quests.low_voltage.lv_chemical_reactor.desc.2": "You can't make Rubber using the Chemical Reactor alone, so here are some &aother machines&r you might want to aim for: \n\nA &3Solidifier&r is useful to solidify your Rubber directly into &aRubber Sheets&r. You'll want these moving forward.\n\nYou could then make use of an &3Assembler&r to use your molten Rubber for &aCables&r. This isn't important for Tin Cables, but better cables will &eneed&r to be made in the Assembler.\n\n&eNote:&r Submit a fluid by having it stored in &lany&r tank in your inventory. A Drum is the perfect candidate.", "quests.low_voltage.lv_fluid_solidifier.title": "Basic Fluid Solidifier", @@ -2246,7 +2270,7 @@ "quests.space_survival.stone_dust_centrifuging.task": "Any ", "quests.space_survival.compressed_gases.title": "Compressed Breathable Gases", "quests.space_survival.compressed_gases.subtitle": "Because pure Oxygen is deadly", - "quests.space_survival.compressed_gases.desc": "Find yourself a little short of breath? You'll need something to breathe up in space, so you'll want to look at producing any of these compressed gases, based off real-world ones used for deep sea diving!\n\nYou can fill your space suit with them the same way you'd fill up a bucket, or if you bring along a &bGas Tank&r you'll be able to \"drink\" from it to replenish your suit without taking it off.\n\n&2Nitrox&r is probably the easiest to produce on Earth, while you can set up &eHeliox-3&r on the Moon.\n\nA full space suit (1000mB) will last &c20 minutes&r.", + "quests.space_survival.compressed_gases.desc": "Find yourself a little short of breath? You'll need something to breathe up in space, so you'll want to look at producing any of these compressed gases, based off real-world ones used for deep sea diving!\n\nYou can fill your space suit with them the same way you'd fill up a bucket, or if you bring along a &bGas Tank&r you'll be able to \"drink\" from it to replenish your suit without taking it off.\n\n&2Nitrox&r is probably the easiest to produce on Earth, while you can set up &eHeliox-3&r on the Moon.\n\nA full space suit (2000mB) will last about &c20 minutes&r.", "quests.space_survival.compressed_gases.task": "Any compressed breathable gas", "quests.space_survival.zip_gun.title": "Zip Gun", "quests.space_survival.zip_gun.subtitle": "Like a jetpack in the palm of your hand", From 5cc07ffca1b0cbfbc3943e09eb404cfd758940d2 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 14 Aug 2025 21:47:21 +0100 Subject: [PATCH 058/158] added quest pointing people at the space survival chapter --- .../quests/chapters/hv__high_voltage.snbt | 15 +++++++++++++++ kubejs/assets/tfg/lang/en_us.json | 3 +++ 2 files changed, 18 insertions(+) diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index 7602d6132..0b4a4cdeb 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -1299,6 +1299,21 @@ x: 10.0d y: -4.0d } + { + dependencies: ["00A2566109144D7F"] + description: ["{quests.high_voltage.space_survival.desc}"] + icon: "ad_astra:oxygen_distributor" + id: "08AAD91CE348A08B" + subtitle: "{quests.high_voltage.space_survival.subtitle}" + tasks: [{ + id: "66E3342A47817498" + title: "{quests.high_voltage.space_survival.title}" + type: "checkmark" + }] + title: "{quests.high_voltage.space_survival.title}" + x: 13.0d + y: 1.5d + } ] subtitle: ["{quests.high_voltage.subtitle}"] title: "{quests.high_voltage}" diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index f9044e1e4..d6ee13eaa 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1495,6 +1495,9 @@ "quests.high_voltage.gun.task1": "Any gun", "quests.high_voltage.gun.task2": "Any medicine or aged alcohol", "quests.high_voltage.gun.desc": "Getting a little too comfortable on Earth? You won't be alone on the moon, so make sure you're well prepared to defend yourself - you'll need more than just a sword or some stone javelins.\n\nPick out a nice gun (if you're not sure, we recommend the &o\"Clockwork\" Sniper&r), craft some ammo, and maybe try out some attachments if you're feeling fancy.\n\nIt's also a good idea to bring some nutritious food to raise your max HP (try the meal bags!) as well as some alcohol and medicine for buffs and healing.", + "quests.high_voltage.space_survival.title": "Home away from home", + "quests.high_voltage.space_survival.subtitle": "More than just a mining dimension", + "quests.high_voltage.space_survival.desc": "If you haven't already, be sure to check out the &3Tips - Space Survival&r quest chapter! It contains all the information you'll need to establish a proper moon colony.", "quests.low_voltage": "&7LV&r - Low Voltage", "quests.low_voltage.subtitle": "Tame electricity and begin your GregTech journey", "quests.low_voltage.lv_machine_hull.title": "Your second machine hull", From b1f29a2ed025872ed62fe96bc8882a9731ba9757 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 14 Aug 2025 22:12:48 +0100 Subject: [PATCH 059/158] added mineable tags to all crops, renamed file from crops to plants in prep for saplings --- CHANGELOG.md | 1 + .../tfg/{blocks.crops.js => blocks.plants.js} | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) rename kubejs/startup_scripts/tfg/{blocks.crops.js => blocks.plants.js} (86%) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1783d136..cd22b6c29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - Fixed a dupe with certus quartz @Pyritie - Moved the golden apple recipe over to the food processor so it respects food expiry data @Pyritie - Removed some remaining swine-steel crafting recipes @Pyritie +- Added missing hoe/scythe mineable tags from custom crops (#1622) @Pyritie ## [0.10.9] - 10-08-2025 ### Changes diff --git a/kubejs/startup_scripts/tfg/blocks.crops.js b/kubejs/startup_scripts/tfg/blocks.plants.js similarity index 86% rename from kubejs/startup_scripts/tfg/blocks.crops.js rename to kubejs/startup_scripts/tfg/blocks.plants.js index 2a520e0a0..e24b762bb 100644 --- a/kubejs/startup_scripts/tfg/blocks.crops.js +++ b/kubejs/startup_scripts/tfg/blocks.plants.js @@ -13,6 +13,7 @@ const registerTFGCrops = (event) => { .doubleStages(2) .hardness(0.4) .growthModifier(0.8) + .tagBlock('minecraft:mineable/hoe') .productItem(product => { product.texture('tfg:item/sunflower_product') }) @@ -22,6 +23,7 @@ const registerTFGCrops = (event) => { .deadBlock(dead => { dead.hardness(0.2) dead.soundType('crop') + dead.tagBlock('minecraft:mineable/hoe') }) event.create('tfg:sunflower_wild', 'tfc:wild_crop') @@ -31,6 +33,7 @@ const registerTFGCrops = (event) => { .food('tfg:sunflower_product') .hardness(0.2) .tagBoth('tfc:wild_crops') + .tagBlock('minecraft:mineable/hoe') .tagItem('c:hidden_from_recipe_viewers') event.create('tfg:rapeseed', 'tfc:double_crop') @@ -40,9 +43,11 @@ const registerTFGCrops = (event) => { .stages(3) .doubleStages(3) .hardness(0.4) + .tagBlock('minecraft:mineable/hoe') .deadBlock(dead => { dead.hardness(0.2) dead.soundType('crop') + dead.tagBlock('minecraft:mineable/hoe') }) event.create('tfg:rapeseed_wild', 'tfc:wild_crop') @@ -52,6 +57,7 @@ const registerTFGCrops = (event) => { .food('tfg:rapeseed_product') .hardness(0.2) .tagBoth('tfc:wild_crops') + .tagBlock('minecraft:mineable/hoe') .tagItem('c:hidden_from_recipe_viewers') // Mars @@ -61,6 +67,7 @@ const registerTFGCrops = (event) => { .nutrient('phosphorous') .stages(3) .hardness(0.4) + .tagBlock('minecraft:mineable/hoe') .productItem(product => { product.food(food => { food.hunger(4) @@ -70,6 +77,7 @@ const registerTFGCrops = (event) => { .deadBlock(dead => { dead.hardness(0.2) dead.soundType('crop') + dead.tagBlock('minecraft:mineable/hoe') }) event.create('betterend:amber_root_wild', 'tfc:wild_crop') @@ -79,6 +87,7 @@ const registerTFGCrops = (event) => { .food('betterend:amber_root_product') .hardness(0.2) .tagBoth('tfc:wild_crops') + .tagBlock('minecraft:mineable/hoe') .tagItem('c:hidden_from_recipe_viewers') @@ -87,6 +96,7 @@ const registerTFGCrops = (event) => { .nutrient('potassium') .stages(3) .hardness(0.4) + .tagBlock('minecraft:mineable/hoe') .productItem(product => { product.food(food => { food.hunger(5) @@ -96,6 +106,7 @@ const registerTFGCrops = (event) => { .deadBlock(dead => { dead.hardness(0.2) dead.soundType('crop') + dead.tagBlock('minecraft:mineable/hoe') }) event.create('betterend:blossom_berry_wild', 'tfc:wild_crop') @@ -105,6 +116,7 @@ const registerTFGCrops = (event) => { .food('betterend:blossom_berry_product') .hardness(0.2) .tagBoth('tfc:wild_crops') + .tagBlock('minecraft:mineable/hoe') .tagItem('c:hidden_from_recipe_viewers') @@ -123,9 +135,11 @@ const registerTFGCrops = (event) => { .nutrient('nitrogen') .stages(3) .hardness(0.4) + .tagBlock('minecraft:mineable/hoe') .deadBlock(dead => { dead.hardness(0.2) dead.soundType('crop') + dead.tagBlock('minecraft:mineable/hoe') }) .fruitBlock('betterend:cave_pumpkin') .textureAt(0, "betterend:block/cave_pumpkin_stem_0") @@ -141,6 +155,7 @@ const registerTFGCrops = (event) => { .seeds('betterend:cave_pumpkin_seeds') .hardness(0.2) .tagBoth('tfc:wild_crops') + .tagBlock('minecraft:mineable/hoe') .tagItem('c:hidden_from_recipe_viewers') @@ -150,6 +165,7 @@ const registerTFGCrops = (event) => { .nutrient('phosphorous') .stages(3) .hardness(0.4) + .tagBlock('minecraft:mineable/hoe') .productItem(product => { product.food(food => { food.hunger(2) @@ -161,6 +177,7 @@ const registerTFGCrops = (event) => { .deadBlock(dead => { dead.hardness(0.2) dead.soundType('nether_wart') + dead.tagBlock('minecraft:mineable/hoe') }) event.create('betterend:chorus_mushroom_wild', 'tfc:wild_crop') @@ -171,6 +188,7 @@ const registerTFGCrops = (event) => { .food('betterend:chorus_mushroom_product') .hardness(0.2) .tagBoth('tfc:wild_crops') + .tagBlock('minecraft:mineable/hoe') .tagItem('c:hidden_from_recipe_viewers') @@ -179,6 +197,7 @@ const registerTFGCrops = (event) => { .nutrient('potassium') .stages(3) .hardness(0.4) + .tagBlock('minecraft:mineable/hoe') .productItem(product => { product.food(food => { food.hunger(5) @@ -189,6 +208,7 @@ const registerTFGCrops = (event) => { .deadBlock(dead => { dead.hardness(0.2) dead.soundType('crop') + dead.tagBlock('minecraft:mineable/hoe') }) event.create('betterend:shadow_berry_wild', 'tfc:wild_crop') @@ -198,6 +218,7 @@ const registerTFGCrops = (event) => { .food('betterend:shadow_berry_product') .hardness(0.2) .tagBoth('tfc:wild_crops') + .tagBlock('minecraft:mineable/hoe') .tagItem('c:hidden_from_recipe_viewers') @@ -206,6 +227,7 @@ const registerTFGCrops = (event) => { .nutrient('phosphorous') .stages(3) .hardness(0.4) + .tagBlock('minecraft:mineable/hoe') .productItem(product => { product.food(food => { food.hunger(2) @@ -217,6 +239,7 @@ const registerTFGCrops = (event) => { .deadBlock(dead => { dead.hardness(0.2) dead.soundType('nether_wart') + dead.tagBlock('minecraft:mineable/hoe') }) event.create('betterend:bolux_mushroom_wild', 'tfc:wild_crop') @@ -226,5 +249,6 @@ const registerTFGCrops = (event) => { .food('betterend:bolux_mushroom_product') .hardness(0.2) .tagBoth('tfc:wild_crops') + .tagBlock('minecraft:mineable/hoe') .tagItem('c:hidden_from_recipe_viewers') } \ No newline at end of file From 8d2a4d24736e9ad66c69c2f873e705522e255bae Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 15 Aug 2025 00:07:23 +0100 Subject: [PATCH 060/158] oh yeah these still don't exist --- .../loot_tables/blocks/ex_emc_interface.json | 18 +----------------- .../loot_tables/blocks/mega_emc_interface.json | 18 +----------------- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/kubejs/data/expatternprovider/loot_tables/blocks/ex_emc_interface.json b/kubejs/data/expatternprovider/loot_tables/blocks/ex_emc_interface.json index 9d73324fe..c1e0b0905 100644 --- a/kubejs/data/expatternprovider/loot_tables/blocks/ex_emc_interface.json +++ b/kubejs/data/expatternprovider/loot_tables/blocks/ex_emc_interface.json @@ -1,20 +1,4 @@ { "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "expatternprovider:ex_emc_interface" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] + "pools": [] } \ No newline at end of file diff --git a/kubejs/data/megacells/loot_tables/blocks/mega_emc_interface.json b/kubejs/data/megacells/loot_tables/blocks/mega_emc_interface.json index b293a6912..c1e0b0905 100644 --- a/kubejs/data/megacells/loot_tables/blocks/mega_emc_interface.json +++ b/kubejs/data/megacells/loot_tables/blocks/mega_emc_interface.json @@ -1,20 +1,4 @@ { "type": "minecraft:block", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "megacells:mega_emc_interface" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] + "pools": [] } \ No newline at end of file From 7c8d7657686d97480a9471144da07f9edcdec487 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 15 Aug 2025 00:50:20 +0100 Subject: [PATCH 061/158] do you like your bread with or without the peel --- kubejs/startup_scripts/firmalife/constants.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kubejs/startup_scripts/firmalife/constants.js b/kubejs/startup_scripts/firmalife/constants.js index 3dd72a6f7..5253ef8d1 100644 --- a/kubejs/startup_scripts/firmalife/constants.js +++ b/kubejs/startup_scripts/firmalife/constants.js @@ -31,6 +31,9 @@ global.FIRMALIFE_DISABLED_ITEMS = [ 'firmalife:copper_pipe', 'firmalife:oxidized_copper_pipe', 'firmalife:irrigation_tank', + + // disabled so people use tongs instead + 'firmalife:peel' ]; global.FIRMALIFE_HIDED_ITEMS = [ From 90ce71d94a9d1daceaa86de9fd1d7581f3197c7c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 15 Aug 2025 01:17:18 +0100 Subject: [PATCH 062/158] mars biome particle tags --- kubejs/server_scripts/ad_astra/tags.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 5588103bc..7868e9169 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -314,6 +314,20 @@ const registerAdAstraBiomeTags = (event) => { event.add('sandworm_mod:can_spawn_sandworms', 'tfg:mars/martian_dunes') event.add('sandworm_mod:can_spawn_sandworms', 'tfg:mars/martian_deep_desert') + + event.add('tfg:has_dark_sand_particles', 'tfg:mars/martian_dunes') + event.add('tfg:has_dark_sand_particles', 'tfg:mars/martian_deep_desert') + event.add('tfg:has_medium_sand_particles', 'tfg:mars/martian_dune_edge') + event.add('tfg:has_medium_sand_particles', 'tfg:mars/amber_plains') + event.add('tfg:has_medium_sand_particles', 'tfg:mars/amber_hills') + event.add('tfg:has_medium_sand_particles', 'tfg:mars/rusticus_plains') + event.add('tfg:has_medium_sand_particles', 'tfg:mars/rusticus_hills') + event.add('tfg:has_medium_sand_particles', 'tfg:mars/sangnum_plains') + event.add('tfg:has_medium_sand_particles', 'tfg:mars/sangnum_hills') + event.add('tfg:has_medium_sand_particles', 'tfg:mars/martian_oasis') + event.add('tfg:has_medium_sand_particles', 'tfg:mars/martian_mountains') + event.add('tfg:has_light_sand_particles', 'tfg:mars/martian_river') + event.add('tfg:has_light_sand_particles', 'tfg:mars/martian_riverbed') } const registerAdAstraEntityTypeTags = (event) => { @@ -432,11 +446,6 @@ const registerAdAstraPlacedFeatures = (event) => { event.add("tfg:mars_global_small_plants", "tfg:mars/surface/small_amaranita_mushroom") - // TODO - //event.add("tfg:mars_trees", "species:alphacene_mushroom") - event.add("tfg:mars_global_small_plants", "tfg:mars/surface/aeronos_patch") - event.add("tfg:mars_global_small_plants", "tfg:mars/surface/strophar_patch") - event.add("tfg:mars_amber_vegetal_decoration", 'tfg:mars_forest') event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_amber_small_plants") event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_global_small_plants") From ce2a38285cbbfcf8a3f0141abe0ea95d879a0673 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 15 Aug 2025 02:14:07 +0100 Subject: [PATCH 063/158] added 3 more mars trees + tfc-style saplings for all 6 --- kubejs/assets/tfc/lang/en_us.json | 130 +++++++++--------- .../tfg/blockstates/saplings/aeronos.json | 5 + .../tfg/blockstates/saplings/alphacene.json | 5 + .../tfg/blockstates/saplings/crimson.json | 5 + .../tfg/blockstates/saplings/strophar.json | 5 + .../tfg/blockstates/saplings/warped.json | 5 + .../tfg/models/item/saplings/aeronos.json | 3 + .../tfg/models/item/saplings/alphacene.json | 3 + .../tfg/models/item/saplings/crimson.json | 3 + .../tfg/models/item/saplings/strophar.json | 3 + .../tfg/models/item/saplings/warped.json | 3 + .../tfg/worldgen/biome/mars/amber_hills.json | 1 + .../tfg/worldgen/biome/mars/amber_plains.json | 1 + .../worldgen/biome/mars/martian_oasis.json | 1 + .../worldgen/biome/mars/martian_riverbed.json | 1 + .../worldgen/biome/mars/rusticus_hills.json | 1 + .../worldgen/biome/mars/rusticus_plains.json | 3 +- .../worldgen/biome/mars/sangnum_hills.json | 1 + .../worldgen/biome/mars/sangnum_plains.json | 1 + .../mars/surface/aeronos_huge.json | 24 ---- .../mars/surface/aeronos_patch.json | 40 ------ .../mars/surface/strophar_patch.json | 40 ------ .../configured_feature/mars/tree/aeronos.json | 99 +++++++++++++ .../mars/tree/aeronos_dead.json | 96 +++++++++++++ .../mars/tree/aeronos_old_growth.json | 93 +++++++++++++ .../alphacene_dead.json} | 24 ++-- .../mars/tree/strophar.json | 79 +++++++++++ .../mars/tree/strophar_dead.json | 73 ++++++++++ .../mars/tree/strophar_old_growth.json | 95 +++++++++++++ .../mars/surface/aeronos_huge.json | 23 ---- .../mars/surface/aeronos_patch.json | 23 ---- .../mars/surface/pitcher_plant.json | 9 +- .../mars/surface/strophar_huge.json | 23 ---- .../mars/surface/strophar_patch.json | 23 ---- .../placed_feature/mars/tree/aeronos.json | 4 + .../mars/tree/aeronos_dead.json | 4 + .../mars/tree/aeronos_old_growth.json | 4 + .../mars/tree/alphacene_dead.json | 4 + .../placed_feature/mars/tree/strophar.json | 4 + .../mars/tree/strophar_dead.json | 4 + .../mars/tree/strophar_old_growth.json | 4 + kubejs/server_scripts/ad_astra/recipes.js | 9 +- kubejs/server_scripts/ad_astra/tags.js | 3 - kubejs/server_scripts/beneath/recipes.js | 4 +- kubejs/server_scripts/species/recipes.js | 4 +- kubejs/server_scripts/tfg/events.forests.js | 57 ++++++++ kubejs/startup_scripts/tfg/blocks.plants.js | 35 ++++- 47 files changed, 798 insertions(+), 286 deletions(-) create mode 100644 kubejs/assets/tfg/blockstates/saplings/aeronos.json create mode 100644 kubejs/assets/tfg/blockstates/saplings/alphacene.json create mode 100644 kubejs/assets/tfg/blockstates/saplings/crimson.json create mode 100644 kubejs/assets/tfg/blockstates/saplings/strophar.json create mode 100644 kubejs/assets/tfg/blockstates/saplings/warped.json create mode 100644 kubejs/assets/tfg/models/item/saplings/aeronos.json create mode 100644 kubejs/assets/tfg/models/item/saplings/alphacene.json create mode 100644 kubejs/assets/tfg/models/item/saplings/crimson.json create mode 100644 kubejs/assets/tfg/models/item/saplings/strophar.json create mode 100644 kubejs/assets/tfg/models/item/saplings/warped.json delete mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/surface/aeronos_huge.json delete mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/surface/aeronos_patch.json delete mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/surface/strophar_patch.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_dead.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_old_growth.json rename kubejs/data/tfg/worldgen/configured_feature/mars/{surface/strophar_huge.json => tree/alphacene_dead.json} (64%) create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_dead.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_old_growth.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeronos_huge.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeronos_patch.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/surface/strophar_huge.json delete mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/surface/strophar_patch.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos_dead.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos_old_growth.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/tree/alphacene_dead.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar_dead.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar_old_growth.json diff --git a/kubejs/assets/tfc/lang/en_us.json b/kubejs/assets/tfc/lang/en_us.json index 2d034321e..61aab90fe 100644 --- a/kubejs/assets/tfc/lang/en_us.json +++ b/kubejs/assets/tfc/lang/en_us.json @@ -1,67 +1,67 @@ { - "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", - "block.tfc.fluid.salt_water": "Sea Water", - "block.tfc.cauldron.salt_water": "Sea Water Cauldron", - "fluid.tfc.salt_water": "Sea Water", - "item.tfc.bucket.salt_water": "Sea Water Bucket", - "item.tfc.powder.saltpeter": "Saltpeter Powder", - "item.tfc.powder.sulfur": "Sulfur Powder", - "tfc.jei.raw_hide_knapping": "Raw Hide Knapping", - "metal.tfg.redstone": "Redstone", - "metal.tfg.red_alloy": "Red Alloy", - "metal.tfg.tin_alloy": "Tin Alloy", - "metal.tfg.lead": "Lead", - "metal.tfg.invar": "Invar", - "metal.tfg.potin": "Potin", - "metal.tfg.cobalt": "Cobalt", - "metal.tfg.cobalt_brass": "Cobalt Brass", - "metal.tfg.aluminium_silicate": "Aluminium Silicate", - "trim_material.tfc.almandine_tfc": "Almandine", - "trim_material.tfc.andradite_tfc": "Andradite", - "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", - "trim_material.tfc.cinnabar_tfc": "Cinnabar", - "trim_material.tfc.coal_tfc": "Coal", - "trim_material.tfc.diamond_tfc": "Diamond", - "trim_material.tfc.emerald_tfc": "Emerald", - "trim_material.tfc.green_sapphire_tfc": "Green Sapphire", - "trim_material.tfc.grossular_tfc": "Grossular", - "trim_material.tfc.rutile_tfc": "Rutile", - "trim_material.tfc.lazurite_tfc": "Lazurite", - "trim_material.tfc.pyrope_tfc": "Pyrope", - "trim_material.tfc.rock_salt_tfc": "Rock Salt", - "trim_material.tfc.ruby_tfc": "Ruby", - "trim_material.tfc.salt_tfc": "salt", - "trim_material.tfc.sapphire_tfc": "Sapphire", - "trim_material.tfc.sodalite_tfc": "Sodalite", - "trim_material.tfc.coke_tfc": "Coke", - "trim_material.tfc.spessartine_tfc": "Spessartine", - "trim_material.tfc.topaz_tfc": "Topaz", - "trim_material.tfc.uvarovite_tfc": "Uvarovite", - "trim_material.tfc.nether_quartz_tfc": "Nether Quartz", - "trim_material.tfc.certus_quartz_tfc": "Certus Quartz", - "trim_material.tfc.quartzite_tfc": "Quartzite", - "trim_material.tfc.realgar_tfc": "Realgar", - "trim_material.tfc.malachite_tfc": "Malachite", - "trim_material.tfc.glass_tfc": "Glass", - "trim_material.tfc.olivine_tfc": "Olivine", - "trim_material.tfc.opal_tfc": "Opal", - "trim_material.tfc.amethyst_tfc": "Amethyst", - "trim_material.tfc.lapis_tfc": "Lapis", - "trim_material.tfc.apatite_tfc": "Apatite", - "trim_material.tfc.red_garnet_tfc": "Red Garnet", - "trim_material.tfc.yellow_garnet_tfc": "Yellow Garnet", - "trim_material.tfc.monazite_tfc": "Monazite", - "trim_material.tfc.rose_quartz_tfc": "Rose Quartz", - "trim_material.tfc.fluix_tfc": "Fluix", - "trim_material.tfc.silver_tfc": "Silver", - "trim_material.tfc.sterling_silver_tfc": "Sterling Silver", - "trim_material.tfc.gold_tfc": "Gold", - "trim_material.tfc.rose_gold_tfc": "Rose Gold", - "trim_material.tfc.nickel_tfc": "Nickel", - "trim_material.tfc.platinum_tfc": "Platinum", - "trim_material.tfc.titanium_tfc": "Titanium", - "trim_material.tfc.bismuth_tfc": "Bismuth", - "trim_material.tfc.neutronium_tfc": "Neutronium", - "trim_material.tfc.pyrite_tfc": "Pyrite", - "trim_material.tfc.redx_tfc": "RedX" + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.tfc.fluid.salt_water": "Sea Water", + "block.tfc.cauldron.salt_water": "Sea Water Cauldron", + "fluid.tfc.salt_water": "Sea Water", + "item.tfc.bucket.salt_water": "Sea Water Bucket", + "item.tfc.powder.saltpeter": "Saltpeter Powder", + "item.tfc.powder.sulfur": "Sulfur Powder", + "tfc.jei.raw_hide_knapping": "Raw Hide Knapping", + "metal.tfg.redstone": "Redstone", + "metal.tfg.red_alloy": "Red Alloy", + "metal.tfg.tin_alloy": "Tin Alloy", + "metal.tfg.lead": "Lead", + "metal.tfg.invar": "Invar", + "metal.tfg.potin": "Potin", + "metal.tfg.cobalt": "Cobalt", + "metal.tfg.cobalt_brass": "Cobalt Brass", + "metal.tfg.aluminium_silicate": "Aluminium Silicate", + "trim_material.tfc.almandine_tfc": "Almandine", + "trim_material.tfc.andradite_tfc": "Andradite", + "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", + "trim_material.tfc.cinnabar_tfc": "Cinnabar", + "trim_material.tfc.coal_tfc": "Coal", + "trim_material.tfc.diamond_tfc": "Diamond", + "trim_material.tfc.emerald_tfc": "Emerald", + "trim_material.tfc.green_sapphire_tfc": "Green Sapphire", + "trim_material.tfc.grossular_tfc": "Grossular", + "trim_material.tfc.rutile_tfc": "Rutile", + "trim_material.tfc.lazurite_tfc": "Lazurite", + "trim_material.tfc.pyrope_tfc": "Pyrope", + "trim_material.tfc.rock_salt_tfc": "Rock Salt", + "trim_material.tfc.ruby_tfc": "Ruby", + "trim_material.tfc.salt_tfc": "salt", + "trim_material.tfc.sapphire_tfc": "Sapphire", + "trim_material.tfc.sodalite_tfc": "Sodalite", + "trim_material.tfc.coke_tfc": "Coke", + "trim_material.tfc.spessartine_tfc": "Spessartine", + "trim_material.tfc.topaz_tfc": "Topaz", + "trim_material.tfc.uvarovite_tfc": "Uvarovite", + "trim_material.tfc.nether_quartz_tfc": "Nether Quartz", + "trim_material.tfc.certus_quartz_tfc": "Certus Quartz", + "trim_material.tfc.quartzite_tfc": "Quartzite", + "trim_material.tfc.realgar_tfc": "Realgar", + "trim_material.tfc.malachite_tfc": "Malachite", + "trim_material.tfc.glass_tfc": "Glass", + "trim_material.tfc.olivine_tfc": "Olivine", + "trim_material.tfc.opal_tfc": "Opal", + "trim_material.tfc.amethyst_tfc": "Amethyst", + "trim_material.tfc.lapis_tfc": "Lapis", + "trim_material.tfc.apatite_tfc": "Apatite", + "trim_material.tfc.red_garnet_tfc": "Red Garnet", + "trim_material.tfc.yellow_garnet_tfc": "Yellow Garnet", + "trim_material.tfc.monazite_tfc": "Monazite", + "trim_material.tfc.rose_quartz_tfc": "Rose Quartz", + "trim_material.tfc.fluix_tfc": "Fluix", + "trim_material.tfc.silver_tfc": "Silver", + "trim_material.tfc.sterling_silver_tfc": "Sterling Silver", + "trim_material.tfc.gold_tfc": "Gold", + "trim_material.tfc.rose_gold_tfc": "Rose Gold", + "trim_material.tfc.nickel_tfc": "Nickel", + "trim_material.tfc.platinum_tfc": "Platinum", + "trim_material.tfc.titanium_tfc": "Titanium", + "trim_material.tfc.bismuth_tfc": "Bismuth", + "trim_material.tfc.neutronium_tfc": "Neutronium", + "trim_material.tfc.pyrite_tfc": "Pyrite", + "trim_material.tfc.redx_tfc": "RedX" } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/saplings/aeronos.json b/kubejs/assets/tfg/blockstates/saplings/aeronos.json new file mode 100644 index 000000000..1ec4995be --- /dev/null +++ b/kubejs/assets/tfg/blockstates/saplings/aeronos.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "ad_astra:block/alphacene_mushroom" } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/saplings/alphacene.json b/kubejs/assets/tfg/blockstates/saplings/alphacene.json new file mode 100644 index 000000000..86dbb9df9 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/saplings/alphacene.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "species:block/alphacene_mushroom" } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/saplings/crimson.json b/kubejs/assets/tfg/blockstates/saplings/crimson.json new file mode 100644 index 000000000..d65643dda --- /dev/null +++ b/kubejs/assets/tfg/blockstates/saplings/crimson.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "minecraft:block/crimson_fungus" } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/saplings/strophar.json b/kubejs/assets/tfg/blockstates/saplings/strophar.json new file mode 100644 index 000000000..2a714f2ca --- /dev/null +++ b/kubejs/assets/tfg/blockstates/saplings/strophar.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "ad_astra:block/strophar" } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/saplings/warped.json b/kubejs/assets/tfg/blockstates/saplings/warped.json new file mode 100644 index 000000000..818135dbd --- /dev/null +++ b/kubejs/assets/tfg/blockstates/saplings/warped.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "minecraft:block/warped_fungus" } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/saplings/aeronos.json b/kubejs/assets/tfg/models/item/saplings/aeronos.json new file mode 100644 index 000000000..c3e30f531 --- /dev/null +++ b/kubejs/assets/tfg/models/item/saplings/aeronos.json @@ -0,0 +1,3 @@ +{ + "parent": "ad_astra:item/aeronos_mushroom" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/saplings/alphacene.json b/kubejs/assets/tfg/models/item/saplings/alphacene.json new file mode 100644 index 000000000..5149099ce --- /dev/null +++ b/kubejs/assets/tfg/models/item/saplings/alphacene.json @@ -0,0 +1,3 @@ +{ + "parent": "species:item/alphacene_mushroom" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/saplings/crimson.json b/kubejs/assets/tfg/models/item/saplings/crimson.json new file mode 100644 index 000000000..aa1e76d4c --- /dev/null +++ b/kubejs/assets/tfg/models/item/saplings/crimson.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/crimson_fungus" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/saplings/strophar.json b/kubejs/assets/tfg/models/item/saplings/strophar.json new file mode 100644 index 000000000..1063ad2d8 --- /dev/null +++ b/kubejs/assets/tfg/models/item/saplings/strophar.json @@ -0,0 +1,3 @@ +{ + "parent": "ad_astra:item/strophar_mushroom" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/saplings/warped.json b/kubejs/assets/tfg/models/item/saplings/warped.json new file mode 100644 index 000000000..91d8ae6c2 --- /dev/null +++ b/kubejs/assets/tfg/models/item/saplings/warped.json @@ -0,0 +1,3 @@ +{ + "parent": "minecraft:item/warped_fungus" +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index 1a55f6e36..b22f94060 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -46,6 +46,7 @@ "#tfg:mars_veins", [], [ + "tfg:mars_forest", "tfc:raw_boulder", "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index 6a4d9eaf1..5dc37ca8c 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -44,6 +44,7 @@ "#tfg:mars_veins", [], [ + "tfg:mars_forest", "tfg:mars/semiheavy_ammoniacal_water" ], "#tfg:mars_amber_vegetal_decoration", diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json b/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json index 2cb57e6e9..7bf61a392 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json @@ -43,6 +43,7 @@ "#tfg:mars_veins", [], [ + "tfg:mars_forest", "tfc:raw_boulder", "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json index f06783c25..924aaa4d3 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json @@ -46,6 +46,7 @@ "#tfg:mars_veins", [], [ + "tfg:mars_forest", "tfc:raw_boulder", "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 87a52cb71..9ee67959f 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -46,6 +46,7 @@ "#tfg:mars_veins", [], [ + "tfg:mars_forest", "tfc:raw_boulder", "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index 52a762b02..664b6f5c0 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -44,7 +44,8 @@ "#tfg:mars_veins", [], [ - "tfg:mars/semiheavy_ammoniacal_water" + "tfg:mars_forest", + "tfg:mars/semiheavy_ammoniacal_water" ], "#tfg:mars_rusticus_vegetal_decoration", "#tfg:mars_top_layer_modification" diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index e0087f4a6..c35dadb41 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -46,6 +46,7 @@ "#tfg:mars_veins", [], [ + "tfg:mars_forest", "tfc:raw_boulder", "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index 2dc4101e8..49e9656fd 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -44,6 +44,7 @@ "#tfg:mars_veins", [], [ + "tfg:mars_forest", "tfg:mars/semiheavy_ammoniacal_water" ], "#tfg:mars_sangnum_vegetal_decoration", diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/aeronos_huge.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/aeronos_huge.json deleted file mode 100644 index 06887a969..000000000 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/aeronos_huge.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "minecraft:huge_fungus", - "config": { - "decor_state": { - "Name": "minecraft:shroomlight" - }, - "hat_state": { - "Name": "ad_astra:aeronos_cap" - }, - "planted": false, - "replaceable_blocks": { - "type": "minecraft:solid" - }, - "stem_state": { - "Name": "ad_astra:aeronos_stem", - "Properties": { - "axis": "y" - } - }, - "valid_base_block": { - "Name": "tfc:rock/gravel/gabbro" - } - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/aeronos_patch.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/aeronos_patch.json deleted file mode 100644 index 7a49ca69d..000000000 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/aeronos_patch.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "type": "minecraft:random_patch", - "config": { - "feature": { - "feature": { - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "ad_astra:aeronos_mushroom" - } - } - } - }, - "placement": [ - { - "type": "minecraft:block_predicate_filter", - "predicate": { - "type": "minecraft:all_of", - "predicates": [ - { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" - }, - { - "type": "minecraft:matching_block_tag", - "offset": [ 0, -1, 0 ], - "tag": "tfg:mars_soil" - } - ] - } - } - ] - }, - "tries": 48, - "xz_spread": 10, - "y_spread": 3 - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/strophar_patch.json b/kubejs/data/tfg/worldgen/configured_feature/mars/surface/strophar_patch.json deleted file mode 100644 index 9ebda4926..000000000 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/strophar_patch.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "type": "minecraft:random_patch", - "config": { - "feature": { - "feature": { - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "ad_astra:strophar_mushroom" - } - } - } - }, - "placement": [ - { - "type": "minecraft:block_predicate_filter", - "predicate": { - "type": "minecraft:all_of", - "predicates": [ - { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" - }, - { - "type": "minecraft:matching_block_tag", - "offset": [ 0, -1, 0 ], - "tag": "tfg:mars_soil" - } - ] - } - } - ] - }, - "tries": 64, - "xz_spread": 16, - "y_spread": 3 - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos.json new file mode 100644 index 000000000..9bfbcf030 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos.json @@ -0,0 +1,99 @@ +{ + "type": "minecraft:tree", + "config": { + "decorators": [], + "dirt_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + }, + "foliage_placer": { + "type": "minecraft:blob_foliage_placer", + "offset": 4, + "height": 6, + "radius": 4 + }, + "foliage_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_cap" + } + }, + "force_dirt": false, + "ignore_vines": true, + "minimum_size": { + "type": "minecraft:two_layers_feature_size", + "limit": 1, + "lower_size": 0, + "upper_size": 0 + }, + "trunk_placer": { + "type": "minecraft:cherry_trunk_placer", + "base_height": 8, + "height_rand_a": 2, + "height_rand_b": 8, + "branch_count": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + }, + "branch_horizontal_length": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 4, + "max_inclusive": 8 + } + }, + "branch_start_offset_from_top": { + "min_inclusive": -8, + "max_inclusive": -3 + }, + "branch_end_offset_from_top": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + } + }, + "trunk_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + }, + "root_placer": { + "type": "minecraft:mangrove_root_placer", + "trunk_offset_y": 1, + "mangrove_root_placement": { + "max_root_width": 1, + "max_root_length": 2, + "random_skew_chance": 0.3, + "can_grow_through": "#minecraft:mangrove_logs_can_grow_through", + "muddy_roots_in": [ + "tfg:grass/mars_dirt", + "tfg:grass/amber_mycelium", + "tfg:grass/rusticus_mycelium", + "tfg:grass/sangnum_mycelium", + "ad_astra:mars_sand", + "ad_astra:venus_sand" + ], + "muddy_roots_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + } + }, + "root_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_dead.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_dead.json new file mode 100644 index 000000000..d82d9c8ed --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_dead.json @@ -0,0 +1,96 @@ +{ + "type": "minecraft:tree", + "config": { + "decorators": [], + "dirt_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + }, + "foliage_placer": { + "type": "minecraft:blob_foliage_placer", + "height": 0, + "offset": 0, + "radius": 0 + }, + "foliage_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:air" + } + }, + "force_dirt": false, + "ignore_vines": true, + "minimum_size": { + "type": "minecraft:two_layers_feature_size", + "limit": 1, + "lower_size": 0, + "upper_size": 0 + }, + "trunk_placer": { + "type": "minecraft:cherry_trunk_placer", + "base_height": 8, + "height_rand_a": 2, + "height_rand_b": 8, + "branch_count": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + }, + "branch_horizontal_length": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 4, + "max_inclusive": 8 + } + }, + "branch_start_offset_from_top": { + "min_inclusive": -8, + "max_inclusive": -3 + }, + "branch_end_offset_from_top": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + } + }, + "trunk_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + }, + "root_placer": { + "type": "minecraft:mangrove_root_placer", + "trunk_offset_y": 1, + "mangrove_root_placement": { + "max_root_width": 1, + "max_root_length": 2, + "random_skew_chance": 0.3, + "can_grow_through": "#minecraft:mangrove_logs_can_grow_through", + "muddy_roots_in": [ + "tfg:grass/mars_dirt", + "tfg:grass/amber_mycelium", + "tfg:grass/rusticus_mycelium", + "tfg:grass/sangnum_mycelium", + "ad_astra:mars_sand", + "ad_astra:venus_sand" + ], + "muddy_roots_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + } + }, + "root_provider": { + "Name": "ad_astra:aeronos_stem" + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_old_growth.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_old_growth.json new file mode 100644 index 000000000..beab02448 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/aeronos_old_growth.json @@ -0,0 +1,93 @@ +{ + "type": "minecraft:tree", + "config": { + "decorators": [], + "dirt_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + }, + "foliage_placer": { + "type": "minecraft:blob_foliage_placer", + "offset": 6, + "height": 8, + "radius": 6 + }, + "foliage_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_cap" + } + }, + "force_dirt": false, + "ignore_vines": true, + "minimum_size": { + "type": "minecraft:two_layers_feature_size", + "limit": 1, + "lower_size": 0, + "upper_size": 0 + }, + "trunk_placer": { + "type": "minecraft:cherry_trunk_placer", + "base_height": 8, + "height_rand_a": 2, + "height_rand_b": 8, + "branch_count": 3, + "branch_horizontal_length": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 12, + "max_inclusive": 16 + } + }, + "branch_start_offset_from_top": { + "min_inclusive": -8, + "max_inclusive": -3 + }, + "branch_end_offset_from_top": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + } + }, + "trunk_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + }, + "root_placer": { + "type": "minecraft:mangrove_root_placer", + "trunk_offset_y": 3, + "mangrove_root_placement": { + "max_root_width": 2, + "max_root_length": 3, + "random_skew_chance": 0.3, + "can_grow_through": "#minecraft:mangrove_logs_can_grow_through", + "muddy_roots_in": [ + "tfg:grass/mars_dirt", + "tfg:grass/amber_mycelium", + "tfg:grass/rusticus_mycelium", + "tfg:grass/sangnum_mycelium", + "ad_astra:mars_sand", + "ad_astra:venus_sand" + ], + "muddy_roots_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + } + }, + "root_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:aeronos_stem" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/strophar_huge.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/alphacene_dead.json similarity index 64% rename from kubejs/data/tfg/worldgen/configured_feature/mars/surface/strophar_huge.json rename to kubejs/data/tfg/worldgen/configured_feature/mars/tree/alphacene_dead.json index f8d93c8a0..03b78d1d1 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/surface/strophar_huge.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/alphacene_dead.json @@ -5,40 +5,42 @@ "dirt_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "ad_astra:strophar_stem" + "Name": "tfg:mars_dirt" } }, "foliage_placer": { - "type": "minecraft:acacia_foliage_placer", + "type": "minecraft:blob_foliage_placer", + "height": 0, "offset": 0, - "radius": 2 + "radius": 0 }, "foliage_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "ad_astra:strophar_cap" + "Name": "minecraft:air" } }, "force_dirt": false, "ignore_vines": true, "minimum_size": { "type": "minecraft:two_layers_feature_size", - "limit": 1, + "limit": 0, "lower_size": 0, - "upper_size": 2 + "upper_size": 0 }, "trunk_placer": { - "type": "minecraft:forking_trunk_placer", - "base_height": 5, - "height_rand_a": 2, + "type": "minecraft:straight_trunk_placer", + "base_height": 7, + "height_rand_a": 4, "height_rand_b": 2 }, "trunk_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "ad_astra:strophar_stem", + "Name": "minecraft:mushroom_stem", "Properties": { - "axis": "y" + "down": "false", + "up": "false" } } } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar.json new file mode 100644 index 000000000..75d79598c --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar.json @@ -0,0 +1,79 @@ +{ + "type": "minecraft:tree", + "config": { + "decorators": [], + "dirt_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + }, + "foliage_placer": { + "type": "minecraft:acacia_foliage_placer", + "offset": 1, + "radius": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 3, + "max_inclusive": 5 + } + } + }, + "foliage_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_cap" + } + }, + "force_dirt": false, + "ignore_vines": true, + "minimum_size": { + "type": "minecraft:two_layers_feature_size", + "limit": 1, + "lower_size": 0, + "upper_size": 0 + }, + "trunk_placer": { + "type": "minecraft:forking_trunk_placer", + "base_height": 5, + "height_rand_a": 2, + "height_rand_b": 5 + }, + "trunk_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + }, + "root_placer": { + "type": "minecraft:mangrove_root_placer", + "trunk_offset_y": 4, + "mangrove_root_placement": { + "max_root_width": 8, + "max_root_length": 8, + "random_skew_chance": 0.2, + "can_grow_through": "#minecraft:mangrove_logs_can_grow_through", + "muddy_roots_in": [ + "tfg:grass/mars_dirt", + "tfg:grass/amber_mycelium", + "tfg:grass/rusticus_mycelium", + "tfg:grass/sangnum_mycelium", + "ad_astra:mars_sand", + "ad_astra:venus_sand" + ], + "muddy_roots_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + } + }, + "root_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_dead.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_dead.json new file mode 100644 index 000000000..fe1c3a625 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_dead.json @@ -0,0 +1,73 @@ +{ + "type": "minecraft:tree", + "config": { + "decorators": [], + "dirt_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + }, + "foliage_placer": { + "type": "minecraft:acacia_foliage_placer", + "offset": 0, + "radius": 0 + }, + "foliage_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:air" + } + }, + "force_dirt": false, + "ignore_vines": true, + "minimum_size": { + "type": "minecraft:two_layers_feature_size", + "limit": 1, + "lower_size": 0, + "upper_size": 0 + }, + "trunk_placer": { + "type": "minecraft:forking_trunk_placer", + "base_height": 5, + "height_rand_a": 2, + "height_rand_b": 5 + }, + "trunk_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + }, + "root_placer": { + "type": "minecraft:mangrove_root_placer", + "trunk_offset_y": 4, + "mangrove_root_placement": { + "max_root_width": 6, + "max_root_length": 6, + "random_skew_chance": 0.8, + "can_grow_through": "#minecraft:mangrove_logs_can_grow_through", + "muddy_roots_in": [ + "tfg:grass/mars_dirt", + "tfg:grass/amber_mycelium", + "tfg:grass/rusticus_mycelium", + "tfg:grass/sangnum_mycelium", + "ad_astra:mars_sand", + "ad_astra:venus_sand" + ], + "muddy_roots_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + } + }, + "root_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_old_growth.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_old_growth.json new file mode 100644 index 000000000..ce6e15b66 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_old_growth.json @@ -0,0 +1,95 @@ +{ + "type": "minecraft:tree", + "config": { + "decorators": [], + "dirt_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + }, + "foliage_placer": { + "type": "minecraft:acacia_foliage_placer", + "offset": 1, + "radius": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 5, + "max_inclusive": 7 + } + } + }, + "foliage_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_cap" + } + }, + "force_dirt": false, + "ignore_vines": true, + "minimum_size": { + "type": "minecraft:two_layers_feature_size", + "limit": 1, + "lower_size": 0, + "upper_size": 0 + }, + "trunk_placer": { + "type": "minecraft:upwards_branching_trunk_placer", + "base_height": 2, + "height_rand_a": 2, + "height_rand_b": 8, + "can_grow_through": "#minecraft:mangrove_logs_can_grow_through", + "extra_branch_steps": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 3, + "max_inclusive": 5 + } + }, + "extra_branch_length": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 4, + "max_inclusive": 12 + } + }, + "place_branch_per_log_probability": 0.25 + }, + "trunk_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + }, + "root_placer": { + "type": "minecraft:mangrove_root_placer", + "trunk_offset_y": 7, + "mangrove_root_placement": { + "max_root_width": 12, + "max_root_length": 12, + "random_skew_chance": 0.8, + "can_grow_through": "#minecraft:mangrove_logs_can_grow_through", + "muddy_roots_in": [ + "tfg:grass/mars_dirt", + "tfg:grass/amber_mycelium", + "tfg:grass/rusticus_mycelium", + "tfg:grass/sangnum_mycelium", + "ad_astra:mars_sand", + "ad_astra:venus_sand" + ], + "muddy_roots_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + } + }, + "root_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "ad_astra:strophar_stem" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeronos_huge.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeronos_huge.json deleted file mode 100644 index 7290dc6a9..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeronos_huge.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "feature": "tfg:mars/surface/aeronos_huge", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 3 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - }, - { - "type": "tfc:climate", - "min_forest": "normal" - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeronos_patch.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeronos_patch.json deleted file mode 100644 index 11e36935f..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeronos_patch.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "feature": "tfg:mars/surface/aeronos_patch", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 8 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - }, - { - "type": "tfc:climate", - "min_forest": "sparse" - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pitcher_plant.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pitcher_plant.json index 003ab78db..3f6047989 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pitcher_plant.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/pitcher_plant.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 2 + "chance": 1 }, { "type": "minecraft:in_square" @@ -14,6 +14,13 @@ { "type": "minecraft:heightmap", "heightmap": "WORLD_SURFACE" + }, + { + "type": "tfc:near_fluid", + "radius": 6, + "fluids": [ + "tfg:semiheavy_ammoniacal_water" + ] } ] } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/strophar_huge.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/strophar_huge.json deleted file mode 100644 index e0235e74d..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/strophar_huge.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "feature": "tfg:mars/surface/strophar_huge", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 3 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - }, - { - "type": "tfc:climate", - "min_forest": "normal" - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/strophar_patch.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/strophar_patch.json deleted file mode 100644 index 9fe5bec6b..000000000 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/strophar_patch.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "feature": "tfg:mars/surface/strophar_patch", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 5 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - }, - { - "type": "tfc:climate", - "min_forest": "sparse" - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos.json new file mode 100644 index 000000000..40ddda9f7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/aeronos", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos_dead.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos_dead.json new file mode 100644 index 000000000..3612b1f27 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos_dead.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/aeronos_dead", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos_old_growth.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos_old_growth.json new file mode 100644 index 000000000..b9d75a7b2 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/aeronos_old_growth.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/aeronos_old_growth", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/alphacene_dead.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/alphacene_dead.json new file mode 100644 index 000000000..b39477429 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/alphacene_dead.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/alphacene_dead", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar.json new file mode 100644 index 000000000..23e1b2a1e --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/strophar", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar_dead.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar_dead.json new file mode 100644 index 000000000..61b9aa682 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar_dead.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/strophar_dead", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar_old_growth.json b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar_old_growth.json new file mode 100644 index 000000000..1f6452a24 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/tree/strophar_old_growth.json @@ -0,0 +1,4 @@ +{ + "feature": "tfg:mars/tree/strophar_old_growth", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/server_scripts/ad_astra/recipes.js b/kubejs/server_scripts/ad_astra/recipes.js index 625382592..ca80b01df 100644 --- a/kubejs/server_scripts/ad_astra/recipes.js +++ b/kubejs/server_scripts/ad_astra/recipes.js @@ -919,13 +919,14 @@ const registerAdAstraRecipes = (event) => { }).id('tfg:shaped/strophar_ladder') - generateGreenHouseRecipe(event, '8x ad_astra:strophar_mushroom', 'tfg:semiheavy_ammoniacal_water', 16000, + generateGreenHouseRecipe(event, '8x tfg:saplings/strophar', 'tfg:semiheavy_ammoniacal_water', 16000, '64x ad_astra:strophar_stem', 'tfg:green_house/strophar_mushroom', 'ad_astra:mars', 8, '16x ad_astra:strophar_cap', GTValues.VA[GTValues.MV]) - generateGreenHouseRecipe(event, '8x ad_astra:aeronos_mushroom', 'tfg:semiheavy_ammoniacal_water', 16000, + generateGreenHouseRecipe(event, '8x tfg:saplings/aeronos', 'tfg:semiheavy_ammoniacal_water', 16000, '64x ad_astra:aeronos_stem', 'tfg:green_house/aeronos_mushroom', 'ad_astra:mars', 8, '16x ad_astra:aeronos_cap', GTValues.VA[GTValues.MV]) - // TODO: needs a sapling - //generateGreenHouseRecipe(event, '8x ___', 16000, '64x ad_astra:glacian_log', 'tfg:green_house/glacian_tree', 'ad_astra:mars', 8, '8x species:alphacene_moss_block', GTValues.VA[GTValues.MV]) + generateGreenHouseRecipe(event, '8x tfg:saplings/glacian', 'tfg:semiheavy_ammoniacal_water', 16000, + '64x ad_astra:glacian_log', 'tfg:green_house/glacian_tree', 'ad_astra:mars', 8, + '8x species:alphacene_moss_block', GTValues.VA[GTValues.MV]) //#endregion } diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 7868e9169..40a689ee7 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -446,15 +446,12 @@ const registerAdAstraPlacedFeatures = (event) => { event.add("tfg:mars_global_small_plants", "tfg:mars/surface/small_amaranita_mushroom") - event.add("tfg:mars_amber_vegetal_decoration", 'tfg:mars_forest') event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_amber_small_plants") event.add("tfg:mars_amber_vegetal_decoration", "#tfg:mars_global_small_plants") - event.add("tfg:mars_rusticus_vegetal_decoration", 'tfg:mars_forest') event.add("tfg:mars_rusticus_vegetal_decoration", "#tfg:mars_rusticus_small_plants") event.add("tfg:mars_rusticus_vegetal_decoration", "#tfg:mars_global_small_plants") - event.add("tfg:mars_sangnum_vegetal_decoration", 'tfg:mars_forest') event.add("tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_sangnum_small_plants") event.add("tfg:mars_sangnum_vegetal_decoration", "#tfg:mars_global_small_plants") diff --git a/kubejs/server_scripts/beneath/recipes.js b/kubejs/server_scripts/beneath/recipes.js index 56bc7f415..c28c32fbd 100644 --- a/kubejs/server_scripts/beneath/recipes.js +++ b/kubejs/server_scripts/beneath/recipes.js @@ -68,10 +68,10 @@ const registerBeneathRecipes = (event) => { event.recipes.tfc.landslide('beneath:soul_clay', 'beneath:soul_clay') - generateGreenHouseRecipe(event, '8x minecraft:warped_fungus', 'tfg:semiheavy_ammoniacal_water', 16000, + generateGreenHouseRecipe(event, '8x tfg:saplings/warped', 'tfg:semiheavy_ammoniacal_water', 16000, '64x beneath:wood/log/warped', 'tfg:green_house/warped_fungus', 'ad_astra:mars', 8, '32x minecraft:warped_wart_block', GTValues.VA[GTValues.MV]) - generateGreenHouseRecipe(event, '8x minecraft:crimson_fungus', 'tfg:semiheavy_ammoniacal_water', 16000, + generateGreenHouseRecipe(event, '8x tfg:saplings/crimson', 'tfg:semiheavy_ammoniacal_water', 16000, '64x beneath:wood/log/crimson', 'tfg:green_house/crimson_fungus', 'ad_astra:mars', 8, '32x minecraft:nether_wart_block', GTValues.VA[GTValues.MV]) diff --git a/kubejs/server_scripts/species/recipes.js b/kubejs/server_scripts/species/recipes.js index fcc33d8c4..2f3a5fa2e 100644 --- a/kubejs/server_scripts/species/recipes.js +++ b/kubejs/server_scripts/species/recipes.js @@ -66,5 +66,7 @@ function registerSpeciesRecipes(event) { B: 'firmaciv:rope_coil' }).id('tfg:shaped/harpoon') - // TODO: birtday cake + generateGreenHouseRecipe(event, '8x tfg:saplings/alphacene', 'tfg:semiheavy_ammoniacal_water', 16000, + '64x species:alphacene_mushroom_block', 'tfg:green_house/alphacene_mushroom', 'ad_astra:mars', 8, + '8x minecraft:mushroom_stem', GTValues.VA[GTValues.MV]) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/events.forests.js b/kubejs/server_scripts/tfg/events.forests.js index b7a3a61a3..e4045d179 100644 --- a/kubejs/server_scripts/tfg/events.forests.js +++ b/kubejs/server_scripts/tfg/events.forests.js @@ -55,9 +55,66 @@ TFCEvents.worldgenData(event => { null, null, null, null, null, null, placement => {} ) + + event.forestEntry('tfg:mars/aeronos_forest_entry', + climate => {}, + 'ad_astra:aeronos_stem', + 'ad_astra:aeronos_cap', + 'ad_astra:aeronos_stem', + null, + [ + "ad_astra:aeronos_mushroom", + 'beneath:wood/fallen_leaves/crimson', + 'beneath:wood/twig/crimson' + ], + 'tfg:mars/tree/aeronos', + 'tfg:mars/tree/aeronos_dead', + 'tfg:mars/tree/aeronos_old_growth', + null, null, null, null, null, null, + placement => {} + ) + + event.forestEntry('tfg:mars/strophar_forest_entry', + climate => {}, + 'ad_astra:strophar_stem', + 'ad_astra:strophar_cap', + null, + null, + [ + "ad_astra:strophar_mushroom", + 'beneath:wood/fallen_leaves/warped', + 'beneath:wood/twig/warped' + ], + 'tfg:mars/tree/strophar', + 'tfg:mars/tree/strophar_dead', + 'tfg:mars/tree/strophar_old_growth', + null, null, null, null, null, null, + placement => {} + ) + + event.forestEntry('tfg:mars/alphacene_forest_entry', + climate => {}, + 'minecraft:mushroom_stem', + 'species:alphacene_mushroom_block', + 'minecraft:mushroom_stem', + null, + [ + "species:alphacene_mushroom", + 'beneath:wood/fallen_leaves/crimson', + 'beneath:wood/twig/crimson' + ], + 'species:alphacene_mushroom', + 'tfg:mars/tree/alphacene_dead', + 'species:alphacene_mushroom', + null, null, null, null, null, null, + placement => {} + ) }) function registerTFGForestConfiguredFeatures(event) { event.add('tfg:mars_forest_entries', 'tfg:mars/crimson_forest_entry') event.add('tfg:mars_forest_entries', 'tfg:mars/warped_forest_entry') + event.add('tfg:mars_forest_entries', 'tfg:mars/aeronos_forest_entry') + event.add('tfg:mars_forest_entries', 'tfg:mars/strophar_forest_entry') + event.add('tfg:mars_forest_entries', 'tfg:mars/alphacene_forest_entry') } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/blocks.plants.js b/kubejs/startup_scripts/tfg/blocks.plants.js index e24b762bb..0e1b496aa 100644 --- a/kubejs/startup_scripts/tfg/blocks.plants.js +++ b/kubejs/startup_scripts/tfg/blocks.plants.js @@ -3,7 +3,7 @@ const registerTFGCrops = (event) => { - // Earth + // Earth Crops event.create('tfg:sunflower', 'tfc:double_crop') .translationKey('block.tfg.sunflower') @@ -60,7 +60,7 @@ const registerTFGCrops = (event) => { .tagBlock('minecraft:mineable/hoe') .tagItem('c:hidden_from_recipe_viewers') - // Mars + // Mars Crops event.create('betterend:amber_root', 'tfc:crop') .soundType('crop') @@ -251,4 +251,35 @@ const registerTFGCrops = (event) => { .tagBoth('tfc:wild_crops') .tagBlock('minecraft:mineable/hoe') .tagItem('c:hidden_from_recipe_viewers') + + // Mars Saplings + + event.create('tfg:saplings/crimson', 'tfc:sapling') + .features('tfg:mars/tree/crimson') + .translationKey('minecraft.block.crimson_fungus') + .growthDays(6) + + event.create('tfg:saplings/warped', 'tfc:sapling') + .features('tfg:mars/tree/warped') + .translationKey('minecraft.block.warped_fungus') + .growthDays(6) + + event.create('tfg:saplings/alphacene', 'tfc:sapling') + .features('species:alphacene_mushroom') + .translationKey('species.block.alphacene_mushroom') + .growthDays(3) + + event.create('tfg:saplings/strophar', 'tfc:sapling') + .features('tfg:mars/tree/strophar') + .translationKey('ad_astra.block.strophar_mushroom') + .growthDays(7) + + event.create('tfg:saplings/aeronos', 'tfc:sapling') + .features('tfg:mars/tree/aeronos') + .translationKey('ad_astra.block.strophar_mushroom') + .growthDays(9) + + event.create('tfg:saplings/glacian', 'tfc:sapling') + .features('tfg:mars/tree/glacian') + .growthDays(9) } \ No newline at end of file From f844601b55b0ce7ee9a0376ebbee21c0b0e341d5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 15 Aug 2025 21:40:02 +0100 Subject: [PATCH 064/158] adding meat tag to cruncher foods --- kubejs/server_scripts/species/tags.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kubejs/server_scripts/species/tags.js b/kubejs/server_scripts/species/tags.js index 7fa969ebb..509b6c004 100644 --- a/kubejs/server_scripts/species/tags.js +++ b/kubejs/server_scripts/species/tags.js @@ -17,4 +17,6 @@ const registerSpeciesItemTags = (event) => { event.add('forge:eggs', 'species:birt_egg') event.add('firmalife:foods/raw_eggs', 'species:birt_egg') + + event.add('species:cruncher_eats', '#tfc:foods/meat') } \ No newline at end of file From 7b559cedf1266c085ad974e8a4affe0571decb40 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 15 Aug 2025 22:04:15 +0100 Subject: [PATCH 065/158] pakku --- pakku-lock.json | 426 ++++++++++++++++-------------------------------- 1 file changed, 139 insertions(+), 287 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index 39fd6607a..11abef3a0 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -330,88 +330,6 @@ } ] }, - { - "pakku_id": "FUkrlSRxJw3vXHSa", - "pakku_links": [ - "tnanmdYAjMuu9igL", - "KXDQAyIcviU2Sjy6", - "6GwMQIiEZI9QEBDy", - "Grz0T2HLTDSCXa81", - "7KKvgCCVN5ojt885" - ], - "type": "MOD", - "side": "SERVER", - "slug": { - "curseforge": "adaptive-performance-tweaks", - "modrinth": "adaptive-performance-tweaks" - }, - "name": { - "curseforge": "Adaptive Performance Tweaks (Bundle)", - "modrinth": "Adaptive Performance Tweaks (Bundle)" - }, - "id": { - "curseforge": "450269", - "modrinth": "kLawTYXp" - }, - "files": [ - { - "type": "curseforge", - "file_name": "adaptive_performance_tweaks_1.20.1-11.3.0.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/5815/115/adaptive_performance_tweaks_1.20.1-11.3.0.jar", - "id": "5815115", - "parent_id": "450269", - "hashes": { - "sha1": "94ab2b5d35927a7f49f084d5f6e49536595265f2", - "md5": "aa1fdeef9d4904cdbd829f383ce6d5b1" - }, - "required_dependencies": [ - "563963", - "561439", - "561137", - "573708", - "561087" - ], - "size": 51871, - "date_published": "2024-10-15T20:03:16.933Z" - }, - { - "type": "modrinth", - "file_name": "adaptive_performance_tweaks_1.20.1-11.3.0.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge", - "neoforge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/kLawTYXp/versions/ePPNLu7Z/adaptive_performance_tweaks_1.20.1-11.3.0.jar", - "id": "ePPNLu7Z", - "parent_id": "kLawTYXp", - "hashes": { - "sha512": "6e785769d0cebda631f94cc7ab3306f8d233850ddf2d62ebe8d6997c2b53267f29576b5090b7126ab585b1f3b60ed544f6a54d039209bb2f53fdb0be9733beb1", - "sha1": "f868ec75ef3266af8cfa3ae6fb0048cef35bc23f" - }, - "required_dependencies": [ - "Rd89yO7d", - "jr5nzfKv", - "217PsbJI", - "L5xaBiBb", - "z3TjJLQ0" - ], - "size": 51871, - "date_published": "2024-10-15T20:02:30.798649Z" - } - ] - }, { "pakku_id": "7KKvgCCVN5ojt885", "type": "MOD", @@ -685,76 +603,6 @@ } ] }, - { - "pakku_id": "Grz0T2HLTDSCXa81", - "pakku_links": [ - "7KKvgCCVN5ojt885" - ], - "type": "MOD", - "side": "SERVER", - "slug": { - "curseforge": "adaptive-performance-tweaks-spawn", - "modrinth": "adaptive-performance-tweaks-spawn" - }, - "name": { - "curseforge": "Adaptive Performance Tweaks: Spawn", - "modrinth": "Adaptive Performance Tweaks: Spawn" - }, - "id": { - "curseforge": "573708", - "modrinth": "217PsbJI" - }, - "files": [ - { - "type": "curseforge", - "file_name": "adaptive_performance_tweaks_spawn_1.20.1-11.3.0.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/5815/121/adaptive_performance_tweaks_spawn_1.20.1-11.3.0.jar", - "id": "5815121", - "parent_id": "573708", - "hashes": { - "sha1": "a933f6adb6e7b614eeff180acb20a64b5777ef41", - "md5": "aeab7fbc8d6309ff43b197e3c407c104" - }, - "required_dependencies": [ - "561087" - ], - "size": 143593, - "date_published": "2024-10-15T20:03:31.823Z" - }, - { - "type": "modrinth", - "file_name": "adaptive_performance_tweaks_spawn_1.20.1-11.3.0.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge", - "neoforge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/217PsbJI/versions/suOxhIlo/adaptive_performance_tweaks_spawn_1.20.1-11.3.0.jar", - "id": "suOxhIlo", - "parent_id": "217PsbJI", - "hashes": { - "sha512": "dd9a2e508db6ac0f22636fd974ccf2f2e1e7de4e2740704364bb3a086ae8d933b97b6fb0306f49f89cdd5bdcbfa78202e10ef935c307a869ed8d2561da3a04fb", - "sha1": "d3f2cc11a1d37042d4c94c199f08d2e0edfa18ed" - }, - "required_dependencies": [ - "L5xaBiBb" - ], - "size": 143593, - "date_published": "2024-10-15T20:03:03.303293Z" - } - ] - }, { "pakku_id": "O7PVs47VlRBYKE7b", "type": "MOD", @@ -901,7 +749,7 @@ "files": [ { "type": "curseforge", - "file_name": "alltheleaks-0.1.4-beta+1.20.1-forge.jar", + "file_name": "alltheleaks-1.0.0+1.20.1-forge.jar", "mc_versions": [ "1.20.1" ], @@ -909,16 +757,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6482/449/alltheleaks-0.1.4-beta+1.20.1-forge.jar", - "id": "6482449", + "url": "https://edge.forgecdn.net/files/6874/194/alltheleaks-1.0.0+1.20.1-forge.jar", + "id": "6874194", "parent_id": "1091339", "hashes": { - "sha1": "31064c1cebcc90d9e914f1e17a5530385e14544d", - "md5": "bc2454a8103dbf517bb3145f4528bc25" + "sha1": "24e32ff985ceac5ef964d49b76764ed6c700ac2e", + "md5": "baa29b8a4c714ea6bbc23a6cfd36c778" }, "required_dependencies": [], - "size": 523888, - "date_published": "2025-05-01T04:32:00.873Z" + "size": 1134422, + "date_published": "2025-08-11T09:03:47.890Z" } ] }, @@ -4022,7 +3870,7 @@ "files": [ { "type": "modrinth", - "file_name": "create_hypertube-0.2.4-FORGE.jar", + "file_name": "create_hypertube-0.2.5-FORGE.jar", "mc_versions": [ "1.20.1", "1.20.2", @@ -4036,22 +3884,22 @@ "neoforge" ], "release_type": "beta", - "url": "https://cdn.modrinth.com/data/ATDdrG1y/versions/zRjvJvQr/create_hypertube-0.2.4-FORGE.jar", - "id": "zRjvJvQr", + "url": "https://cdn.modrinth.com/data/ATDdrG1y/versions/oT3tlxGs/create_hypertube-0.2.5-FORGE.jar", + "id": "oT3tlxGs", "parent_id": "ATDdrG1y", "hashes": { - "sha512": "debb83aa50948e4eca156017b3d2829c4d398e269800c651a0780c8150be1bbcd06dbf2fc2bfc58f869e2c981b5d1e8613d183687a6b6b07bd19fe326b3e08e6", - "sha1": "50e52ef50bd0b2e559d3fc52ffa7aa2ded94326c" + "sha512": "ffd47f1726bec14456a5a322e104bde942b64ea9a123d8fb3563453a7f762c580aa1732ea0917ad75714cae3fde70e16e9f38fd9952873abf205eab2dfd384ab", + "sha1": "d46bd8d5ae6ac25da9974062b0796172f698bfec" }, "required_dependencies": [ "LNytGWDc" ], - "size": 310191, - "date_published": "2025-07-23T12:37:18.369082Z" + "size": 346735, + "date_published": "2025-08-12T12:11:17.628568Z" }, { "type": "curseforge", - "file_name": "create_hypertube-0.2.4-FORGE.jar", + "file_name": "create_hypertube-0.2.5-FORGE.jar", "mc_versions": [ "1.20.1" ], @@ -4060,18 +3908,18 @@ "forge" ], "release_type": "beta", - "url": "https://edge.forgecdn.net/files/6802/739/create_hypertube-0.2.4-FORGE.jar", - "id": "6802739", + "url": "https://edge.forgecdn.net/files/6878/308/create_hypertube-0.2.5-FORGE.jar", + "id": "6878308", "parent_id": "1281336", "hashes": { - "sha1": "50e52ef50bd0b2e559d3fc52ffa7aa2ded94326c", - "md5": "916f77844a0ab19a73a1e3d56f9467d7" + "sha1": "d46bd8d5ae6ac25da9974062b0796172f698bfec", + "md5": "03784416aec9ac6193244a1b422179a7" }, "required_dependencies": [ "328085" ], - "size": 310191, - "date_published": "2025-07-23T12:33:14.783Z" + "size": 346735, + "date_published": "2025-08-12T12:05:31.173Z" } ] }, @@ -4222,30 +4070,9 @@ "modrinth": "Rw1NrDzF" }, "files": [ - { - "type": "curseforge", - "file_name": "Cucumber-1.20.1-7.0.14.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6680/445/Cucumber-1.20.1-7.0.14.jar", - "id": "6680445", - "parent_id": "272335", - "hashes": { - "sha1": "1d1f273c170dc4a2b5ff74216391838f453e536f", - "md5": "b653feea3bbf291bda7b7f2ef247758a" - }, - "required_dependencies": [], - "size": 269589, - "date_published": "2025-06-21T21:06:53.023Z" - }, { "type": "modrinth", - "file_name": "Cucumber-1.20.1-7.0.14.jar", + "file_name": "Cucumber-1.20.1-7.0.15.jar", "mc_versions": [ "1.20.1" ], @@ -4253,16 +4080,37 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/Rw1NrDzF/versions/HlbDwsPk/Cucumber-1.20.1-7.0.14.jar", - "id": "HlbDwsPk", + "url": "https://cdn.modrinth.com/data/Rw1NrDzF/versions/tHDveaxK/Cucumber-1.20.1-7.0.15.jar", + "id": "tHDveaxK", "parent_id": "Rw1NrDzF", "hashes": { - "sha512": "8b86f68b07eed47b989eefcf38f2ac8f0589b976c8ddc7b8ef00e25738e0fe1754f9d2cb0f2f287049e5da548380b95fab6f9631a55b323bcc419719d0e716ad", - "sha1": "1d1f273c170dc4a2b5ff74216391838f453e536f" + "sha512": "9ee45676c1acf8979835610e3f06163a7c69c1fcef872246f118e5dc5c387c9457736c50c7bad63e8319f4e5b75a58e731f49eeb8bfced9c92d1583b43a9afe2", + "sha1": "f376bdf46bce7d9d8cf275b05899e1abaed98c3b" }, "required_dependencies": [], - "size": 269589, - "date_published": "2025-06-21T21:06:55.448902Z" + "size": 269566, + "date_published": "2025-08-12T22:57:16.961925Z" + }, + { + "type": "curseforge", + "file_name": "Cucumber-1.20.1-7.0.15.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6880/321/Cucumber-1.20.1-7.0.15.jar", + "id": "6880321", + "parent_id": "272335", + "hashes": { + "sha1": "f376bdf46bce7d9d8cf275b05899e1abaed98c3b", + "md5": "84949e197a71b5f20a99532bd082cea6" + }, + "required_dependencies": [], + "size": 269566, + "date_published": "2025-08-12T22:57:15.407Z" } ] }, @@ -5161,7 +5009,7 @@ "files": [ { "type": "modrinth", - "file_name": "everycomp-1.20-2.8.15-forge.jar", + "file_name": "everycomp-1.20-2.8.17-forge.jar", "mc_versions": [ "1.20.1" ], @@ -5169,22 +5017,22 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/eiktJyw1/versions/oIyvoBy6/everycomp-1.20-2.8.15-forge.jar", - "id": "oIyvoBy6", + "url": "https://cdn.modrinth.com/data/eiktJyw1/versions/pztPAx2c/everycomp-1.20-2.8.17-forge.jar", + "id": "pztPAx2c", "parent_id": "eiktJyw1", "hashes": { - "sha512": "4461a1c2e767e5aa40baeb9e356289ffd7daf2100c3b7470ebbeb6d11ba979674f84234fb8d1446a2afac210bac188471404ff7da037a765f5073caebf46833b", - "sha1": "cedfb61a5ec202de8aacef40b1abab49d9936066" + "sha512": "6608da2f4ac880573c5f434c75995a3a3e917c47189d2d8570e9c3e09113ba78844b8c96510402a7d198e6cfde4502287ba771dc9940b8490cd97b5dc880a425", + "sha1": "79ab372f4b6645e3bd9ad34948a8ad3afa37fed5" }, "required_dependencies": [ "twkfQtEc" ], - "size": 2777935, - "date_published": "2025-07-30T05:01:45.107707Z" + "size": 2781819, + "date_published": "2025-08-14T08:05:13.713026Z" }, { "type": "curseforge", - "file_name": "everycomp-1.20-2.8.15-forge.jar", + "file_name": "everycomp-1.20-2.8.17-forge.jar", "mc_versions": [ "1.20.1" ], @@ -5192,18 +5040,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6827/718/everycomp-1.20-2.8.15-forge.jar", - "id": "6827718", + "url": "https://edge.forgecdn.net/files/6884/861/everycomp-1.20-2.8.17-forge.jar", + "id": "6884861", "parent_id": "628539", "hashes": { - "sha1": "cedfb61a5ec202de8aacef40b1abab49d9936066", - "md5": "12560df2919a149c357b741a257cf64a" + "sha1": "79ab372f4b6645e3bd9ad34948a8ad3afa37fed5", + "md5": "7d34a6136694fadaef8dc068e18a1455" }, "required_dependencies": [ "499980" ], - "size": 2777935, - "date_published": "2025-07-30T05:01:30.480Z" + "size": 2781819, + "date_published": "2025-08-14T08:05:03.337Z" } ] }, @@ -9092,7 +8940,7 @@ "files": [ { "type": "modrinth", - "file_name": "moonlight-1.20-2.15.6-forge.jar", + "file_name": "moonlight-1.20-2.16.1-forge.jar", "mc_versions": [ "1.20.1" ], @@ -9101,20 +8949,20 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/twkfQtEc/versions/VqBFBOg7/moonlight-1.20-2.15.6-forge.jar", - "id": "VqBFBOg7", + "url": "https://cdn.modrinth.com/data/twkfQtEc/versions/lByJnenL/moonlight-1.20-2.16.1-forge.jar", + "id": "lByJnenL", "parent_id": "twkfQtEc", "hashes": { - "sha512": "4fe8c5da1f0697a12cc453e817905d18ee039b7442ab90b0ed70ff3221ef37598ccb30eef8ada5148ee022f16ea64cbba185da58b752a6ecb4f24d2bb0300e05", - "sha1": "0ea0d478011428a02b561b24ca9db40c31b39870" + "sha512": "8a1b463c721568cdf6f197fc7aa6d3c9d11072c1f3b3d8e57402075a660b20293cab7b249654dd2c7ef34ffc88c23cda08ef78dcf0cba7b2be63a30083d45ef8", + "sha1": "17a8bbbdfd87869e7cac5ece8f3daaee380813a7" }, "required_dependencies": [], - "size": 1287123, - "date_published": "2025-08-04T09:41:41.923471Z" + "size": 1310673, + "date_published": "2025-08-15T09:47:04.798820Z" }, { "type": "curseforge", - "file_name": "moonlight-1.20-2.15.6-forge.jar", + "file_name": "moonlight-1.20-2.16.1-forge.jar", "mc_versions": [ "1.20.1" ], @@ -9123,16 +8971,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6846/127/moonlight-1.20-2.15.6-forge.jar", - "id": "6846127", + "url": "https://edge.forgecdn.net/files/6888/940/moonlight-1.20-2.16.1-forge.jar", + "id": "6888940", "parent_id": "499980", "hashes": { - "sha1": "0ea0d478011428a02b561b24ca9db40c31b39870", - "md5": "2e91dd12ddb2fc40bacb6b499568296a" + "sha1": "17a8bbbdfd87869e7cac5ece8f3daaee380813a7", + "md5": "23ef17c141597aeed404c3e483e40161" }, "required_dependencies": [], - "size": 1287123, - "date_published": "2025-08-04T09:41:35.207Z" + "size": 1310673, + "date_published": "2025-08-15T09:46:55.940Z" } ] }, @@ -11780,47 +11628,49 @@ }, "redistributable": false, "files": [ - { - "type": "curseforge", - "file_name": "species-3.4.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6744/903/species-3.4.jar", - "id": "6744903", - "parent_id": "857737", - "hashes": { - "sha1": "9a382083142bf27992fbe0836d297f89265dd24a", - "md5": "eff659ebb9c4a822f480a4c27d13a8af" - }, - "required_dependencies": [], - "size": 42101496, - "date_published": "2025-07-08T16:03:05.663Z" - }, { "type": "modrinth", - "file_name": "species-3.4.jar", + "file_name": "species-3.5.jar", "mc_versions": [ "1.20.1" ], "loaders": [ - "forge" + "forge", + "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/s5d4P01r/versions/xkMjveeZ/species-3.4.jar", - "id": "xkMjveeZ", + "url": "https://cdn.modrinth.com/data/s5d4P01r/versions/KwPDNMjG/species-3.5.jar", + "id": "KwPDNMjG", "parent_id": "s5d4P01r", "hashes": { - "sha512": "e7995bcf3a8ea07ebd2e640e03df69c9d427820a7bcf881432f82253eea31f13ce2bed549af6c0e557d39301aee422e4a4090d16e22df9a73244cdcfefd7fbe9", - "sha1": "9a382083142bf27992fbe0836d297f89265dd24a" + "sha512": "9ff8a488d3eed6950fe8eb09e3ab55e7fe65ee3340c212067e46bf98054330658e6406ad72388054f9ce00921b8d8fdeb5f28e09058c800bdf46e2e47a754a64", + "sha1": "b4d924f4faf6eb201db04205b61fa1524a8b0178" }, "required_dependencies": [], - "size": 42101496, - "date_published": "2025-07-08T16:03:37.367924Z" + "size": 42114388, + "date_published": "2025-08-14T16:26:28.693413Z" + }, + { + "type": "curseforge", + "file_name": "species-3.5.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6886/321/species-3.5.jar", + "id": "6886321", + "parent_id": "857737", + "hashes": { + "sha1": "b4d924f4faf6eb201db04205b61fa1524a8b0178", + "md5": "3fb4bc2ee270255038b08971dec18243" + }, + "required_dependencies": [], + "size": 42114388, + "date_published": "2025-08-14T16:26:07.777Z" } ] }, @@ -12895,49 +12745,51 @@ }, "files": [ { - "type": "curseforge", + "type": "modrinth", "file_name": "waterflasks-3.0.8.jar", "mc_versions": [ "1.20.1" ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/ONgsGaM9/versions/VIl9hEx7/waterflasks-3.0.8.jar", + "id": "VIl9hEx7", + "parent_id": "ONgsGaM9", + "hashes": { + "sha512": "7cc5e39ac45223a4b28387a60e0b361d777f44f34b9baa5d24a1541a0a21c0decf86146c19dbe4fcc4892048c0ca4f5a5737d09210c42f61d0e34448b3390c47", + "sha1": "6fc568609f6a182d18f8f4fac286c9bf122a486b" + }, + "required_dependencies": [ + "JaCEZUhg" + ], + "size": 939203, + "date_published": "2025-07-29T01:27:09.745095Z" + }, + { + "type": "curseforge", + "file_name": "waterflasks-3.0.9.jar", + "mc_versions": [ + "1.20.1" + ], "loaders": [ "neoforge", "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6681/183/waterflasks-3.0.8.jar", - "id": "6681183", + "url": "https://edge.forgecdn.net/files/6877/264/waterflasks-3.0.9.jar", + "id": "6877264", "parent_id": "354353", "hashes": { - "sha1": "6fc568609f6a182d18f8f4fac286c9bf122a486b", - "md5": "e71547e2b16e7d7c24c823ffec666c42" - }, - "required_dependencies": [], - "size": 939203, - "date_published": "2025-06-22T02:23:25.573Z" - }, - { - "type": "modrinth", - "file_name": "waterflasks-3.0.6.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/ONgsGaM9/versions/i7FOulRq/waterflasks-3.0.6.jar", - "id": "i7FOulRq", - "parent_id": "ONgsGaM9", - "hashes": { - "sha512": "d0e1b1646d374741c9abdf7de41c615b85e8c7d18fbb37bed46c6ddf5802ca2d52a96c999b54ac82eac77e40571b23a3dce1985973b8bfb858981fe13ef6bb3d", - "sha1": "bcb5863e29d5faedcffde83f6d5ca02486b264a4" + "sha1": "de5fec2b87cc99ff4ff73fac1e7e479c64478820", + "md5": "da255c51c7356b95a1ace27e2c3c559a" }, "required_dependencies": [ - "JaCEZUhg" + "302973" ], - "size": 933206, - "date_published": "2025-01-19T23:31:12.024095Z" + "size": 943232, + "date_published": "2025-08-12T03:42:03.923Z" } ] }, From aad81501af730581c7ff23b2311ebd144a33e212 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 15 Aug 2025 22:14:31 +0100 Subject: [PATCH 066/158] update forge --- pakku-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pakku-lock.json b/pakku-lock.json index 11abef3a0..ce9c2e3f9 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -4,7 +4,7 @@ "1.20.1" ], "loaders": { - "forge": "47.4.2" + "forge": "47.4.6" }, "projects": [ { From 03106270e12b76ed9e989bce7de79a8ee8e8cc26 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Fri, 15 Aug 2025 16:45:09 -0500 Subject: [PATCH 067/158] Feature/wan creatures and stuff (#1633) * whitespace changes * some animal compat * snifferified recipes * nest box recipe * tag stuff * spawn stuff * tooltip * wan config * foods * loot tables * Update pakku-lock.json * Update wan_ancient_beasts-server.toml Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Update tags.js Signed-off-by: Pyritie --------- Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> Signed-off-by: Pyritie Co-authored-by: Pyritie --- defaultconfigs/wan_ancient_beasts-server.toml | 76 ++++++++++ .../item/food/cooked_crusher_meat.png | Bin 0 -> 747 bytes .../item/food/cooked_glider_wings.png | Bin 0 -> 703 bytes .../textures/item/food/cooked_goober_meat.png | Bin 0 -> 885 bytes .../item/food/cooked_springling_chops.png | Bin 0 -> 673 bytes .../item/food/cooked_walker_steak.png | Bin 0 -> 889 bytes .../item/food/cooked_whole_soarer.png | Bin 0 -> 912 bytes .../tfg/textures/item/food/cooked_wraptor.png | Bin 0 -> 697 bytes .../textures/item/food/raw_crusher_meat.png | Bin 0 -> 756 bytes .../textures/item/food/raw_glider_wings.png | Bin 0 -> 719 bytes .../textures/item/food/raw_goober_meat.png | Bin 0 -> 959 bytes .../item/food/raw_springling_chops.png | Bin 0 -> 797 bytes .../textures/item/food/raw_walker_steak.png | Bin 0 -> 902 bytes .../textures/item/food/raw_whole_soarer.png | Bin 0 -> 907 bytes .../tfg/textures/item/food/raw_wraptor.png | Bin 0 -> 870 bytes kubejs/client_scripts/tooltips.js | 5 + .../species/loot_tables/entities/goober.json | 65 +++++++++ .../loot_tables/entities/springling.json | 65 +++++++++ .../tfg/worldgen/biome/mars/amber_hills.json | 24 +++- .../tfg/worldgen/biome/mars/amber_plains.json | 24 +++- .../biome/mars/martian_dune_edge.json | 22 ++- .../worldgen/biome/mars/rusticus_hills.json | 24 +++- .../worldgen/biome/mars/rusticus_plains.json | 24 +++- .../worldgen/biome/mars/sangnum_hills.json | 30 +++- .../worldgen/biome/mars/sangnum_plains.json | 30 +++- .../loot_tables/entities/crusher.json | 65 +++++++++ .../loot_tables/entities/glider.json | 66 +++++++++ .../loot_tables/entities/soarer.json | 66 +++++++++ .../loot_tables/entities/walker.json | 45 ++++++ kubejs/server_scripts/ad_astra/tags.js | 15 +- kubejs/server_scripts/species/tags.js | 10 +- kubejs/server_scripts/tfg/data.js | 99 ++++++++++++- kubejs/server_scripts/tfg/recipes.food.js | 21 +++ kubejs/startup_scripts/species/constants.js | 2 - kubejs/startup_scripts/tfg/items.food.js | 134 ++++++++++++++++-- pakku-lock.json | 66 +++++++++ 36 files changed, 932 insertions(+), 46 deletions(-) create mode 100644 defaultconfigs/wan_ancient_beasts-server.toml create mode 100644 kubejs/assets/tfg/textures/item/food/cooked_crusher_meat.png create mode 100644 kubejs/assets/tfg/textures/item/food/cooked_glider_wings.png create mode 100644 kubejs/assets/tfg/textures/item/food/cooked_goober_meat.png create mode 100644 kubejs/assets/tfg/textures/item/food/cooked_springling_chops.png create mode 100644 kubejs/assets/tfg/textures/item/food/cooked_walker_steak.png create mode 100644 kubejs/assets/tfg/textures/item/food/cooked_whole_soarer.png create mode 100644 kubejs/assets/tfg/textures/item/food/cooked_wraptor.png create mode 100644 kubejs/assets/tfg/textures/item/food/raw_crusher_meat.png create mode 100644 kubejs/assets/tfg/textures/item/food/raw_glider_wings.png create mode 100644 kubejs/assets/tfg/textures/item/food/raw_goober_meat.png create mode 100644 kubejs/assets/tfg/textures/item/food/raw_springling_chops.png create mode 100644 kubejs/assets/tfg/textures/item/food/raw_walker_steak.png create mode 100644 kubejs/assets/tfg/textures/item/food/raw_whole_soarer.png create mode 100644 kubejs/assets/tfg/textures/item/food/raw_wraptor.png create mode 100644 kubejs/data/species/loot_tables/entities/goober.json create mode 100644 kubejs/data/species/loot_tables/entities/springling.json create mode 100644 kubejs/data/wan_ancient_beasts/loot_tables/entities/crusher.json create mode 100644 kubejs/data/wan_ancient_beasts/loot_tables/entities/glider.json create mode 100644 kubejs/data/wan_ancient_beasts/loot_tables/entities/soarer.json create mode 100644 kubejs/data/wan_ancient_beasts/loot_tables/entities/walker.json diff --git a/defaultconfigs/wan_ancient_beasts-server.toml b/defaultconfigs/wan_ancient_beasts-server.toml new file mode 100644 index 000000000..f33c39ee8 --- /dev/null +++ b/defaultconfigs/wan_ancient_beasts-server.toml @@ -0,0 +1,76 @@ + +#Sniffer Attributes +[sniffer] + #Sniffer health [default: 75] + #Range: 1.0 ~ 1024.0 + health = 75.0 + #Sniffer armor [default: 3] + #Range: 0.0 ~ 30.0 + armor = 3.0 + #Sniffer armor toughness [default: 1] + #Range: 0.0 ~ 20.0 + armorToughness = 1.0 + +#Eater Attributes +[eater] + #Eater health [default: 100] + #Range: 1.0 ~ 1024.0 + health = 200.0 + #Eater attack damage [default: 30] + #Range: 0.0 ~ 1024.0 + damage = 30.0 + #Eater armor [default: 5] + #Range: 0.0 ~ 30.0 + armor = 8.0 + #Eater armor toughness [default: 2] + #Range: 0.0 ~ 20.0 + armorToughness = 3.0 + +#Walker Attributes +[walker] + #Walker health [default: 200] + #Range: 1.0 ~ 1024.0 + health = 400.0 + #Walker armor [default: 5] + #Range: 0.0 ~ 30.0 + armor = 14.0 + #Walker armor toughness [default: 4] + #Range: 0.0 ~ 20.0 + armorToughness = 4.0 + +#Crusher Attributes +[crusher] + #Crusher health [default: 50] + #Range: 1.0 ~ 1024.0 + health = 100.0 + #Crusher attack damage [default: 10] + #Range: 0.0 ~ 1024.0 + damage = 10.0 + #Crusher armor [default: 20] + #Range: 0.0 ~ 30.0 + armor = 25.0 + #Crusher armor toughness [default: 4] + #Range: 0.0 ~ 20.0 + armorToughness = 5.0 + +#Glider Attributes +[glider] + #Glider health [default: 25] + #Range: 1.0 ~ 1024.0 + health = 50.0 + +#Soarer Attributes +[soarer] + #Soarer health [default: 40] + #Range: 1.0 ~ 1024.0 + health = 80.0 + #Soarer attack damage [default: 15] + #Range: 0.0 ~ 1024.0 + damage = 25.0 + +#Surfer Attributes +[surfer] + #Surfer health [default: 30] + #Range: 1.0 ~ 1024.0 + health = 30.0 + diff --git a/kubejs/assets/tfg/textures/item/food/cooked_crusher_meat.png b/kubejs/assets/tfg/textures/item/food/cooked_crusher_meat.png new file mode 100644 index 0000000000000000000000000000000000000000..5b055d9343f2b5b46db89026f5d9827068c21a5c GIT binary patch literal 747 zcmVEX>4Tx04R}tkv&MmKpe$iQ^g{c4(%W!n4vn^MMWG-6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|E;uQ=NQwVT3N2zhIPS;0dyl(!fY7Qj)$EG{s%9CP zWJ1grR>gr=1Q0?PV~9%3)Kl5T96ZO@J$!t)R&;^Mfxh}i>#<}dUz%wI8E;COYAr{L$EcY<07%K4$aa2(?$`|r3 zE1b7DtF;E}+>^gBSkzXsT&FpTB$kju8X{ygP(=+EVzg?cn8?t6!oxq}_|xQ)$yEg- z#{%k5Avu2VKlt6PS(=`5lY$AL|HZaH#({xdpxw0X?_=9;p8)=6;7aTI>n&jJlk{d+ ziyi@?ZQ$a%tI2!7A(Ki)<@GUU7=JwXv$LRx*qpp^3fP+I| zqD^}4zqXDn& z697=wDsUP|K~89M;H-n{cmRd5eY=6DpcA4Lq_Z@!A^E`07?;A%7^NW1;}rmS!5<|B d>FIy}sb2FNfwo{p=#BsY002ovPDHLkV1hXYMl=8b literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/food/cooked_glider_wings.png b/kubejs/assets/tfg/textures/item/food/cooked_glider_wings.png new file mode 100644 index 0000000000000000000000000000000000000000..003a47b08c0952264d2eef1a63427ba03fa9d83b GIT binary patch literal 703 zcmV;w0zmzVP)EX>4Tx04R}tkv&MmKpe$iQ^g{c4(%W!n4vn^MMWG-6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|E;uQ=NQwVT3N2zhIPS;0dyl(!fY7Qj)$EG{s%9CP zWJ1grR>gr=1Q0?PV~9%3)Kl5T96ZO@J$!t)R&;^Mfxh}i>#<}dUz%wI8E;COYAr{L$EcY<07%K4$aa2(?$`|r3 zE1b7DtF;E}+>^gBSkzXsT&FpTB$kju8X{ygP(=+EVzg?cn8?t6!oxq}_|xQ)$yEg- z#{%k5Avu2VKlt6PS(=`5lY$AL|HZaH#({xdpxw0X?_=9;p8)=6;7aTI>n&jJlk{d+ ziyi@?ZQ$a%tI2!7A(Ki)<@GUU7=JwXv$LRx*qpp^3fP+I| zqDRAYB zc5-oLV3Cz%a1s$?U|?YQk8TJPAs4X7O2XL}F5kwGXCmZu1_lO(KaZa?ynFMC_%MKJ z7J@jN;oX~83=0;oVc7ic3vpp^;qq+;Cl^EX>4Tx04R}tkv&MmKpe$iQ^g{c4(%W!n4vn^MMWG-6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|E;uQ=NQwVT3N2zhIPS;0dyl(!fY7Qj)$EG{s%9CP zWJ1grR>gr=1Q0?PV~9%3)Kl5T96ZO@J$!t)R&;^Mfxh}i>#<}dUz%wI8E;COYAr{L$EcY<07%K4$aa2(?$`|r3 zE1b7DtF;E}+>^gBSkzXsT&FpTB$kju8X{ygP(=+EVzg?cn8?t6!oxq}_|xQ)$yEg- z#{%k5Avu2VKlt6PS(=`5lY$AL|HZaH#({xdpxw0X?_=9;p8)=6;7aTI>n&jJlk{d+ ziyi@?ZQ$a%tI2!7A(Ki)<@GUU7=JwXv$LRx*qpp^3fP+I| zqD@C z3{DSvan6rLD+}W+U(8d_WF12{)<^xWEO5 zg%d^9a{W^C+Ip-Hcpuo>+XLwdI2tR+wIWXwrd{CTt`bWt3=1b_M$<0Pbb*JPD-Ms2 z85o7a(pkrI?Y<`d_6LhN*-j(C_L^DB&xFImi60HV8!ci{{5S9cb!nSdozUxs00000 LNkvXXu0mjfg-e0R literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/food/cooked_springling_chops.png b/kubejs/assets/tfg/textures/item/food/cooked_springling_chops.png new file mode 100644 index 0000000000000000000000000000000000000000..4affb689b111d92c52a981c8b90a207c627509fd GIT binary patch literal 673 zcmV;S0$%-zP)EX>4Tx04R}tkv&MmKpe$iQ^g{c4(%W!n4vn^MMWG-6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|E;uQ=NQwVT3N2zhIPS;0dyl(!fY7Qj)$EG{s%9CP zWJ1grR>gr=1Q0?PV~9%3)Kl5T96ZO@J$!t)R&;^Mfxh}i>#<}dUz%wI8E;COYAr{L$EcY<07%K4$aa2(?$`|r3 zE1b7DtF;E}+>^gBSkzXsT&FpTB$kju8X{ygP(=+EVzg?cn8?t6!oxq}_|xQ)$yEg- z#{%k5Avu2VKlt6PS(=`5lY$AL|HZaH#({xdpxw0X?_=9;p8)=6;7aTI>n&jJlk{d+ ziyi@?ZQ$a%tI2!7A(Ki)<@GUU7=JwXv$LRx*qpp^3fP+I| zqDL;#2d9Y_EG010qNS#tmYE+YT{E+YYWr9XB6 z000McNliru=?D)LBqQA{AO!#b02y>eSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2! zfese{002=*L_t&t*JEJ73Ye6j3^g+ah(KycB19n6)DbL@Vq)wp02XjIF#EX>4Tx04R}tkv&MmKpe$iQ^g{c4(%W!n4vn^MMWG-6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|E;uQ=NQwVT3N2zhIPS;0dyl(!fY7Qj)$EG{s%9CP zWJ1grR>gr=1Q0?PV~9%3)Kl5T96ZO@J$!t)R&;^Mfxh}i>#<}dUz%wI8E;COYAr{L$EcY<07%K4$aa2(?$`|r3 zE1b7DtF;E}+>^gBSkzXsT&FpTB$kju8X{ygP(=+EVzg?cn8?t6!oxq}_|xQ)$yEg- z#{%k5Avu2VKlt6PS(=`5lY$AL|HZaH#({xdpxw0X?_=9;p8)=6;7aTI>n&jJlk{d+ ziyi@?ZQ$a%tI2!7A(Ki)<@GUU7=JwXv$LRx*qpp^3fP+I| zqD;M1&8FWQhbVF}#ZDnqB07G(RVRU6= zAa`kWXdp*PO;A^X4i^9b0a8gsK~y-)t&_h_0znXmzuo2dcL|NP(P(?mz#C9dK`AE0 z1ZXJ1Kq49`Yz>V@YbxJ>@B~z}8jZE3+y%T_i_0zGVKC}cyR-Yv%x`8F{%GQ>qv$w# z8}u-pij4t^j-!)_aBU^y;9?H*kM%(EJJ?c!oUO1_m_v%tZ)YL82OwABRB8z?e2wb` z0OV|ik^(7~3Ce{$047#cvZVx>v;;38la{z%fa?YLfhN$M|LPDfI_pO+sYtUMFmpuT9wtU(>8tXx1w+*i515INHvJ<+pns z-kx6>+}@*PxSx#105LcwA%d@O?y!_J@Fs9gLb;IVeFkTzJ$CkYv6STG_-HF^0+jj# z5sl@tdyXIIA3x=_CN`=SGp=9#g<-3v_YMvL%&fObh#d}FHIsiE{4e$ipiqK(OSmfa P00000NkvXXu0mjfuX~7V literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/food/cooked_whole_soarer.png b/kubejs/assets/tfg/textures/item/food/cooked_whole_soarer.png new file mode 100644 index 0000000000000000000000000000000000000000..5004b8e779c6bd7cc9d473e9ae38cb98321ca33f GIT binary patch literal 912 zcmV;B18@9^P)EX>4Tx04R}tkv&MmKpe$iQ^g{c4(%W!n4vn^MMWG-6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|E;uQ=NQwVT3N2zhIPS;0dyl(!fY7Qj)$EG{s%9CP zWJ1grR>gr=1Q0?PV~9%3)Kl5T96ZO@J$!t)R&;^Mfxh}i>#<}dUz%wI8E;COYAr{L$EcY<07%K4$aa2(?$`|r3 zE1b7DtF;E}+>^gBSkzXsT&FpTB$kju8X{ygP(=+EVzg?cn8?t6!oxq}_|xQ)$yEg- z#{%k5Avu2VKlt6PS(=`5lY$AL|HZaH#({xdpxw0X?_=9;p8)=6;7aTI>n&jJlk{d+ ziyi@?ZQ$a%tI2!7A(Ki)<@GUU7=JwXv$LRx*qpp^3fP+I| zqD!#myPkbJ;jZJBY(ms+Y`}D_M!KY@4r;`HZ6C{`+*om}I5_=%W&e0l*eM@|si0jL-9`hLHuJy&YamHPAI me2dOuQ`ZamEX>4Tx04R}tkv&MmKpe$iQ^g{c4(%W!n4vn^MMWG-6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|E;uQ=NQwVT3N2zhIPS;0dyl(!fY7Qj)$EG{s%9CP zWJ1grR>gr=1Q0?PV~9%3)Kl5T96ZO@J$!t)R&;^Mfxh}i>#<}dUz%wI8E;COYAr{L$EcY<07%K4$aa2(?$`|r3 zE1b7DtF;E}+>^gBSkzXsT&FpTB$kju8X{ygP(=+EVzg?cn8?t6!oxq}_|xQ)$yEg- z#{%k5Avu2VKlt6PS(=`5lY$AL|HZaH#({xdpxw0X?_=9;p8)=6;7aTI>n&jJlk{d+ ziyi@?ZQ$a%tI2!7A(Ki)<@GUU7=JwXv$LRx*qpp^3fP+I| zqD_C zX>@2HM@dakSAh-}0001BNklEX>4Tx04R}tkv&MmKpe$iQ^g{c4(%W!n4vn^MMWG-6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|E;uQ=NQwVT3N2zhIPS;0dyl(!fY7Qj)$EG{s%9CP zWJ1grR>gr=1Q0?PV~9%3)Kl5T96ZO@J$!t)R&;^Mfxh}i>#<}dUz%wI8E;COYAr{L$EcY<07%K4$aa2(?$`|r3 zE1b7DtF;E}+>^gBSkzXsT&FpTB$kju8X{ygP(=+EVzg?cn8?t6!oxq}_|xQ)$yEg- z#{%k5Avu2VKlt6PS(=`5lY$AL|HZaH#({xdpxw0X?_=9;p8)=6;7aTI>n&jJlk{d+ ziyi@?ZQ$a%tI2!7A(Ki)<@GUU7=JwXv$LRx*qpp^3fP+I| zqDxuE>EA zXt*@ubivMzYZ$~i`Qd(tX-3zG5s2xE9RF>V#o&QNjAo2zBvms;G^Q(Z{8td-Vqjok mAWAbEX>4Tx04R}tkv&MmKpe$iQ^g{c4(%W!n4vn^MMWG-6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|E;uQ=NQwVT3N2zhIPS;0dyl(!fY7Qj)$EG{s%9CP zWJ1grR>gr=1Q0?PV~9%3)Kl5T96ZO@J$!t)R&;^Mfxh}i>#<}dUz%wI8E;COYAr{L$EcY<07%K4$aa2(?$`|r3 zE1b7DtF;E}+>^gBSkzXsT&FpTB$kju8X{ygP(=+EVzg?cn8?t6!oxq}_|xQ)$yEg- z#{%k5Avu2VKlt6PS(=`5lY$AL|HZaH#({xdpxw0X?_=9;p8)=6;7aTI>n&jJlk{d+ ziyi@?ZQ$a%tI2!7A(Ki)<@GUU7=JwXv$LRx*qpp^3fP+I| zqD%EQE$y9`@Ut2B$yH?SHsD}U)PEg40|o{L28MrE zE;D?1`-=E5fN2&G7Gq#wU|{(0_7%g@m75sywjaSz&w|Z>i`O49*f_c|e0ckc;mV~8 z3>U9I!m1gk3w|D%^?zpTA~+wHW(HiEM^iUx003e~LnjrL<2wKV002ovPDHLkV1kon BHhlm9 literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/food/raw_goober_meat.png b/kubejs/assets/tfg/textures/item/food/raw_goober_meat.png new file mode 100644 index 0000000000000000000000000000000000000000..5c7a8e9375c33c67ac1cf2aeba5f2cc6862c2149 GIT binary patch literal 959 zcmV;w13>(VP)EX>4Tx04R}tkv&MmKpe$iQ^g{c4(%W!n4vn^MMWG-6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|E;uQ=NQwVT3N2zhIPS;0dyl(!fY7Qj)$EG{s%9CP zWJ1grR>gr=1Q0?PV~9%3)Kl5T96ZO@J$!t)R&;^Mfxh}i>#<}dUz%wI8E;COYAr{L$EcY<07%K4$aa2(?$`|r3 zE1b7DtF;E}+>^gBSkzXsT&FpTB$kju8X{ygP(=+EVzg?cn8?t6!oxq}_|xQ)$yEg- z#{%k5Avu2VKlt6PS(=`5lY$AL|HZaH#({xdpxw0X?_=9;p8)=6;7aTI>n&jJlk{d+ ziyi@?ZQ$a%tI2!7A(Ki)<@GUU7=JwXv$LRx*qpp^3fP+I| zqDFbVOdNk}wwNHY|viV9tX zj;-L}7f_^Qq2Hie>EtH}ICgNBF72v%Ab(;4;P{F+TW2vR`ydeu z7dKj>&!Al?0-&Lh)iuhU-vG$V4giChG@U{YCkUz94ttp-OCJwJ0>JhZkqXh!2nn$~ zmjIXVhF~z0CZ8#AXr!5c{(_JYofJk>0uW~^nHGWah*ZdkbJMQ1B|0ezsU#X2^|eoo zJ{jl0(Bn}O01es2_7o-4qGVe5p2eY&X2>X0NG0jG9#z``U~hk${PAhO!Sd0SXvi)* z<^}u39FDK3wI!1?FZq)632=pUQN7T`LH8iKOTqxs=$W&#_(kTfVJDix=sAYA^iEX>4Tx04R}tkv&MmKpe$iQ^g{c4(%W!n4vn^MMWG-6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|E;uQ=NQwVT3N2zhIPS;0dyl(!fY7Qj)$EG{s%9CP zWJ1grR>gr=1Q0?PV~9%3)Kl5T96ZO@J$!t)R&;^Mfxh}i>#<}dUz%wI8E;COYAr{L$EcY<07%K4$aa2(?$`|r3 zE1b7DtF;E}+>^gBSkzXsT&FpTB$kju8X{ygP(=+EVzg?cn8?t6!oxq}_|xQ)$yEg- z#{%k5Avu2VKlt6PS(=`5lY$AL|HZaH#({xdpxw0X?_=9;p8)=6;7aTI>n&jJlk{d+ ziyi@?ZQ$a%tI2!7A(Ki)<@GUU7=JwXv$LRx*qpp^3fP+I| zqDEo-Qjmw2ZgEtScs_=l$S@=*~xPPOnad!0^w7mx*))^TOC}2 z3srSi4V(7%TE=L&wbB)s9lo8TI{|rlB%Ga%=dxNW;K0r^uEKHiJfC2OUIVZG1M`>N b0`E3|>QI=AKbTgg00000NkvXXu0mjfw>Vnm literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/food/raw_walker_steak.png b/kubejs/assets/tfg/textures/item/food/raw_walker_steak.png new file mode 100644 index 0000000000000000000000000000000000000000..3c76c356e921d158628c6f1c379549cd1ef57e4d GIT binary patch literal 902 zcmV;119|+3P)EX>4Tx04R}tkv&MmKpe$iQ^g{c4(%W!n4vn^MMWG-6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|E;uQ=NQwVT3N2zhIPS;0dyl(!fY7Qj)$EG{s%9CP zWJ1grR>gr=1Q0?PV~9%3)Kl5T96ZO@J$!t)R&;^Mfxh}i>#<}dUz%wI8E;COYAr{L$EcY<07%K4$aa2(?$`|r3 zE1b7DtF;E}+>^gBSkzXsT&FpTB$kju8X{ygP(=+EVzg?cn8?t6!oxq}_|xQ)$yEg- z#{%k5Avu2VKlt6PS(=`5lY$AL|HZaH#({xdpxw0X?_=9;p8)=6;7aTI>n&jJlk{d+ ziyi@?ZQ$a%tI2!7A(Ki)<@GUU7=JwXv$LRx*qpp^3fP+I| zqDZ6AQf%{imNkaDZ5L<&@UO*+K}j_Z-nn%I7T<9Zxk z)B)DuFog=aS;mkUdYWpl$@u<}>yr+e6jXanMuQ>18XV~$3XTF-QYcs@#*R;?*dVjB zjV1;AXUDN{C{S*7l|?Ln^8f$<07*qoM6N<$g4Y3tDgXcg literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/food/raw_whole_soarer.png b/kubejs/assets/tfg/textures/item/food/raw_whole_soarer.png new file mode 100644 index 0000000000000000000000000000000000000000..513b7c78140401bce1f9e365f799391f1d516c09 GIT binary patch literal 907 zcmV;619bd}P)EX>4Tx04R}tkv&MmKpe$iQ^g{c4(%W!n4vn^MMWG-6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|E;uQ=NQwVT3N2zhIPS;0dyl(!fY7Qj)$EG{s%9CP zWJ1grR>gr=1Q0?PV~9%3)Kl5T96ZO@J$!t)R&;^Mfxh}i>#<}dUz%wI8E;COYAr{L$EcY<07%K4$aa2(?$`|r3 zE1b7DtF;E}+>^gBSkzXsT&FpTB$kju8X{ygP(=+EVzg?cn8?t6!oxq}_|xQ)$yEg- z#{%k5Avu2VKlt6PS(=`5lY$AL|HZaH#({xdpxw0X?_=9;p8)=6;7aTI>n&jJlk{d+ ziyi@?ZQ$a%tI2!7A(Ki)<@GUU7=JwXv$LRx*qpp^3fP+I| zqD*z!9E8`G}cr>@NDN@&bjB_`{0j| ziVBWxiLY<#hZoYX3>@1Mnr;w8F#t8CN)W{)Q8-~zDoPMUF*T)%zN+DSJ(4IyR#c9* zOffY<+I@bZN@=!2x7{M;qhXBi_2@qb>~>rUVCK8-shFk353bdz0CE(=b1;1b@5#^c z(J*H04*<|tH41m&*p@IiHc6rofbQ`DvZCU9y`0HsOpGuZzHh$UZeeb0Qqt;-{Q>Un z4YHzgfA_%7-Zr}(H=iI~p6~UL74^NS)iYyFH?m}9vmw2>O_4KLF_cW4L?N1P05J9k z-)_HbHu6`PTVA1m`N-O*OQhoSt2RI;o hpJlwT>rYAk4R23>p^t+ttd#%&002ovPDHLkV1iuhm?!`M literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/food/raw_wraptor.png b/kubejs/assets/tfg/textures/item/food/raw_wraptor.png new file mode 100644 index 0000000000000000000000000000000000000000..06b3618f7f13c260faaa7e1dfd37336317b16ae3 GIT binary patch literal 870 zcmV-s1DX7ZP)EX>4Tx04R}tkv&MmKpe$iQ^g{c4(%W!n4vn^MMWG-6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|E;uQ=NQwVT3N2zhIPS;0dyl(!fY7Qj)$EG{s%9CP zWJ1grR>gr=1Q0?PV~9%3)Kl5T96ZO@J$!t)R&;^Mfxh}i>#<}dUz%wI8E;COYAr{L$EcY<07%K4$aa2(?$`|r3 zE1b7DtF;E}+>^gBSkzXsT&FpTB$kju8X{ygP(=+EVzg?cn8?t6!oxq}_|xQ)$yEg- z#{%k5Avu2VKlt6PS(=`5lY$AL|HZaH#({xdpxw0X?_=9;p8)=6;7aTI>n&jJlk{d+ ziyi@?ZQ$a%tI2!7A(Ki)<@GUU7=JwXv$LRx*qpp^3fP+I| zqDgCCM0Rnx_G9`J@+~9`MR*j2EDEv z^tv+3pW6p3q5^>L&H*^Nxs5UTeXyY)qm>1UsGx`nR;Lxqrnn2%$^rnjBr>xsW;wL7 zKrIPW-2|X8o3i#-oS&Tn$m^%qTxtn}URUZyJq80P+93tyU`r^q2T2&fpG{NC$tTqt z%{C+FI|QQe+F$*x2f@gOk9Xl2pwVpOE#34z2-Ll$i!=HR0aZ8goUicS9#04wxK%>% zC|I7L52|ivjxsEvTGMds4eYyfbfdlr`m285e+G!D#{#HFRqTf$wa6r*a1zY?3s$Ek wFRw0me|y0mPf}HP+Tx=xtxiiOcmCh(2b5-tH!wUP0ssI207*qoM6N<$f|LDxzW@LL literal 0 HcmV?d00001 diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 7f731e842..538e8d9cf 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -122,6 +122,11 @@ const registerTooltips = (event) => { text.add(1, text.of('Massive structure producing from §616384 to 65536 EU/t§r on the §6moon§r during the §6day§r')) }) + // Mars Animals + event.addAdvanced(['species:petrified_egg'], (item, advanced, text) => { + text.add(1, text.of("§7Requires Magma to Incubate")) + }) + // MEGA Deprecated 0.10 event.addAdvanced(['#megacells:mega_interface'], (item, advanced, text) => { text.add(1, text.of('§cDeprecated, cannot be crafted any more')) diff --git a/kubejs/data/species/loot_tables/entities/goober.json b/kubejs/data/species/loot_tables/entities/goober.json new file mode 100644 index 000000000..49b61e5fb --- /dev/null +++ b/kubejs/data/species/loot_tables/entities/goober.json @@ -0,0 +1,65 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_goober_meat", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2, + "max": 8 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 5, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:slimeball", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 3, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/species/loot_tables/entities/springling.json b/kubejs/data/species/loot_tables/entities/springling.json new file mode 100644 index 000000000..ac522db86 --- /dev/null +++ b/kubejs/data/species/loot_tables/entities/springling.json @@ -0,0 +1,65 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_springling_chops", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2, + "max": 6 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 3, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "gtceu:copper_spring", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 1, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index b22f94060..7f263b9e5 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -75,22 +75,40 @@ "axolotls": [], "creature": [ { - "type": "minecraft:sniffer", + "type": "tfg:sniffer", "maxCount": 3, "minCount": 1, "weight": 100 }, { "type": "species:wraptor", - "maxCount": 3, + "maxCount": 4, "minCount": 1, "weight": 100 }, + { + "type": "wan_ancient_beasts:crusher", + "maxCount": 5, + "minCount": 1, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 4, + "minCount": 1, + "weight": 30 + }, + { + "type": "wan_ancient_beasts:soarer", + "maxCount": 2, + "minCount": 1, + "weight": 10 + }, { "type": "species:springling", "maxCount": 3, "minCount": 1, - "weight": 100 + "weight": 20 } ], "misc": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index 5dc37ca8c..91ff2bae8 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -70,26 +70,38 @@ "axolotls": [], "creature": [ { - "type": "minecraft:sniffer", + "type": "tfg:sniffer", "maxCount": 3, "minCount": 1, "weight": 100 }, { "type": "species:wraptor", - "maxCount": 3, + "maxCount": 4, "minCount": 1, "weight": 100 }, { - "type": "species:goober", - "maxCount": 1, + "type": "wan_ancient_beasts:walker", + "maxCount": 4, "minCount": 1, "weight": 100 }, { - "type": "species:springling", - "maxCount": 1, + "type": "wan_ancient_beasts:crusher", + "maxCount": 5, + "minCount": 1, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 2, + "minCount": 1, + "weight": 20 + }, + { + "type": "tfg:glacian_ram", + "maxCount": 6, "minCount": 1, "weight": 100 } diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json index 5daa5d6c7..ecb2113ef 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -71,7 +71,27 @@ "spawners": { "ambient": [], "axolotls": [], - "creature": [], + "creature": [ + { + "type": "species:goober", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:crusher", + "maxCount": 2, + "minCount": 1, + "weight": 80 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 2, + "minCount": 1, + "weight": 50 + } + + ], "misc": [], "monster": [ { diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 9ee67959f..669b61600 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -75,8 +75,8 @@ "axolotls": [], "creature": [ { - "type": "minecraft:sniffer", - "maxCount": 3, + "type": "tfg:sniffer", + "maxCount": 4, "minCount": 1, "weight": 100 }, @@ -87,9 +87,27 @@ "weight": 100 }, { - "type": "species:springling", + "type": "wan_ancient_beasts:crusher", "maxCount": 3, "minCount": 1, + "weight": 20 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 4, + "minCount": 1, + "weight": 30 + }, + { + "type": "wan_ancient_beasts:soarer", + "maxCount": 2, + "minCount": 1, + "weight": 20 + }, + { + "type": "species:springling", + "maxCount": 5, + "minCount": 2, "weight": 100 } ], diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index 664b6f5c0..2f6d5f406 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -70,8 +70,8 @@ "axolotls": [], "creature": [ { - "type": "minecraft:sniffer", - "maxCount": 3, + "type": "tfg:sniffer", + "maxCount": 4, "minCount": 1, "weight": 100 }, @@ -82,14 +82,26 @@ "weight": 100 }, { - "type": "species:goober", - "maxCount": 1, + "type": "wan_ancient_beasts:walker", + "maxCount": 3, "minCount": 1, "weight": 100 }, { - "type": "species:springling", - "maxCount": 1, + "type": "wan_ancient_beasts:crusher", + "maxCount": 4, + "minCount": 1, + "weight": 20 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 2, + "minCount": 1, + "weight": 20 + }, + { + "type": "tfg:glacian_ram", + "maxCount": 6, "minCount": 1, "weight": 100 } diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index c35dadb41..952b80678 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -75,17 +75,41 @@ "axolotls": [], "creature": [ { - "type": "minecraft:sniffer", - "maxCount": 3, + "type": "tfg:sniffer", + "maxCount": 4, "minCount": 1, "weight": 100 }, { "type": "species:wraptor", - "maxCount": 3, + "maxCount": 4, "minCount": 1, "weight": 100 }, + { + "type": "wan_ancient_beasts:crusher", + "maxCount": 3, + "minCount": 1, + "weight": 20 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 4, + "minCount": 1, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:soarer", + "maxCount": 2, + "minCount": 1, + "weight": 40 + }, + { + "type": "species:goober", + "maxCount": 1, + "minCount": 1, + "weight": 50 + }, { "type": "species:springling", "maxCount": 3, diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index 49e9656fd..f6d77a5ac 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -70,14 +70,32 @@ "axolotls": [], "creature": [ { - "type": "minecraft:sniffer", - "maxCount": 3, + "type": "tfg:sniffer", + "maxCount": 4, "minCount": 1, "weight": 100 }, { "type": "species:wraptor", - "maxCount": 3, + "maxCount": 4, + "minCount": 1, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:walker", + "maxCount": 5, + "minCount": 1, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:crusher", + "maxCount": 4, + "minCount": 1, + "weight": 20 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 2, "minCount": 1, "weight": 100 }, @@ -85,11 +103,11 @@ "type": "species:goober", "maxCount": 1, "minCount": 1, - "weight": 100 + "weight": 50 }, { - "type": "species:springling", - "maxCount": 1, + "type": "tfg:glacian_ram", + "maxCount": 6, "minCount": 1, "weight": 100 } diff --git a/kubejs/data/wan_ancient_beasts/loot_tables/entities/crusher.json b/kubejs/data/wan_ancient_beasts/loot_tables/entities/crusher.json new file mode 100644 index 000000000..41865f871 --- /dev/null +++ b/kubejs/data/wan_ancient_beasts/loot_tables/entities/crusher.json @@ -0,0 +1,65 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_crusher_meat", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2, + "max": 5 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 3, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:crusher_spike", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 2, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/wan_ancient_beasts/loot_tables/entities/glider.json b/kubejs/data/wan_ancient_beasts/loot_tables/entities/glider.json new file mode 100644 index 000000000..90570f5b2 --- /dev/null +++ b/kubejs/data/wan_ancient_beasts/loot_tables/entities/glider.json @@ -0,0 +1,66 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_glider_wings", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2, + "max": 6 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 2, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + , + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:glider_feather", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 2, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/wan_ancient_beasts/loot_tables/entities/soarer.json b/kubejs/data/wan_ancient_beasts/loot_tables/entities/soarer.json new file mode 100644 index 000000000..2499bd85b --- /dev/null +++ b/kubejs/data/wan_ancient_beasts/loot_tables/entities/soarer.json @@ -0,0 +1,66 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_whole_soarer", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 4 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 4, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + , + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:glider_feather", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 4, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/wan_ancient_beasts/loot_tables/entities/walker.json b/kubejs/data/wan_ancient_beasts/loot_tables/entities/walker.json new file mode 100644 index 000000000..9808e1bba --- /dev/null +++ b/kubejs/data/wan_ancient_beasts/loot_tables/entities/walker.json @@ -0,0 +1,45 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_walker_steak", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 10, + "max": 25 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 4, + "max": 10, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 40a689ee7..d41342161 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -349,7 +349,8 @@ const registerAdAstraEntityTypeTags = (event) => { 'endermanoverhaul:end_enderman', 'endermanoverhaul:end_islands_enderman', - 'minecraft:sniffer', + 'tfg:sniffer', + 'tfg:glacian_ram', 'species:wraptor', 'species:goober', 'species:cruncher', @@ -357,7 +358,12 @@ const registerAdAstraEntityTypeTags = (event) => { 'species:quake', 'endermanoverhaul:crimson_forest_enderman', 'endermanoverhaul:warped_forest_enderman', - 'endermanoverhaul:badlands_enderman' + 'endermanoverhaul:badlands_enderman', + 'wan_ancient_beasts:walker', + 'wan_ancient_beasts:eater', + 'wan_ancient_beasts:crusher', + 'wan_ancient_beasts:soarer', + 'wan_ancient_beasts:glider' ] COLD_ENTITIES.forEach(entity => { @@ -378,6 +384,11 @@ const registerAdAstraEntityTypeTags = (event) => { event.add('tfg:ignores_gravity', 'endermanoverhaul:spirit') event.add('tfg:ignores_gravity', 'species:birt') event.add('tfg:ignores_gravity', 'ad_astra:star_crawler') + + event.add('tfg:ignores_gravity', 'species:wraptor') + event.add('tfg:ignores_gravity', 'wan_ancient_beasts:crusher') + event.add('tfg:ignores_gravity', 'wan_ancient_beasts:soarer') + event.add('tfg:ignores_gravity', 'wan_ancient_beasts:glider') } const registerAdAstraPlacedFeatures = (event) => { diff --git a/kubejs/server_scripts/species/tags.js b/kubejs/server_scripts/species/tags.js index 509b6c004..1cf9597a5 100644 --- a/kubejs/server_scripts/species/tags.js +++ b/kubejs/server_scripts/species/tags.js @@ -7,6 +7,8 @@ const registerSpeciesBlockTags = (event) => { }) event.removeAll('species:wraptor_nesting_blocks') + + event.add('species:petrified_egg_hatch', '#tfcambiental:warm_stuff') } const registerSpeciesItemTags = (event) => { @@ -17,6 +19,10 @@ const registerSpeciesItemTags = (event) => { event.add('forge:eggs', 'species:birt_egg') event.add('firmalife:foods/raw_eggs', 'species:birt_egg') - + + event.add('species:goober_breed_items', 'betterend:flammalix') + event.add('species:goober_breed_items', 'betterend:small_amaranita_mushroom') + event.add('species:goober_breed_items', 'betterend:bolux_mushroom_product') + event.add('species:goober_breed_items', 'betterend:chorus_mushroom_product') event.add('species:cruncher_eats', '#tfc:foods/meat') -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index b5d6df690..561dc4d85 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -128,7 +128,7 @@ const registerTFGFoodData = (event) => { }) event.foodItem('tfg:food/raw_moon_rabbit', food => { - food.hunger(4) + food.hunger(3) food.protein(2.0) food.decayModifier(3) }) @@ -141,7 +141,7 @@ const registerTFGFoodData = (event) => { }) event.foodItem('tfg:food/raw_glacian_mutton', food => { - food.hunger(4) + food.hunger(3) food.protein(2.0) food.decayModifier(3) }) @@ -154,7 +154,7 @@ const registerTFGFoodData = (event) => { }) event.foodItem('tfg:food/raw_sniffer_beef', food => { - food.hunger(4) + food.hunger(3) food.protein(2.0) food.decayModifier(3) }) @@ -166,6 +166,99 @@ const registerTFGFoodData = (event) => { food.decayModifier(1.5) }) + event.foodItem('tfg:food/raw_wraptor', food => { + food.hunger(3) + food.protein(2.0) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_wraptor', food => { + food.hunger(6) + food.saturation(4) + food.protein(5) + food.decayModifier(1.5) + }) + + event.foodItem('tfg:food/raw_springling_chops', food => { + food.hunger(2) + food.protein(1.5) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_springling_chops', food => { + food.hunger(4) + food.saturation(3) + food.protein(5) + food.decayModifier(1.5) + }) + + event.foodItem('tfg:food/raw_walker_steak', food => { + food.hunger(3) + food.protein(2.0) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_walker_steak', food => { + food.hunger(6) + food.saturation(3) + food.protein(8) + food.decayModifier(1.5) + }) + + event.foodItem('tfg:food/raw_glider_wings', food => { + food.hunger(1) + food.protein(1.5) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_glider_wings', food => { + food.hunger(3) + food.saturation(3) + food.protein(3) + food.decayModifier(1.5) + }) + + event.foodItem('tfg:food/raw_whole_soarer', food => { + food.hunger(3) + food.protein(2.0) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_whole_soarer', food => { + food.hunger(6) + food.saturation(6) + food.protein(4) + food.decayModifier(1.5) + }) + + event.foodItem('tfg:food/raw_crusher_meat', food => { + food.hunger(3) + food.protein(1.5) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_crusher_meat', food => { + food.hunger(5) + food.saturation(6) + food.protein(4) + food.decayModifier(1.5) + }) + + event.foodItem('tfg:food/raw_goober_meat', food => { + food.hunger(2) + food.protein(3.0) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_goober_meat', food => { + food.hunger(4) + food.saturation(3) + food.protein(6) + food.decayModifier(1.5) + }) + + + // high-tech food global.FOOD_FRUIT.forEach(fruit => { diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index f3d7eb3c0..660257cda 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -932,6 +932,27 @@ function registerTFGFoodRecipes(event) { event.recipes.tfc.heating('tfg:food/raw_sniffer_beef', 200) .resultItem(TFC.isp.of('tfg:food/cooked_sniffer_beef').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_wraptor', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_wraptor').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_springling_chops', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_springling_chops').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_walker_steak', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_walker_steak').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_glider_wings', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_glider_wings').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_whole_soarer', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_whole_soarer').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_crusher_meat', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_crusher_meat').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_goober_meat', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_goober_meat').copyFood()) event.recipes.tfc.advanced_shapeless_crafting( TFC.itemStackProvider.of('4x betterend:cave_pumpkin_chunks').copyFood(), diff --git a/kubejs/startup_scripts/species/constants.js b/kubejs/startup_scripts/species/constants.js index 4eb2a3e55..711a5db52 100644 --- a/kubejs/startup_scripts/species/constants.js +++ b/kubejs/startup_scripts/species/constants.js @@ -17,11 +17,9 @@ global.SPECIES_DISABLED_ITEMS = [ 'species:deepfish_bucket', 'species:bone_spike', 'species:ancient_pinecone', - 'species:petrified_egg', 'species:cruncher_egg', 'species:ichor_bottle', 'species:youth_potion', - 'species:springling_egg', 'species:wraptor_egg', 'species:chaindelier', 'species:spectralibur_pedestal', diff --git a/kubejs/startup_scripts/tfg/items.food.js b/kubejs/startup_scripts/tfg/items.food.js index fb83495cd..58563747a 100644 --- a/kubejs/startup_scripts/tfg/items.food.js +++ b/kubejs/startup_scripts/tfg/items.food.js @@ -74,14 +74,8 @@ function registerTFGFoodItems(event) { .food(food => food.hunger(4).saturation(2)) .tag('tfc:foods/grains') .tag('tfc:foods/usable_in_salad') - - event.create('tfg:food/cooked_moon_rabbit') - .translationKey('item.tfg.food.cooked_moon_rabbit') - .texture('tfg:item/food/cooked_moon_rabbit') - .food(food => food.hunger(4).saturation(8)) - .tag('tfc:foods/meats') - .tag('tfc:foods/cooked_meats') - + + //Moon Rabbit event.create('tfg:food/raw_moon_rabbit') .translationKey('item.tfg.food.raw_moon_rabbit') .texture('tfg:item/food/raw_moon_rabbit') @@ -90,6 +84,14 @@ function registerTFGFoodItems(event) { .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') + event.create('tfg:food/cooked_moon_rabbit') + .translationKey('item.tfg.food.cooked_moon_rabbit') + .texture('tfg:item/food/cooked_moon_rabbit') + .food(food => food.hunger(4).saturation(8)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Glacian Ram event.create('tfg:food/raw_glacian_mutton') .translationKey('item.tfg.food.raw_glacian_mutton') .texture('tfg:item/food/raw_glacian_mutton') @@ -101,10 +103,11 @@ function registerTFGFoodItems(event) { event.create('tfg:food/cooked_glacian_mutton') .translationKey('item.tfg.food.cooked_glacian_mutton') .texture('tfg:item/food/cooked_glacian_mutton') - .food(food => food.hunger(6).saturation(10)) + .food(food => food.hunger(5).saturation(8)) .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') + //Sniffer event.create('tfg:food/raw_sniffer_beef') .translationKey('item.tfg.food.raw_sniffer_beef') .texture('tfg:item/food/raw_sniffer_beef') @@ -116,9 +119,122 @@ function registerTFGFoodItems(event) { event.create('tfg:food/cooked_sniffer_beef') .translationKey('item.tfg.food.cooked_sniffer_beef') .texture('tfg:item/food/cooked_sniffer_beef') + .food(food => food.hunger(8).saturation(9)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Wraptor + event.create('tfg:food/raw_wraptor') + .translationKey('item.tfg.food.raw_wraptor') + .texture('tfg:item/food/raw_wraptor') + .food(food => food.hunger(3).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_wraptor') + .translationKey('item.tfg.food.cooked_wraptor') + .texture('tfg:item/food/cooked_wraptor') + .food(food => food.hunger(6).saturation(8)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Springling + event.create('tfg:food/raw_springling_chops') + .translationKey('item.tfg.food.raw_springling_chops') + .texture('tfg:item/food/raw_springling_chops') + .food(food => food.hunger(2).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_springling_chops') + .translationKey('item.tfg.food.cooked_springling_chops') + .texture('tfg:item/food/cooked_springling_chops') + .food(food => food.hunger(4).saturation(4)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Walker + event.create('tfg:food/raw_walker_steak') + .translationKey('item.tfg.food.raw_walker_steak') + .texture('tfg:item/food/raw_walker_steak') + .food(food => food.hunger(3).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_walker_steak') + .translationKey('item.tfg.food.cooked_walker_steak') + .texture('tfg:item/food/cooked_walker_steak') .food(food => food.hunger(8).saturation(10)) .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') + + //Glider + event.create('tfg:food/raw_glider_wings') + .translationKey('item.tfg.food.raw_glider_wings') + .texture('tfg:item/food/raw_glider_wings') + .food(food => food.hunger(1).saturation(1) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_glider_wings') + .translationKey('item.tfg.food.cooked_glider_wings') + .texture('tfg:item/food/cooked_glider_wings') + .food(food => food.hunger(2).saturation(3)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Soarer + event.create('tfg:food/raw_whole_soarer') + .translationKey('item.tfg.food.raw_whole_soarer') + .texture('tfg:item/food/raw_whole_soarer') + .food(food => food.hunger(2).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_whole_soarer') + .translationKey('item.tfg.food.cooked_whole_soarer') + .texture('tfg:item/food/cooked_whole_soarer') + .food(food => food.hunger(6).saturation(6)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Crusher + event.create('tfg:food/raw_crusher_meat') + .translationKey('item.tfg.food.raw_crusher_meat') + .texture('tfg:item/food/raw_crusher_meat') + .food(food => food.hunger(3).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_crusher_meat') + .translationKey('item.tfg.food.cooked_crusher_meat') + .texture('tfg:item/food/cooked_crusher_meat') + .food(food => food.hunger(5).saturation(6)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Goober + event.create('tfg:food/raw_goober_meat') + .translationKey('item.tfg.food.raw_goober_meat') + .texture('tfg:item/food/raw_goober_meat') + .food(food => food.hunger(1).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_goober_meat') + .translationKey('item.tfg.food.cooked_goober_meat') + .texture('tfg:item/food/cooked_goober_meat') + .food(food => food.hunger(3).saturation(6)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + event.create('tfg:food/ice_soup') .translationKey('item.tfg.food.ice_soup') diff --git a/pakku-lock.json b/pakku-lock.json index ce9c2e3f9..38eaa01cc 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -13522,6 +13522,72 @@ } ] }, + { + "pakku_id": "qM5Yyq0zqqJc8XtT", + "pakku_links": [ + "pB7ARGecP03UXpd6" + ], + "type": "MOD", + "side": "BOTH", + "slug": { + "curseforge": "wans-ancient-beasts", + "modrinth": "wab" + }, + "name": { + "curseforge": "Wan's Ancient Beasts", + "modrinth": "Wan's Ancient Beasts" + }, + "id": { + "curseforge": "1108604", + "modrinth": "nWC3kyL3" + }, + "files": [ + { + "type": "curseforge", + "file_name": "wab-1.20.1-1.3.0.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6871/96/wab-1.20.1-1.3.0.jar", + "id": "6871096", + "parent_id": "1108604", + "hashes": { + "sha1": "e614c4c18b0623cb26c7aede3f75b9ed43cf54c7", + "md5": "190aa6671f0a42775ee89381a47369a9" + }, + "required_dependencies": [], + "size": 9916516, + "date_published": "2025-08-10T12:28:16.640Z" + }, + { + "type": "modrinth", + "file_name": "wab-1.20.1-1.3.0.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/nWC3kyL3/versions/txtFU0oY/wab-1.20.1-1.3.0.jar", + "id": "txtFU0oY", + "parent_id": "nWC3kyL3", + "hashes": { + "sha512": "216b256897bfa01671883aebd9f38dceb1077b8abff63a85f12f80ef800cb28d6b7bd8dd42c54ff928a587dd43d4ddc8fde7a8f45ec85459287bfabe578d4760", + "sha1": "e614c4c18b0623cb26c7aede3f75b9ed43cf54c7" + }, + "required_dependencies": [ + "8BmcQJ2H" + ], + "size": 9916516, + "date_published": "2025-08-12T15:03:58.487235Z" + } + ] + }, { "pakku_id": "zonLLbYfp9ViO9i7", "type": "MOD", From beed3094f3b8d83e1bad5ca89387e322e16956e8 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 15 Aug 2025 22:47:44 +0100 Subject: [PATCH 068/158] buttons again #1625 --- kubejs/server_scripts/tfc/tags.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 9b7427fe0..93bd2ba28 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -443,6 +443,11 @@ const registerTFCBlockTags = (event) => { const brick_blacklist = ('drying|slab|stairs|wall|additionalplacements'); event.add('tfc:bloomery_insulation', `/^(?=.*brick)(?!.*(${brick_blacklist})).*/`); event.add('tfc:forge_insulation', `/^(?=.*brick)(?!.*(${brick_blacklist})).*/`); + + global.TFC_STONE_TYPES.forEach(stone => { + event.add('minecraft:stone_buttons', `tfc:rock/button/${stone}`) + event.add('minecraft:buttons', `tfc:rock/button/${stone}`) + }) } const registerTFCFluidTags = (event) => { From 81b3dcc8e473fc4a32ecaf3cd842702450c31ce0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 15 Aug 2025 23:05:10 +0100 Subject: [PATCH 069/158] butn --- kubejs/server_scripts/tfc/tags.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 93bd2ba28..42227aa1f 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -326,6 +326,11 @@ const registerTFCItemTags = (event) => { event.add('tfc:forge_invisible_whitelist', 'greate:titanium_mechanical_pump') event.add('forge:mushrooms', 'tfc:plant/artists_conk') + + global.TFC_STONE_TYPES.forEach(stone => { + event.add('minecraft:stone_buttons', `tfc:rock/button/${stone}`) + event.add('minecraft:buttons', `tfc:rock/button/${stone}`) + }) } const registerTFCBlockTags = (event) => { From 427b77e99ab5769b00f2aeeb1f619c3e93854a84 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 15 Aug 2025 23:05:22 +0100 Subject: [PATCH 070/158] fiddling with forest noise --- kubejs/server_scripts/tfg/events.chunks.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/tfg/events.chunks.js b/kubejs/server_scripts/tfg/events.chunks.js index a1aa0ecf9..e6979a49f 100644 --- a/kubejs/server_scripts/tfg/events.chunks.js +++ b/kubejs/server_scripts/tfg/events.chunks.js @@ -37,11 +37,11 @@ TFCEvents.createChunkDataProvider('mars', event => { const rain = TFC.misc.lerpFloatLayer(0, 0, 0, 0); const tempLayer = TFC.misc.newOpenSimplex2D(event.worldSeed + 4621678939469) - .spread(0.2) + .spread(0.002) .octaves(3) .scaled(70, 90) const forestLayer = TFC.misc.newOpenSimplex2D(event.worldSeed + 98713856895664) - .spread(0.8) + .spread(0.0002) .terraces(9) .affine(6, 12) .scaled(6, 18, 0, 1) From a341470cee16825a4ac2bde51a1220814d159a84 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 15 Aug 2025 23:30:14 +0100 Subject: [PATCH 071/158] removed cobalt oxide's meltability #1634 --- kubejs/startup_scripts/gtceu/materials.js | 1 - 1 file changed, 1 deletion(-) diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index 259ecaccc..d066405f5 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -140,7 +140,6 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Potin.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(807 * 0.6, 807 * 0.8, 807, 2)); GTMaterials.Cobalt.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1495 * 0.6, 1495 * 0.8, 1495, 3)); GTMaterials.Cobaltite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1495 * 0.6, 1495 * 0.8, 1495, GTMaterials.Cobalt, 3, 85)); - GTMaterials.CobaltOxide.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1495 * 0.6, 1495 * 0.8, 1495, GTMaterials.Cobalt, 3)); GTMaterials.CobaltBrass.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1060 * 0.6, 1060 * 0.8, 1060, 3)); let AlSi = GTMaterials.get('aluminium_silicate') AlSi.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1540, 1540, 1540, 1)) From b2660923c6048003a92b1a44a5de325f76c85abc Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 16 Aug 2025 00:16:03 +0100 Subject: [PATCH 072/158] space suit capacity changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd22b6c29..1f6cb7615 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Firmalife mixing bowls can now be placed on tool racks (#1623) @Pyritie - Fixed recipe for pyroxenite button (again) (#1625) @Pyritie - Refactored locometal recipes to use stonecutters, metal plated locometal is now also much cheaper (#1624) @Pyritie +- Increased the air capacity of space suits by 250% @Pyritie ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop From 0ed457001dc53155e91cbb403cab2f743fe1ebf9 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 16 Aug 2025 00:45:29 +0100 Subject: [PATCH 073/158] fix typo in loot pool --- kubejs/data/species/loot_tables/entities/goober.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/data/species/loot_tables/entities/goober.json b/kubejs/data/species/loot_tables/entities/goober.json index 49b61e5fb..57f9bdfc7 100644 --- a/kubejs/data/species/loot_tables/entities/goober.json +++ b/kubejs/data/species/loot_tables/entities/goober.json @@ -47,7 +47,7 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:slimeball", + "name": "minecraft:slime_ball", "functions": [ { "function": "minecraft:set_count", From c6fbc052900dd53bab630a0c21307ddd938d2320 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 16 Aug 2025 02:55:28 +0100 Subject: [PATCH 074/158] biome tweaks, adding some mobs, reducing amount of endermen --- .../tfg/worldgen/biome/mars/amber_hills.json | 32 +++++++++---- .../tfg/worldgen/biome/mars/amber_plains.json | 41 +++++++++++----- .../biome/mars/martian_dune_edge.json | 37 ++++++++------- .../worldgen/biome/mars/martian_dunes.json | 13 ++++- .../biome/mars/martian_mountains.json | 32 ++++++++++--- .../worldgen/biome/mars/martian_oasis.json | 23 +++++---- .../worldgen/biome/mars/martian_river.json | 37 +++++++++------ .../worldgen/biome/mars/martian_riverbed.json | 35 ++++++++------ .../worldgen/biome/mars/rusticus_hills.json | 46 +++++++++++------- .../worldgen/biome/mars/rusticus_plains.json | 47 +++++++++++++------ .../worldgen/biome/mars/sangnum_hills.json | 36 ++++++++------ .../worldgen/biome/mars/sangnum_plains.json | 47 ++++++++++++------- 12 files changed, 281 insertions(+), 145 deletions(-) diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index 7f263b9e5..c9502f68e 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -58,16 +58,16 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -78,7 +78,7 @@ "type": "tfg:sniffer", "maxCount": 3, "minCount": 1, - "weight": 100 + "weight": 50 }, { "type": "species:wraptor", @@ -96,19 +96,31 @@ "type": "wan_ancient_beasts:glider", "maxCount": 4, "minCount": 1, - "weight": 30 + "weight": 100 }, { "type": "wan_ancient_beasts:soarer", "maxCount": 2, "minCount": 1, + "weight": 60 + }, + { + "type": "wan_ancient_beasts:eater", + "maxCount": 1, + "minCount": 1, "weight": 10 }, { "type": "species:springling", "maxCount": 3, "minCount": 1, - "weight": 20 + "weight": 50 + }, + { + "type": "tfg:glacian_ram", + "maxCount": 3, + "minCount": 1, + "weight": 40 } ], "misc": [], @@ -121,7 +133,7 @@ }, { "type": "endermanoverhaul:warped_forest_enderman", - "maxCount": 3, + "maxCount": 1, "minCount": 1, "weight": 100 }, diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index 91ff2bae8..22cad6f90 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -53,16 +53,16 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -78,12 +78,12 @@ { "type": "species:wraptor", "maxCount": 4, - "minCount": 1, + "minCount": 2, "weight": 100 }, { "type": "wan_ancient_beasts:walker", - "maxCount": 4, + "maxCount": 3, "minCount": 1, "weight": 100 }, @@ -99,11 +99,23 @@ "minCount": 1, "weight": 20 }, + { + "type": "wan_ancient_beasts:soarer", + "maxCount": 1, + "minCount": 1, + "weight": 5 + }, { "type": "tfg:glacian_ram", - "maxCount": 6, + "maxCount": 5, "minCount": 1, "weight": 100 + }, + { + "type": "wan_ancient_beasts:eater", + "maxCount": 1, + "minCount": 1, + "weight": 5 } ], "misc": [], @@ -116,7 +128,7 @@ }, { "type": "endermanoverhaul:warped_forest_enderman", - "maxCount": 3, + "maxCount": 1, "minCount": 1, "weight": 100 }, @@ -129,7 +141,14 @@ ], "underground_water_creature": [], "water_ambient": [], - "water_creature": [] + "water_creature": [ + { + "type": "wan_ancient_beasts:surfer", + "maxCount": 2, + "minCount": 1, + "weight": 100 + } + ] }, "temperature": 0.8 } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json index ecb2113ef..7397cca40 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -56,44 +56,49 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { "ambient": [], "axolotls": [], "creature": [ - { - "type": "species:goober", - "maxCount": 3, - "minCount": 1, - "weight": 100 - }, { "type": "wan_ancient_beasts:crusher", "maxCount": 2, "minCount": 1, - "weight": 80 + "weight": 100 }, { "type": "wan_ancient_beasts:glider", "maxCount": 2, "minCount": 1, - "weight": 50 + "weight": 20 } - - ], + ], "misc": [], "monster": [ + { + "type": "endermanoverhaul:crimson_forest_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:warped_forest_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, { "type": "endermanoverhaul:badlands_enderman", "maxCount": 1, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json index d5696a2ff..a7910be6d 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json @@ -51,7 +51,18 @@ ], "has_precipitation": false, "spawn_costs": { - + "endermanoverhaul:crimson_forest_enderman": { + "energy_budget": 0.05, + "charge": 0.9 + }, + "endermanoverhaul:warped_forest_enderman": { + "energy_budget": 0.05, + "charge": 0.9 + }, + "endermanoverhaul:badlands_enderman": { + "energy_budget": 0.05, + "charge": 0.9 + } }, "spawners": { "ambient": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index cc0570446..8e856b551 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -57,16 +57,16 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -84,6 +84,24 @@ "maxCount": 4, "minCount": 2, "weight": 100 + }, + { + "type": "wan_ancient_beasts:crusher", + "maxCount": 2, + "minCount": 1, + "weight": 80 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 2, + "minCount": 1, + "weight": 50 + }, + { + "type": "wan_ancient_beasts:soarer", + "maxCount": 2, + "minCount": 1, + "weight": 50 } ], "misc": [], @@ -96,7 +114,7 @@ }, { "type": "endermanoverhaul:warped_forest_enderman", - "maxCount": 3, + "maxCount": 1, "minCount": 1, "weight": 100 }, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json b/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json index 7bf61a392..d8b2d4b6c 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json @@ -56,16 +56,16 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -88,7 +88,7 @@ }, { "type": "endermanoverhaul:warped_forest_enderman", - "maxCount": 3, + "maxCount": 1, "minCount": 1, "weight": 20 }, @@ -101,7 +101,14 @@ ], "underground_water_creature": [], "water_ambient": [], - "water_creature": [] + "water_creature": [ + { + "type": "wan_ancient_beasts:surfer", + "maxCount": 2, + "minCount": 1, + "weight": 100 + } + ] }, "temperature": 0.8 } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json index 0710509e4..b67db091b 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json @@ -57,33 +57,27 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { "ambient": [], "axolotls": [], "creature": [ - { - "type": "minecraft:sniffer", - "maxCount": 2, - "minCount": 1, - "weight": 75 - }, { "type": "species:wraptor", "maxCount": 2, "minCount": 1, - "weight": 75 + "weight": 50 }, { "type": "species:goober", @@ -102,7 +96,7 @@ }, { "type": "endermanoverhaul:warped_forest_enderman", - "maxCount": 3, + "maxCount": 1, "minCount": 1, "weight": 100 }, @@ -115,7 +109,20 @@ ], "underground_water_creature": [], "water_ambient": [], - "water_creature": [] + "water_creature": [ + { + "type": "wan_ancient_beasts:toxlacanth", + "maxCount": 5, + "minCount": 2, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:surfer", + "maxCount": 3, + "minCount": 2, + "weight": 100 + } + ] }, "temperature": 0.8 } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json index 924aaa4d3..b3f6be5e6 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json @@ -60,28 +60,22 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { "ambient": [], "axolotls": [], "creature": [ - { - "type": "minecraft:sniffer", - "maxCount": 1, - "minCount": 1, - "weight": 50 - }, { "type": "species:wraptor", "maxCount": 2, @@ -105,7 +99,7 @@ }, { "type": "endermanoverhaul:warped_forest_enderman", - "maxCount": 3, + "maxCount": 1, "minCount": 1, "weight": 100 }, @@ -118,7 +112,20 @@ ], "underground_water_creature": [], "water_ambient": [], - "water_creature": [] + "water_creature": [ + { + "type": "wan_ancient_beasts:toxlacanth", + "maxCount": 5, + "minCount": 2, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:surfer", + "maxCount": 3, + "minCount": 2, + "weight": 100 + } + ] }, "temperature": 0.8 } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 669b61600..90fa83163 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -58,16 +58,16 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -76,39 +76,51 @@ "creature": [ { "type": "tfg:sniffer", - "maxCount": 4, + "maxCount": 3, "minCount": 1, - "weight": 100 + "weight": 10 }, { "type": "species:wraptor", - "maxCount": 3, - "minCount": 1, + "maxCount": 4, + "minCount": 2, "weight": 100 }, { "type": "wan_ancient_beasts:crusher", - "maxCount": 3, + "maxCount": 5, "minCount": 1, - "weight": 20 + "weight": 100 }, { "type": "wan_ancient_beasts:glider", "maxCount": 4, "minCount": 1, - "weight": 30 + "weight": 100 }, { "type": "wan_ancient_beasts:soarer", "maxCount": 2, "minCount": 1, - "weight": 20 + "weight": 30 + }, + { + "type": "wan_ancient_beasts:eater", + "maxCount": 1, + "minCount": 1, + "weight": 10 }, { "type": "species:springling", - "maxCount": 5, - "minCount": 2, + "maxCount": 3, + "minCount": 1, "weight": 100 + }, + { + "type": "tfg:glacian_ram", + "maxCount": 3, + "minCount": 1, + "weight": 20 } ], "misc": [], @@ -121,7 +133,7 @@ }, { "type": "endermanoverhaul:warped_forest_enderman", - "maxCount": 3, + "maxCount": 1, "minCount": 1, "weight": 100 }, diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index 2f6d5f406..8f7cf74d9 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -53,16 +53,16 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -71,14 +71,14 @@ "creature": [ { "type": "tfg:sniffer", - "maxCount": 4, + "maxCount": 3, "minCount": 1, "weight": 100 }, { "type": "species:wraptor", - "maxCount": 3, - "minCount": 1, + "maxCount": 4, + "minCount": 2, "weight": 100 }, { @@ -89,9 +89,9 @@ }, { "type": "wan_ancient_beasts:crusher", - "maxCount": 4, + "maxCount": 5, "minCount": 1, - "weight": 20 + "weight": 100 }, { "type": "wan_ancient_beasts:glider", @@ -99,11 +99,23 @@ "minCount": 1, "weight": 20 }, + { + "type": "wan_ancient_beasts:soarer", + "maxCount": 1, + "minCount": 1, + "weight": 5 + }, { "type": "tfg:glacian_ram", - "maxCount": 6, + "maxCount": 5, "minCount": 1, "weight": 100 + }, + { + "type": "wan_ancient_beasts:eater", + "maxCount": 1, + "minCount": 1, + "weight": 5 } ], "misc": [], @@ -116,7 +128,7 @@ }, { "type": "endermanoverhaul:warped_forest_enderman", - "maxCount": 3, + "maxCount": 1, "minCount": 1, "weight": 100 }, @@ -129,7 +141,14 @@ ], "underground_water_creature": [], "water_ambient": [], - "water_creature": [] + "water_creature": [ + { + "type": "wan_ancient_beasts:surfer", + "maxCount": 2, + "minCount": 1, + "weight": 100 + } + ] }, "temperature": 0.8 } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index 952b80678..25537f193 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -58,16 +58,16 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -76,21 +76,21 @@ "creature": [ { "type": "tfg:sniffer", - "maxCount": 4, + "maxCount": 3, "minCount": 1, - "weight": 100 + "weight": 20 }, { "type": "species:wraptor", "maxCount": 4, - "minCount": 1, + "minCount": 2, "weight": 100 }, { "type": "wan_ancient_beasts:crusher", "maxCount": 3, "minCount": 1, - "weight": 20 + "weight": 70 }, { "type": "wan_ancient_beasts:glider", @@ -102,19 +102,25 @@ "type": "wan_ancient_beasts:soarer", "maxCount": 2, "minCount": 1, - "weight": 40 + "weight": 100 }, { - "type": "species:goober", + "type": "wan_ancient_beasts:eater", "maxCount": 1, "minCount": 1, - "weight": 50 + "weight": 10 }, { "type": "species:springling", "maxCount": 3, "minCount": 1, - "weight": 100 + "weight": 80 + }, + { + "type": "tfg:glacian_ram", + "maxCount": 3, + "minCount": 1, + "weight": 30 } ], "misc": [], @@ -127,7 +133,7 @@ }, { "type": "endermanoverhaul:warped_forest_enderman", - "maxCount": 3, + "maxCount": 1, "minCount": 1, "weight": 100 }, diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index f6d77a5ac..835cf9506 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -53,16 +53,16 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -71,45 +71,51 @@ "creature": [ { "type": "tfg:sniffer", - "maxCount": 4, + "maxCount": 3, "minCount": 1, "weight": 100 }, { "type": "species:wraptor", "maxCount": 4, - "minCount": 1, + "minCount": 2, "weight": 100 }, { "type": "wan_ancient_beasts:walker", - "maxCount": 5, + "maxCount": 3, "minCount": 1, "weight": 100 }, { "type": "wan_ancient_beasts:crusher", - "maxCount": 4, + "maxCount": 5, "minCount": 1, - "weight": 20 + "weight": 100 }, { "type": "wan_ancient_beasts:glider", "maxCount": 2, "minCount": 1, - "weight": 100 + "weight": 20 }, { - "type": "species:goober", + "type": "wan_ancient_beasts:soarer", "maxCount": 1, "minCount": 1, - "weight": 50 + "weight": 5 }, { "type": "tfg:glacian_ram", - "maxCount": 6, + "maxCount": 5, "minCount": 1, "weight": 100 + }, + { + "type": "wan_ancient_beasts:eater", + "maxCount": 1, + "minCount": 1, + "weight": 5 } ], "misc": [], @@ -122,7 +128,7 @@ }, { "type": "endermanoverhaul:warped_forest_enderman", - "maxCount": 3, + "maxCount": 1, "minCount": 1, "weight": 100 }, @@ -135,7 +141,14 @@ ], "underground_water_creature": [], "water_ambient": [], - "water_creature": [] + "water_creature": [ + { + "type": "wan_ancient_beasts:surfer", + "maxCount": 2, + "minCount": 1, + "weight": 100 + } + ] }, "temperature": 0.8 } \ No newline at end of file From f2380e9ebde67b69a5efc99fb4b266793291596b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 16 Aug 2025 02:55:49 +0100 Subject: [PATCH 075/158] tree stuff --- kubejs/server_scripts/tfg/events.chunks.js | 16 +++++++++-- kubejs/server_scripts/tfg/events.forests.js | 32 ++++++++++++++------- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/kubejs/server_scripts/tfg/events.chunks.js b/kubejs/server_scripts/tfg/events.chunks.js index e6979a49f..ad12db91c 100644 --- a/kubejs/server_scripts/tfg/events.chunks.js +++ b/kubejs/server_scripts/tfg/events.chunks.js @@ -2,6 +2,7 @@ "use strict"; const $HeightMap = Java.loadClass("net.minecraft.world.level.levelgen.Heightmap") +const $ForestType = Java.loadClass("net.dries007.tfc.world.chunkdata.ForestType") const ROCK_LAYER_HEIGHT = 40; @@ -70,12 +71,23 @@ TFCEvents.createChunkDataProvider('mars', event => { tempLayer.noise(x + 15, z + 15) ); + let forestType = $ForestType.NONE; + const forestTypeNoise = forestLayer.noise(x, z); + if (forestTypeNoise < 0.2) + forestType = $ForestType.OLD_GROWTH; + else if (forestTypeNoise < 0.4) + forestType = $ForestType.NORMAL; + else if (forestTypeNoise < 0.6) + forestType = $ForestType.EDGE; + else if (forestTypeNoise < 0.8) + forestType = $ForestType.SPARSE; + data.generatePartial( rain, temp, - forestLayer.noise(x, z) * 4, // Kube accepts ordinal numbers for enum constants + forestType, forestLayer.noise(x * 78423 + 869, z), - forestLayer.noise(x, z * 651349 - 698763) + forestTypeNoise //forestLayer.noise(x, z * 651349 - 698763) ); }); diff --git a/kubejs/server_scripts/tfg/events.forests.js b/kubejs/server_scripts/tfg/events.forests.js index e4045d179..7e1551a4e 100644 --- a/kubejs/server_scripts/tfg/events.forests.js +++ b/kubejs/server_scripts/tfg/events.forests.js @@ -5,13 +5,13 @@ TFCEvents.worldgenData(event => { event.forest('tfg:mars_forest', '#tfg:mars_forest_entries', [ - event.forestTypesMapEntry('none', 0, 0, 0, 0, false, false, 0), - event.forestTypesMapEntry('sparse', [1, 3], 6, 0.08, 0, true, false, null), - event.forestTypesMapEntry('edge', 2, 10, null, 1, false, false, [0, 1]), - event.forestTypesMapEntry('normal', 5, 25, null, 1, true, false, null), - event.forestTypesMapEntry('old_growth', 7, 40, null, 1, false, true, [0, 1]) + event.forestTypesMapEntry('none', [1, 3], 0, 0, 0, false, false, 0), + event.forestTypesMapEntry('sparse', [2, 5], 6, 0.08, 0, true, false, null), + event.forestTypesMapEntry('edge', 5, 15, 0.1, 1, true, true, [0, 1]), + event.forestTypesMapEntry('normal', 10, 25, 0.1, 1, true, true, [1, 2]), + event.forestTypesMapEntry('old_growth', 15, 40, 0.2, 1, true, true, [1, 2]) ], - true, + false, placement => {} ) @@ -24,7 +24,9 @@ TFCEvents.worldgenData(event => { [ // ground cover 'minecraft:crimson_fungus', 'beneath:wood/fallen_leaves/crimson', - 'beneath:wood/twig/crimson' + 'beneath:wood/twig/crimson', + 'tfc:groundcover/feather', + 'tfc:groundcover/stick' ], 'tfg:mars/tree/crimson', // tree feature 'tfg:mars/tree/crimson_dead', // dead tree feature @@ -47,7 +49,9 @@ TFCEvents.worldgenData(event => { [ 'minecraft:warped_fungus', 'beneath:wood/fallen_leaves/warped', - 'beneath:wood/twig/warped' + 'beneath:wood/twig/warped', + 'tfc:groundcover/feather', + 'tfc:groundcover/stick' ], 'tfg:mars/tree/warped', 'tfg:mars/tree/warped_dead', @@ -65,7 +69,9 @@ TFCEvents.worldgenData(event => { [ "ad_astra:aeronos_mushroom", 'beneath:wood/fallen_leaves/crimson', - 'beneath:wood/twig/crimson' + 'beneath:wood/twig/crimson', + 'tfc:groundcover/feather', + 'tfc:groundcover/stick' ], 'tfg:mars/tree/aeronos', 'tfg:mars/tree/aeronos_dead', @@ -83,7 +89,9 @@ TFCEvents.worldgenData(event => { [ "ad_astra:strophar_mushroom", 'beneath:wood/fallen_leaves/warped', - 'beneath:wood/twig/warped' + 'beneath:wood/twig/warped', + 'tfc:groundcover/feather', + 'tfc:groundcover/stick' ], 'tfg:mars/tree/strophar', 'tfg:mars/tree/strophar_dead', @@ -101,7 +109,9 @@ TFCEvents.worldgenData(event => { [ "species:alphacene_mushroom", 'beneath:wood/fallen_leaves/crimson', - 'beneath:wood/twig/crimson' + 'beneath:wood/twig/crimson', + 'tfc:groundcover/feather', + 'tfc:groundcover/stick' ], 'species:alphacene_mushroom', 'tfg:mars/tree/alphacene_dead', From 4a0c61c240189aa3197974e7b1ab23d633c5639a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 16 Aug 2025 02:55:54 +0100 Subject: [PATCH 076/158] tags for wab --- kubejs/server_scripts/ad_astra/tags.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index d41342161..112add8c1 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -243,6 +243,7 @@ const registerAdAstraBlockTags = (event) => { event.add('tfg:mars_soil', 'tfg:grass/amber_mycelium') event.add('tfg:mars_soil', 'tfg:grass/sangnum_mycelium') event.add('ad_astra:mars_stone_replaceables', '#tfg:mars_soil') + event.add('minecraft:animals_spawnable_on', '#tfg:mars_soil') event.add('tfc:can_carve', '#ad_astra:moon_stone_replaceables') event.add('tfc:can_carve', '#ad_astra:mars_stone_replaceables') @@ -363,7 +364,9 @@ const registerAdAstraEntityTypeTags = (event) => { 'wan_ancient_beasts:eater', 'wan_ancient_beasts:crusher', 'wan_ancient_beasts:soarer', - 'wan_ancient_beasts:glider' + 'wan_ancient_beasts:glider', + 'wan_ancient_beasts:toxlacanth', + 'wan_ancient_beasts:surfer' ] COLD_ENTITIES.forEach(entity => { From b42f535264afb1992a9371854c6f5482b8b07e3b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 16 Aug 2025 02:58:19 +0100 Subject: [PATCH 077/158] added regular endermen back --- .../data/tfg/worldgen/biome/mars/amber_hills.json | 10 ++++++++++ .../data/tfg/worldgen/biome/mars/amber_plains.json | 10 ++++++++++ .../tfg/worldgen/biome/mars/martian_dune_edge.json | 10 ++++++++++ .../tfg/worldgen/biome/mars/martian_dunes.json | 4 ++++ .../tfg/worldgen/biome/mars/martian_mountains.json | 10 ++++++++++ .../tfg/worldgen/biome/mars/martian_oasis.json | 14 ++++++++++++++ .../tfg/worldgen/biome/mars/martian_river.json | 10 ++++++++++ .../tfg/worldgen/biome/mars/martian_riverbed.json | 10 ++++++++++ .../tfg/worldgen/biome/mars/rusticus_hills.json | 10 ++++++++++ .../tfg/worldgen/biome/mars/rusticus_plains.json | 10 ++++++++++ .../tfg/worldgen/biome/mars/sangnum_hills.json | 10 ++++++++++ .../tfg/worldgen/biome/mars/sangnum_plains.json | 10 ++++++++++ 12 files changed, 118 insertions(+) diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index c9502f68e..5a20f90f8 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -68,6 +68,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -142,6 +146,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index 22cad6f90..0befe6e5a 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -63,6 +63,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -137,6 +141,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json index 7397cca40..64febb1de 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -66,6 +66,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -104,6 +108,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json index a7910be6d..85d45d325 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json @@ -62,6 +62,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index 8e856b551..f0b9acd73 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -67,6 +67,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -123,6 +127,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json b/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json index d8b2d4b6c..2bf7a2eba 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json @@ -66,6 +66,14 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 + }, + "species:quake": { + "energy_budget": 0.15, + "charge": 0.7 } }, "spawners": { @@ -97,6 +105,12 @@ "maxCount": 1, "minCount": 1, "weight": 50 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json index b67db091b..321febf6c 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json @@ -67,6 +67,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -105,6 +109,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json index b3f6be5e6..e092c165d 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json @@ -70,6 +70,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -108,6 +112,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 90fa83163..b53811376 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -68,6 +68,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -142,6 +146,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index 8f7cf74d9..254df3963 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -63,6 +63,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -137,6 +141,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index 25537f193..618c11c0e 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -68,6 +68,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -142,6 +146,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index 835cf9506..c826e3d0d 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -63,6 +63,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -137,6 +141,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], From 39db363896cca3c63bd464cd0e58f4919f537502 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 16 Aug 2025 03:02:29 +0100 Subject: [PATCH 078/158] made crops a little rarer, grasses a little more common --- .../tfg/worldgen/configured_feature/mars/crop/amber_root.json | 2 +- .../worldgen/configured_feature/mars/crop/blossom_berry.json | 2 +- .../worldgen/configured_feature/mars/crop/bolux_mushroom.json | 2 +- .../worldgen/configured_feature/mars/crop/cave_pumpkin.json | 2 +- .../configured_feature/mars/crop/chorus_mushroom.json | 2 +- .../worldgen/configured_feature/mars/crop/shadow_berry.json | 2 +- .../tfg/worldgen/placed_feature/mars/crop/amber_root.json | 2 +- .../tfg/worldgen/placed_feature/mars/crop/blossom_berry.json | 2 +- .../tfg/worldgen/placed_feature/mars/crop/bolux_mushroom.json | 2 +- .../tfg/worldgen/placed_feature/mars/crop/cave_pumpkin.json | 2 +- .../worldgen/placed_feature/mars/crop/chorus_mushroom.json | 2 +- .../tfg/worldgen/placed_feature/mars/crop/shadow_berry.json | 2 +- .../tfg/worldgen/placed_feature/mars/surface/aeridium.json | 4 ++-- .../tfg/worldgen/placed_feature/mars/surface/cave_grass.json | 2 +- .../tfg/worldgen/placed_feature/mars/surface/lutebus.json | 2 +- .../data/tfg/worldgen/placed_feature/mars/surface/orango.json | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/amber_root.json b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/amber_root.json index 6517e2edb..adb77bb40 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/amber_root.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/amber_root.json @@ -35,7 +35,7 @@ } ] }, - "tries": 16, + "tries": 12, "xz_spread": 10, "y_spread": 2 } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/blossom_berry.json b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/blossom_berry.json index 84b07a38f..dcff72864 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/blossom_berry.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/blossom_berry.json @@ -35,7 +35,7 @@ } ] }, - "tries": 16, + "tries": 12, "xz_spread": 10, "y_spread": 2 } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/bolux_mushroom.json b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/bolux_mushroom.json index 7ae8ad29f..7a4b3d1b6 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/bolux_mushroom.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/bolux_mushroom.json @@ -35,7 +35,7 @@ } ] }, - "tries": 16, + "tries": 12, "xz_spread": 10, "y_spread": 2 } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/cave_pumpkin.json b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/cave_pumpkin.json index 89db4f83c..d9101720e 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/cave_pumpkin.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/cave_pumpkin.json @@ -30,7 +30,7 @@ } ] }, - "tries": 16, + "tries": 12, "xz_spread": 10, "y_spread": 2 } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/chorus_mushroom.json b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/chorus_mushroom.json index 19e67254c..004a6db4c 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/chorus_mushroom.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/chorus_mushroom.json @@ -35,7 +35,7 @@ } ] }, - "tries": 16, + "tries": 12, "xz_spread": 10, "y_spread": 2 } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/shadow_berry.json b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/shadow_berry.json index e316ca1e0..6975247b2 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/shadow_berry.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/shadow_berry.json @@ -35,7 +35,7 @@ } ] }, - "tries": 16, + "tries": 12, "xz_spread": 10, "y_spread": 2 } diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/amber_root.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/amber_root.json index a754268f1..6ffacad5c 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/amber_root.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/amber_root.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 60 + "chance": 70 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/blossom_berry.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/blossom_berry.json index 8be00bd3c..1a4913e22 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/blossom_berry.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/blossom_berry.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 60 + "chance": 70 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/bolux_mushroom.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/bolux_mushroom.json index d7b0ae0b2..dc42c645f 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/bolux_mushroom.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/bolux_mushroom.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 60 + "chance": 70 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/cave_pumpkin.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/cave_pumpkin.json index 639a59c9c..95c6d9943 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/cave_pumpkin.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/cave_pumpkin.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 60 + "chance": 70 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/chorus_mushroom.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/chorus_mushroom.json index 73f8b11f3..af59e4dc0 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/chorus_mushroom.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/chorus_mushroom.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 60 + "chance": 70 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/shadow_berry.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/shadow_berry.json index 510bb64d6..16d39386f 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/shadow_berry.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/shadow_berry.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 60 + "chance": 70 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeridium.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeridium.json index ffc5ef7f8..f1ab0c68f 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeridium.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeridium.json @@ -1,9 +1,9 @@ { - "feature": "tfg:mars/surface/ruscus", + "feature": "tfg:mars/surface/aeridium", "placement": [ { "type": "minecraft:count", - "count": 1 + "count": 2 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/cave_grass.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/cave_grass.json index b464f6c22..bc216736e 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/cave_grass.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/cave_grass.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 6 + "count": 7 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/lutebus.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/lutebus.json index d674231a5..6a1d566b5 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/lutebus.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/lutebus.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 2 + "count": 4 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/orango.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/orango.json index 98419b076..d0442c031 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/orango.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/orango.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 2 + "count": 4 }, { "type": "minecraft:in_square" From 570072fccb97846cc6c0a879f6e9e619055cc36b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 16 Aug 2025 03:03:14 +0100 Subject: [PATCH 079/158] made ponds a little more common --- .../placed_feature/mars/semiheavy_ammoniacal_water.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/semiheavy_ammoniacal_water.json b/kubejs/data/tfg/worldgen/placed_feature/mars/semiheavy_ammoniacal_water.json index f1c558897..ec025871f 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/semiheavy_ammoniacal_water.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/semiheavy_ammoniacal_water.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 30 + "chance": 20 }, { "type": "minecraft:in_square" From 335985592371e042b5db50321f352f41c08748c0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 16 Aug 2025 03:22:01 +0100 Subject: [PATCH 080/158] fix shape of old growth strophar trees --- .../mars/tree/strophar_old_growth.json | 28 ++++--------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_old_growth.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_old_growth.json index ce6e15b66..42a417e5c 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_old_growth.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_old_growth.json @@ -34,26 +34,10 @@ "upper_size": 0 }, "trunk_placer": { - "type": "minecraft:upwards_branching_trunk_placer", - "base_height": 2, - "height_rand_a": 2, - "height_rand_b": 8, - "can_grow_through": "#minecraft:mangrove_logs_can_grow_through", - "extra_branch_steps": { - "type": "minecraft:uniform", - "value": { - "min_inclusive": 3, - "max_inclusive": 5 - } - }, - "extra_branch_length": { - "type": "minecraft:uniform", - "value": { - "min_inclusive": 4, - "max_inclusive": 12 - } - }, - "place_branch_per_log_probability": 0.25 + "type": "minecraft:forking_trunk_placer", + "base_height": 8, + "height_rand_a": 5, + "height_rand_b": 8 }, "trunk_provider": { "type": "minecraft:simple_state_provider", @@ -65,8 +49,8 @@ "type": "minecraft:mangrove_root_placer", "trunk_offset_y": 7, "mangrove_root_placement": { - "max_root_width": 12, - "max_root_length": 12, + "max_root_width": 16, + "max_root_length": 16, "random_skew_chance": 0.8, "can_grow_through": "#minecraft:mangrove_logs_can_grow_through", "muddy_roots_in": [ From 3521adc4de3e1bfbdfa62c53217fcbbe80ee6dd1 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Fri, 15 Aug 2025 22:20:48 -0500 Subject: [PATCH 081/158] idk some recipes (#1635) Co-authored-by: Redeix --- kubejs/server_scripts/main_server_script.js | 4 ++ .../wan_ancient_beasts/recipes.js | 55 +++++++++++++++ .../server_scripts/wan_ancient_beasts/tags.js | 28 ++++++++ kubejs/startup_scripts/tfc/constants.js | 12 +++- .../wan_ancient_beasts/constants.js | 67 +++++++++++++++++++ 5 files changed, 164 insertions(+), 2 deletions(-) create mode 100644 kubejs/server_scripts/wan_ancient_beasts/recipes.js create mode 100644 kubejs/server_scripts/wan_ancient_beasts/tags.js create mode 100644 kubejs/startup_scripts/wan_ancient_beasts/constants.js diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 6fd203e17..c2af044ab 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -51,6 +51,7 @@ ServerEvents.tags('item', event => { registerTFGItemTags(event) registerTFCLunchboxItemTags(event) registerVintageImprovementsItemTags(event) + registerWABItemTags(event) }) /** @@ -85,6 +86,7 @@ ServerEvents.tags('block', event => { registerTFCBlockTags(event) registerTFGBlockTags(event) registerVintageImprovementsBlockTags(event) + registerWABBlockTags(event) }) /** @@ -160,6 +162,7 @@ TFCEvents.data(event => { registerTFCDataForTFCLunchbox(event) registerTFCDataForTFG(event) registerTFCDataForWaterFlasks(event) + registerWABFoodData(event) }) /** @@ -263,6 +266,7 @@ ServerEvents.recipes(event => { registerTreeTapRecipes(event) registerVintageImprovementsRecipes(event) registerWaterFlasksRecipes(event) + registerWABRecipes(event) }) TaCZServerEvents.gunIndexLoad((event) => { diff --git a/kubejs/server_scripts/wan_ancient_beasts/recipes.js b/kubejs/server_scripts/wan_ancient_beasts/recipes.js new file mode 100644 index 000000000..7109c0f50 --- /dev/null +++ b/kubejs/server_scripts/wan_ancient_beasts/recipes.js @@ -0,0 +1,55 @@ + +// priority: 0 +"use strict"; + +/** + * @param {Internal.RecipesEventJS_} event + */ +const registerWABRecipes = (event) => { + + event.remove({ mod: 'wan_ancient_beasts'}) + + + event.shapeless('wan_ancient_beasts:quick_sand_bucket', + [ + '#tfc:dirt', + '#tfc:mud', + 'tfc:sand/yellow', + 'minecraft:bucket' + ]) + + event.shapeless('wan_ancient_beasts:quick_red_sand_bucket', + [ + '#tfc:dirt', + '#tfc:mud', + 'minecraft:red_sand', + 'minecraft:bucket' + ]) + + event.recipes.tfc.heating('wan_ancient_beasts:toxlacanth', 200) + .resultItem(TFC.isp.of('wan_ancient_beasts:cooked_toxlacanth').copyFood()) + + event.recipes.gtceu.macerator('wan_ancient_beasts:skull_crush') + .itemInputs('#wan_ancient_beasts:ancient_skull') + .itemOutputs('32x #forge:dusts/bone') + .duration(400) + .EUt(30) + +} + +const registerWABFoodData = (event) => { + + event.foodItem('wan_ancient_beasts:toxlacanth', food => { + food.hunger(2) + food.protein(1.5) + food.decayModifier(3) + }) + + event.foodItem('wan_ancient_beasts:cooked_toxlacanth', food => { + food.hunger(4) + food.saturation(2) + food.protein(2.5) + food.decayModifier(2.25) + }) + +} \ No newline at end of file diff --git a/kubejs/server_scripts/wan_ancient_beasts/tags.js b/kubejs/server_scripts/wan_ancient_beasts/tags.js new file mode 100644 index 000000000..390e92127 --- /dev/null +++ b/kubejs/server_scripts/wan_ancient_beasts/tags.js @@ -0,0 +1,28 @@ +"use strict"; + +const registerWABBlockTags = (event) => { + global.WAB_DISABLED_BLOCKS.forEach(block => { + event.removeAllTagsFrom(block) + event.add('c:hidden_from_recipe_viewers', block) + }) +} + +const registerWABItemTags = (event) => { + global.WAB_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }) + + event.removeAll('wan_ancient_beasts:paleontologist_common') + event.removeAll('wan_ancient_beasts:paleontologist_rare') + event.removeAll('wan_ancient_beasts:paleontologist_items') + event.removeAll('wan_ancient_beasts:eater_food') + + event.add('tfc:foods/raw_meats', 'wan_ancient_beasts:toxlacanth') + event.add('firmalife:foods/raw_fish', 'wan_ancient_beasts:toxlacanth') + event.add('tfc:foods/meats', 'wan_ancient_beasts:toxlacanth') + + event.add('tfc:foods/cooked_meats', 'wan_ancient_beasts:cooked_toxlacanth') + event.add('firmalife:foods/cooked_fish', 'wan_ancient_beasts:cooked_toxlacanth') + event.add('tfc:food/meats', 'wan_ancient_beasts:cooked_toxlacanth') +} \ No newline at end of file diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 3d7f4843a..dd39c1ced 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -917,8 +917,16 @@ global.TFC_MEAT_RECIPE_COMPONENTS = [ { input: 'betterend:chorus_mushroom_product', output: 'betterend:chorus_mushroom_cooked', name: 'chorus_mushroom' }, { input: 'betterend:shadow_berry_product', output: 'betterend:shadow_berry_cooked', name: 'shadow_berry' }, { input: 'betterend:cave_pumpkin_pie_raw', output: 'betterend:cave_pumpkin_pie', name: 'cave_pumpkin_pie' }, - { input: 'tfg:food/raw_glacian_mutton', output: 'tfg:food/cooked_glacian_mutton', name: 'cooked_glacian_mutton' }, - { input: 'tfg:food/raw_sniffer_beef', output: 'tfg:food/cooked_sniffer_beef', name: 'cooked_sniffer_beef' } + { input: 'tfg:food/raw_glacian_mutton', output: 'tfg:food/cooked_glacian_mutton', name: 'cooked_glacian_mutton' }, + { input: 'tfg:food/raw_sniffer_beef', output: 'tfg:food/cooked_sniffer_beef', name: 'cooked_sniffer_beef' }, + { input: 'tfg:food/raw_wraptor', output: 'tfg:food/cooked_wraptor', name: 'cooked_wraptor' }, + { input: 'wan_ancient_beasts:raw_toxlacanth', output: 'wan_ancient_beasts:cooked_toxlacanth', name: 'cooked_toxlacanth' }, + { input: 'tfg:food/raw_springling_chops', output: 'tfg:food/cooked_springling_chops', name: 'cooked_springling_chops' }, + { input: 'tfg:food/raw_walker_steak', output: 'tfg:food/cooked_walker_steak', name: 'cooked_walker_steak' }, + { input: 'tfg:food/raw_glider_wings', output: 'tfg:food/cooked_glider_wings', name: 'cooked_glider_wings' }, + { input: 'tfg:food/raw_whole_soarer', output: 'tfg:food/cooked_whole_soarer', name: 'cooked_whole_soarer' }, + { input: 'tfg:food/raw_crusher_meat', output: 'tfg:food/cooked_crusher_meat', name: 'cooked_crusher_meat' }, + { input: 'tfg:food/raw_goober_meat', output: 'tfg:food/cooked_goober_meat', name: 'cooked_goober_meat' } ]; global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = [ diff --git a/kubejs/startup_scripts/wan_ancient_beasts/constants.js b/kubejs/startup_scripts/wan_ancient_beasts/constants.js new file mode 100644 index 000000000..01cc0c9ee --- /dev/null +++ b/kubejs/startup_scripts/wan_ancient_beasts/constants.js @@ -0,0 +1,67 @@ +// priority: 0 +"use strict"; + +global.WAB_DISABLED_BLOCKS =[ + 'wan_ancient_beasts:frozen_straw_block', + 'wan_ancient_beasts:straw_block', + 'wan_ancient_beasts:straw_stairs', + 'wan_ancient_beasts:straw_slab', + 'wan_ancient_beasts:nest', + 'wan_ancient_beasts:suspicious_red_sand', + 'wan_ancient_beasts:suspicious_ice' +] + + +global.WAB_DISABLED_ITEMS = [ + + 'wan_ancient_beasts:frozen_straw_block', + 'wan_ancient_beasts:straw_block', + 'wan_ancient_beasts:straw_stairs', + 'wan_ancient_beasts:straw_slab', + 'wan_ancient_beasts:nest', + 'wan_ancient_beasts:suspicious_red_sand', + 'wan_ancient_beasts:suspicious_ice', + 'wan_ancient_beasts:chisel', + //'wan_ancient_beasts:eater_tooth', + 'wan_ancient_beasts:ancient_club', + //'wan_ancient_beasts:crusher_spike', + 'wan_ancient_beasts:ancient_upgrade_smithing_template', + 'wan_ancient_beasts:reinforced_shield', + //'wan_ancient_beasts:glider_feather', + 'wan_ancient_beasts:hang_glider', + //'wan_ancient_beasts:surfer_armor', + 'wan_ancient_beasts:eater_egg', + 'wan_ancient_beasts:walker_egg', + 'wan_ancient_beasts:crusher_egg', + 'wan_ancient_beasts:glider_egg', + 'wan_ancient_beasts:soarer_egg', + 'wan_ancient_beasts:surfer_egg', + 'wan_ancient_beasts:frozen_ancient_meat', + 'wan_ancient_beasts:raw_ancient_meat', + 'wan_ancient_beasts:cooked_ancient_meat', + //'wan_ancient_beasts:sniff_armor_trim_smithing_template', + //'wan_ancient_beasts:spike_armor_trim_smithing_template', + 'wan_ancient_beasts:jaw_pottery_sherd', + 'wan_ancient_beasts:spike_pottery_sherd', + 'wan_ancient_beasts:stroll_pottery_sherd', + 'wan_ancient_beasts:beak_pottery_sherd', + 'wan_ancient_beasts:fall_pottery_sherd', + 'wan_ancient_beasts:fossil_pottery_sherd', + 'wan_ancient_beasts:tide_pottery_sherd', + 'wan_ancient_beasts:white_hang_glider', + 'wan_ancient_beasts:light_gray_hang_glider', + 'wan_ancient_beasts:gray_hang_glider', + 'wan_ancient_beasts:black_hang_glider', + 'wan_ancient_beasts:brown_hang_glider', + 'wan_ancient_beasts:red_hang_glider', + 'wan_ancient_beasts:orange_hang_glider', + 'wan_ancient_beasts:yellow_hang_glider', + 'wan_ancient_beasts:lime_hang_glider', + 'wan_ancient_beasts:green_hang_glider', + 'wan_ancient_beasts:light_blue_hang_glider', + 'wan_ancient_beasts:cyan_hang_glider', + 'wan_ancient_beasts:blue_hang_glider', + 'wan_ancient_beasts:purple_hang_glider', + 'wan_ancient_beasts:magenta_hang_glider', + 'wan_ancient_beasts:pink_hang_glider' +] \ No newline at end of file From 3372a085e279da533b731b726e0a21b735031d80 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Aug 2025 11:49:41 +0500 Subject: [PATCH 082/158] Bump devops-infra/action-pull-request in the dependencies group (#1653) Bumps the dependencies group with 1 update: [devops-infra/action-pull-request](https://github.com/devops-infra/action-pull-request). Updates `devops-infra/action-pull-request` from 0.6.0 to 0.6.1 - [Release notes](https://github.com/devops-infra/action-pull-request/releases) - [Commits](https://github.com/devops-infra/action-pull-request/compare/v0.6.0...v0.6.1) --- updated-dependencies: - dependency-name: devops-infra/action-pull-request dependency-version: 0.6.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8fd91a13c..fc28695a2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -252,7 +252,7 @@ jobs: - name: 🔍 Create Pull Request if tag not found if: ${{ steps.check_existing_pr.outputs.exists == 'false' }} - uses: devops-infra/action-pull-request@v0.6.0 + uses: devops-infra/action-pull-request@v0.6.1 with: github_token: ${{ secrets.GITHUB_TOKEN }} source_branch: dev From 59ad85e08f31f36441d272341744e64dd84150ca Mon Sep 17 00:00:00 2001 From: Vincent <43859503+vdegans@users.noreply.github.com> Date: Wed, 20 Aug 2025 00:56:02 +0200 Subject: [PATCH 083/158] FIx deathMessage typo and improve grammar (#1642) * fix deathMessage typo * Some more death message improvements * add new death messages --------- Co-authored-by: Redeix --- config/enhancedvisuals.json | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/config/enhancedvisuals.json b/config/enhancedvisuals.json index 83fdff9ab..a1a6cae18 100644 --- a/config/enhancedvisuals.json +++ b/config/enhancedvisuals.json @@ -1,15 +1,36 @@ { "messages": { "deathMessages": [ - "Do you really want to respawn? think of it again.", - "Life is hard. Deal with it!", - "You are dead ... wait you already know that.", - "Did I let the stove on...?", - "Should have shot back first...", + "Do you really want to respawn?", + "You are dead... wait you already knew that.", + "Did I leave the stove on...?", "Yep, that\u0027s messed up...", - "Rage incomming!", + "Rage incoming!", "I think you dropped something.", - "Time for a break?" + "Time for a break?", + "Should have seen that coming.", + "Progress denied.", + "Another fine day for entropy.", + "Research complete: mortality confirmed.", + "Civilization setback detected.", + "The factory must grow.", + "Another sample in the archaeology record.", + "You\u0027ve been recycled by nature.", + "Respawns remaining: -1", + "Welcome back to square one.", + "A fine addition to the fossil record.", + "Even bronze can\u0027t save you from that.", + "Turns out you are biodegradable.", + "Who knew survival was this complicated?", + "Respawn pending...", + "Sometimes progress means starting over.", + "A slight delay in evolution.", + "Respawn issued, warranty void.", + "Trial run concluded.", + "You\u0027ve been scheduled for maintenance.", + "Progress report: terminated.", + "Nature always collects its debts.", + "A minor inconvenience in the grand scheme of things." ], "enabled": true } From 75d497ad5da5b5ebd7f5d7e205a61544e639e0c0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 20 Aug 2025 23:37:31 +0100 Subject: [PATCH 084/158] with great power comes great responsibility --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f6cb7615..b7c21a8d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Rebalance Large Solar Array to make Mk2 circuit 2 viable, and buffed to LSA Mk3 circuit 2 (#1591) @TomPlop - Added mechanical press recipes to weld weak steels @Pyritie - Added backpacks, lunchboxes, and vessels to the toolbelt's blacklist @Pyritie +- Toolbelt no longer has a max number of item slots, but of course use this responsibly so you don't chunkban yourself @Pyritie - Moon rabbits can eat chorus fruit now @Pyritie - Added electric greenhouse recipes for mushrooms and bamboo (#1610) @Pyritie - Increased amount of saplings that the electric greenhouse returns to be more in line with create-based tree farms @Pyritie From 3f3e1133c2f90cef44319525ab2097818f2512a6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 00:12:09 +0100 Subject: [PATCH 085/158] false alarm --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7c21a8d2..1f6cb7615 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,6 @@ - Rebalance Large Solar Array to make Mk2 circuit 2 viable, and buffed to LSA Mk3 circuit 2 (#1591) @TomPlop - Added mechanical press recipes to weld weak steels @Pyritie - Added backpacks, lunchboxes, and vessels to the toolbelt's blacklist @Pyritie -- Toolbelt no longer has a max number of item slots, but of course use this responsibly so you don't chunkban yourself @Pyritie - Moon rabbits can eat chorus fruit now @Pyritie - Added electric greenhouse recipes for mushrooms and bamboo (#1610) @Pyritie - Increased amount of saplings that the electric greenhouse returns to be more in line with create-based tree farms @Pyritie From cd085be512e4a2bd7ff1f5aacb10b5d8239f852c Mon Sep 17 00:00:00 2001 From: Redeix Date: Thu, 21 Aug 2025 00:27:42 -0500 Subject: [PATCH 086/158] Updated tooltip file to use lang strings (#1663) --- kubejs/assets/tfg/lang/en_us.json | 34 ++++++++++ kubejs/client_scripts/tooltips.js | 101 +++++++++++++++--------------- 2 files changed, 86 insertions(+), 49 deletions(-) diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index d6ee13eaa..8670c0a70 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -744,6 +744,40 @@ "tfg.tooltip.food_trait.refrigerating": "§bRefrigerating", "tfg.tooltip.foodtrait.freeze_dried": "Cryodesiccated", "tfg.tooltip.extraterrestrial_farming": "§4Temperature:§r An oxygenated environment provides 15°C", + "tfg.tooltip.nametag": "§7Used on a Scribing Table along with an item to name it, or with black dye to name the tag.", + "tfg.tooltip.yeast_starter": "§7Created with dried fruit", + "tfg.tooltip.beehive": "§7Needs to be filled with empty frames and surrounded by flowers to attract bees.", + "tfg.tooltip.obsolete.tree_tap": "§4Obsolete§f: Replaced by the AFC TreeTap, you can craft it from this one by placing this in a crafting table!", + "tfg.tooltip.obsolete.fridge": "§4Obsolete§f: Replaced by the TFG Refrigerator, you can craft it from this one by placing this in a crafting table!", + "tfg.tooltip.blaze_burner": "§cSuperheat§r §7with Coke, Anthracite, or Flawless and Exquisite coal gems.", + "tfg.tooltip.machine.perfect_overclock": "This machine has §2Perfect Overclocking§r!", + "tfg.tooltip.nether_dome_1": "§7Artificial enviroment to simulate the Nether.", + "tfg.tooltip.machine.customize_interior": "§7The interior is customizable! Check the multiblock preview in JEI.", + "tfg.tooltip.end_dome_1": "§7Artificial enviroment to simulate the End.", + "tfg.tooltip.armor.copper_diving_suit_warmth": "§7Warmth: -1", + "tfg.tooltip.armor.copper_diving_suit_insulation": "§7Insulation: +1", + "tfg.tooltip.armor.netherite_diving_suit_warmth": "§7Warmth: -2", + "tfg.tooltip.armor.netherite_diving_suit_insulation": "§7Insulation: +9", + "tfg.tooltip.armor.netherite_diving_suit_set": "§7Wear the full set to be §eHeatproof§7 from ambient temperatures.", + "tfg.tooltip.armor.nanomuscle_warmth": "§7Warmth: 0", + "tfg.tooltip.armor.nanomuscle_insulation": "§7Insulation: +10", + "tfg.tooltip.armor.nanomuscle_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", + "tfg.tooltip.armor.quarktech_warmth": "§7Warmth: 0", + "tfg.tooltip.armor.quarktech_insulation": "§7Insulation: +10", + "tfg.tooltip.armor.quarktech_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", + "tfg.tooltip.armor.space_suit_warmth": "§7Warmth: 0", + "tfg.tooltip.armor.space_suit_insulation": "§7Insulation: +10", + "tfg.tooltip.armor.space_suit_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", + "tfg.tooltip.support.tier1": "§79 x 5 x 9", + "tfg.tooltip.support.tier2": "§717 x 9 x 17", + "tfg.tooltip.support.tier3": "§733 x 13 x 33", + "tfg.tooltip.vessels": "§cMax: 3024mB", + "tfg.tooltip.solar_panel.single": "Produces §6256 FE/t§r (64 EU/t) on the §6moon§r during the §6day§r", + "tfg.tooltip.solar_panel.large_tier1": "Massive structure producing from §61024 to 4096 EU/t§r on the §6moon§r during the §6day§r", + "tfg.tooltip.solar_panel.large_tier2": "Massive structure producing from §64096 to 16384 EU/t§r on the §6moon§r during the §6day§r", + "tfg.tooltip.solar_panel.large_tier3": "Massive structure producing from §616384 to 65536 EU/t§r on the §6moon§r during the §6day§r", + "tfg.tooltip.petrified_egg": "§7Requires Magma to Incubate", + "tfg.tooltip.obsolete.depreciated": "§cDeprecated, cannot be crafted any more", "entity.tfg.moon_rabbit.male": "Moon Rabbit", "entity.tfg.moon_rabbit.female": "Moon Rabbit", "tfg.tooltip.moon_rabbit_variant.pink": "Pink Fur", diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 538e8d9cf..c54b99749 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -1,137 +1,140 @@ "use strict"; +/** + * @param {Internal.ItemTooltipEventJS} event + */ const registerTooltips = (event) => { - event.addAdvanced(['gtceu:lv_macerator', 'gtceu:mv_macerator', 'gtceu:hp_steam_macerator'], (item, advanced, text) => { - text.add(1, [text.of('§7Only outputs the first slot shown in EMI/JEI until HV.')]) - }) + //Your IDE may say that "item" and "advanced" are never used, but they are required! So dont remove them <3 + event.addAdvanced(['minecraft:name_tag'], (item, advanced, text) => { - text.add(1, [text.of('§7Used on a Scribing Table along with an item to name it, or with black dye to name the tag.')]) + text.add(1, Text.translate('tfg.tooltip.nametag')) }) event.addAdvanced(['firmalife:bucket/yeast_starter'], (item, advanced, text) => { - text.add(1, [text.of('§7Created with dried fruit')]) + text.add(1, Text.translate('tfg.tooltip.yeast_starter')) }) event.addAdvanced(['firmalife:beehive'], (item, advanced, text) => { - text.add(1, [text.of('§7Needs to be filled with empty frames and surrounded by flowers to attract bees.')]) - }) - event.addAdvanced(["treetap:tap"], (item, advanced, text) => { - text.add(1, [text.of("§4Obsolete§f: Replaced by the AFC TreeTap, you can craft it from this one by placing this in a crafting table!")]) - }) - event.addAdvanced(["tfcea:refrigerator"], (item, advanced, text) => { - text.add(1, [text.of("§4Obsolete§f: Replaced by the GregTech Refrigerator, you can craft it from this one by placing this in a crafting table!")]) + text.add(1, Text.translate('tfg.tooltip.beehive')) }) event.addAdvanced(['create:blaze_burner'], (item, advanced, text) => { - text.add(1, text.of('§cSuperheat§r §7with Coke, Anthracite, or Flawless and Exquisite coal gems.')) + text.add(1, Text.translate('tfg.tooltip.blaze_burner')) }) event.addAdvanced(['tfg:electric_greenhouse'], (item, advanced, text) => { - text.add(1, text.of('This machine has a §2Perfect Overclock§r!')), - text.add(2, text.of(`The interior is customizable! Check the multiblock preview in JEI.`)) + text.add(1, Text.translate('tfg.tooltip.machine.perfect_overclock')), + text.add(2, Text.translate('tfg.tooltip.machine.customize_interior')) }) event.addAdvanced(['gtceu:large_chemical_reactor'], (item, advanced, text) => { - text.add(1, text.of('This machine has a §2Perfect Overclock§r!')) + text.add(1, Text.translate('tfg.tooltip.machine.perfect_overclock')) }) event.addAdvanced(['gtceu:nether_dome'], (item, advanced, text) => { - text.add(1, text.of('§7Artificial enviroment to simulate the Nether.')), - text.add(2, text.of(`§7The interior is customizable! Check the multiblock preview in JEI.`)) + text.add(1, Text.translate('tfg.tooltip.nether_dome_1')), + text.add(2, Text.translate('tfg.tooltip.machine.customize_interior')) }) event.addAdvanced(['gtceu:end_dome'], (item, advanced, text) => { - text.add(1, text.of('§7Artificial enviroment to simulate the End.')), - text.add(2, text.of(`§7The interior is customizable! Check the multiblock preview in JEI.`)) + text.add(1, Text.translate('tfg.tooltip.end_dome_1')), + text.add(2, Text.translate('tfg.tooltip.machine.customize_interior')) }) // Insulation event.addAdvanced(['create:copper_diving_helmet', 'create:copper_backtank', 'create:copper_diving_boots'], (item, advanced, text) => { - text.add(1, text.of('§7Warmth: -1')), - text.add(2, text.of('§7Insulation: +1')) + text.add(1, Text.translate('tfg.tooltip.armor.copper_diving_suit_warmth')), + text.add(2, Text.translate('tfg.tooltip.armor.copper_diving_suit_insulation')) }) event.addAdvanced(['create:netherite_diving_helmet', 'create:netherite_backtank', 'create:netherite_diving_boots', 'minecraft:netherite_leggings'], (item, advanced, text) => { - text.add(1, text.of('§7Warmth: -2')), - text.add(2, text.of('§7Insulation: +9')) - text.add(3, text.of('§7Wear the full set to be §eHeatproof§7 from ambient temperatures.')) + text.add(1, Text.translate('tfg.tooltip.armor.netherite_diving_suit_warmth')), + text.add(2, Text.translate('tfg.tooltip.armor.netherite_diving_suit_insulation')) + text.add(3, Text.translate('tfg.tooltip.armor.netherite_diving_suit_set')) }) event.addAdvanced(['gtceu:nanomuscle_helmet', 'gtceu:nanomuscle_chestplate', 'gtceu:nanomuscle_leggings', 'gtceu:nanomuscle_boots', 'gtceu:advanced_nanomuscle_chestplate'], (item, advanced, text) => { - text.add(1, text.of('§7Warmth: 0')), - text.add(2, text.of('§7Insulation: +10')) - text.add(3, text.of('§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.')) + text.add(1, Text.translate('tfg.tooltip.armor.nanomuscle_warmth')), + text.add(2, Text.translate('tfg.tooltip.armor.nanomuscle_insulation')) + text.add(3, Text.translate('tfg.tooltip.armor.nanomuscle_set')) }) event.addAdvanced(['gtceu:quarktech_helmet', 'gtceu:quarktech_chestplate', 'gtceu:quarktech_leggings', 'gtceu:quarktech_boots', 'gtceu:advanced_quarktech_chestplate'], (item, advanced, text) => { - text.add(1, text.of('§7Warmth: 0')), - text.add(2, text.of('§7Insulation: +10')) - text.add(3, text.of('§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.')) + text.add(1, Text.translate('tfg.tooltip.armor.quarktech_warmth')), + text.add(2, Text.translate('tfg.tooltip.armor.quarktech_insulation')) + text.add(3, Text.translate('tfg.tooltip.armor.quarktech_set')) }) event.addAdvanced([ 'ad_astra:space_helmet', 'ad_astra:space_suit', 'ad_astra:space_pants', 'ad_astra:space_boots', 'ad_astra:netherite_space_helmet', 'ad_astra:netherite_space_suit', 'ad_astra:netherite_space_pants', 'ad_astra:netherite_space_boots', 'ad_astra:jet_suit_helmet', 'ad_astra:jet_suit', 'ad_astra:jet_suit_pants', 'ad_astra:jet_suit_boots' ], (item, advanced, text) => { - text.add(1, text.of('§7Warmth: 0')), - text.add(2, text.of('§7Insulation: +10')) - text.add(3, text.of('§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.')) + text.add(1, Text.translate('tfg.tooltip.armor.space_suit_warmth')), + text.add(2, Text.translate('tfg.tooltip.armor.space_suit_insulation')) + text.add(3, Text.translate('tfg.tooltip.armor.space_suit_set')) }) // Supports global.TFC_WOOD_TYPES.forEach(wood => { event.addAdvanced([`tfc:wood/support/${wood}`], (item, advanced, text) => { - text.add(1, text.of('§79 x 5 x 9')) + text.add(1, Text.translate('tfg.tooltip.support.tier1')) }) }) global.AFC_WOOD_TYPES.forEach(wood => { event.addAdvanced([`afc:wood/support/${wood}`], (item, advanced, text) => { - text.add(1, text.of('§79 x 5 x 9')) + text.add(1, Text.translate('tfg.tooltip.support.tier1')) }) }) global.AD_ASTRA_WOOD.forEach(wood => { event.addAdvanced([`tfg:${wood.name}_support`], (item, advanced, text) => { - text.add(1, text.of('§79 x 5 x 9')) + text.add(1, Text.translate('tfg.tooltip.support.tier1')) }) }) event.addAdvanced(['tfg:light_concrete_support', 'tfg:dark_concrete_support', 'tfg:rebar_support'], (item, advanced, text) => { - text.add(1, text.of('§717 x 9 x 17')) + text.add(1, Text.translate('tfg.tooltip.support.tier2')) }) event.addAdvanced(['tfg:reinforced_light_concrete_support', 'tfg:reinforced_dark_concrete_support', 'tfg:steel_support'], (item, advanced, text) => { - text.add(1, text.of('§733 x 13 x 33')) + text.add(1, Text.translate('tfg.tooltip.support.tier3')) }) const other_stone = ['pyroxenite', 'migmatite', 'travertine'] const stone_types = global.TFC_STONE_TYPES.concat(other_stone) stone_types.forEach(stone => { event.addAdvanced([`tfg:${stone}_support`], (item, advanced, text) => { - text.add(1, text.of('§79 x 5 x 9')) + text.add(1, Text.translate('tfg.tooltip.support.tier1')) }) }) // Vessels event.addAdvanced(['#tfc:fired_vessels'], (item, advanced, text) => { - text.add(1, text.of('§cMax: 3024mB')) + text.add(1, Text.translate('tfg.tooltip.vessels')) }) // Solar Panel event.addAdvanced(['ad_astra:solar_panel'], (item, advanced, text) => { - text.add(1, text.of('Produces §6256 FE/t§r (64 EU/t) on the §6moon§r during the §6day§r')) + text.add(1, Text.translate('tfg.tooltip.solar_panel.single')) }) event.addAdvanced(['gtceu:large_solar_panel'], (item, advanced, text) => { - text.add(1, text.of('Massive structure producing from §61024 to 4096 EU/t§r on the §6moon§r during the §6day§r')) + text.add(1, Text.translate('tfg.tooltip.solar_panel.large_tier1')) }) event.addAdvanced(['gtceu:large_solar_panel_tier2'], (item, advanced, text) => { - text.add(1, text.of('Massive structure producing from §64096 to 16384 EU/t§r on the §6moon§r during the §6day§r')) + text.add(1, Text.translate('tfg.tooltip.solar_panel.large_tier2')) }) event.addAdvanced(['gtceu:large_solar_panel_tier3'], (item, advanced, text) => { - text.add(1, text.of('Massive structure producing from §616384 to 65536 EU/t§r on the §6moon§r during the §6day§r')) + text.add(1, Text.translate('tfg.tooltip.solar_panel.large_tier3')) }) // Mars Animals event.addAdvanced(['species:petrified_egg'], (item, advanced, text) => { - text.add(1, text.of("§7Requires Magma to Incubate")) + text.add(1, Text.translate('tfg.tooltip.petrified_egg')) }) - // MEGA Deprecated 0.10 + //#region Deprecated Items event.addAdvanced(['#megacells:mega_interface'], (item, advanced, text) => { - text.add(1, text.of('§cDeprecated, cannot be crafted any more')) + text.add(1, Text.translate('tfg.tooltip.obsolete.depreciated')) }) event.addAdvanced(['#megacells:mega_pattern_provider'], (item, advanced, text) => { - text.add(1, text.of('§cDeprecated, cannot be crafted any more')) + text.add(1, Text.translate('tfg.tooltip.obsolete.depreciated')) }) + event.addAdvanced(["treetap:tap"], (item, advanced, text) => { + text.add(1, Text.translate('tfg.tooltip.obsolete.tree_tap')) + }) + event.addAdvanced(["tfcea:refrigerator"], (item, advanced, text) => { + text.add(1, Text.translate('tfg.tooltip.obsolete.fridge')) + }) + //#endregion } \ No newline at end of file From 2f4b9fa9546d49ab54863c29b9e3b1fe0e046154 Mon Sep 17 00:00:00 2001 From: Redeix Date: Thu, 21 Aug 2025 02:33:46 -0500 Subject: [PATCH 087/158] Feature/quick fixes (#1664) * Some reflector block fixes * Trim tool changes * Added rose gold alloy smelter recipes --- .../tfg/models/block/reflector_day_1.json | 90 +++ .../tfg/models/block/reflector_day_2.json | 90 +++ .../tfg/models/block/reflector_day_3.json | 90 +++ .../tfg/models/block/reflector_night.json | 601 +----------------- kubejs/server_scripts/tfc/recipes.metals.js | 22 + .../tfg/json_tool.armor_trim.js | 365 +++++------ 6 files changed, 481 insertions(+), 777 deletions(-) diff --git a/kubejs/assets/tfg/models/block/reflector_day_1.json b/kubejs/assets/tfg/models/block/reflector_day_1.json index 0322e6dc6..d9a01c54c 100644 --- a/kubejs/assets/tfg/models/block/reflector_day_1.json +++ b/kubejs/assets/tfg/models/block/reflector_day_1.json @@ -11,6 +11,8 @@ { "from": [0, 0, 0], "to": [16, 16, 16], + "shade": false, + "light_emission": 15, "faces": { "north": {"uv": [0, 12, 4, 16], "texture": "#1"}, "east": {"uv": [0, 12, 4, 16], "texture": "#1"}, @@ -23,6 +25,8 @@ { "from": [-15, -16, -10.8], "to": [-12, -0.1, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-28, 5.9, -12.8]}, "faces": { "north": {"uv": [11, 5.5, 11.75, 9.5], "texture": "#1"}, @@ -36,6 +40,8 @@ { "from": [-12, -16, -10.8], "to": [-9, 4.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-25, 5.9, -12.8]}, "faces": { "north": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, @@ -49,6 +55,8 @@ { "from": [-9, -16, -10.8], "to": [-6, 8.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-22, 5.9, -12.8]}, "faces": { "north": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, @@ -62,6 +70,8 @@ { "from": [-6, -16, -10.8], "to": [-3, 12.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-19, 5.9, -12.8]}, "faces": { "north": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, @@ -75,6 +85,8 @@ { "from": [-3, -16, -10.8], "to": [0, 16.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-16, 5.9, -12.8]}, "faces": { "north": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, @@ -88,6 +100,8 @@ { "from": [28, -16, -10.8], "to": [31, -0.1, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [44, 5.9, -12.8]}, "faces": { "north": {"uv": [11.75, 5.5, 11, 9.5], "texture": "#1"}, @@ -101,6 +115,8 @@ { "from": [25, -16, -10.8], "to": [28, 4.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [41, 5.9, -12.8]}, "faces": { "north": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, @@ -114,6 +130,8 @@ { "from": [22, -16, -10.8], "to": [25, 8.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [38, 5.9, -12.8]}, "faces": { "north": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, @@ -127,6 +145,8 @@ { "from": [19, -16, -10.8], "to": [22, 12.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [35, 5.9, -12.8]}, "faces": { "north": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, @@ -140,6 +160,8 @@ { "from": [16, -16, -10.8], "to": [19, 16.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [32, 5.9, -12.8]}, "faces": { "north": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, @@ -153,6 +175,8 @@ { "from": [0, -16, -10.8], "to": [16, 21.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [0, 5.9, -12.8]}, "faces": { "north": {"uv": [4, 0, 8, 9.5], "texture": "#1"}, @@ -166,6 +190,8 @@ { "from": [-15, -16, 26.8], "to": [-12, -0.1, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-28, 5.9, 28.8]}, "faces": { "north": {"uv": [11, 3.75, 11.75, 9.5], "texture": "#1"}, @@ -179,6 +205,8 @@ { "from": [-12, -16, 26.8], "to": [-9, 4.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-25, 5.9, 28.8]}, "faces": { "north": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, @@ -192,6 +220,8 @@ { "from": [-9, -16, 26.8], "to": [-6, 8.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-22, 5.9, 28.8]}, "faces": { "north": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, @@ -205,6 +235,8 @@ { "from": [-6, -16, 26.8], "to": [-3, 12.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-19, 5.9, 28.8]}, "faces": { "north": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, @@ -218,6 +250,8 @@ { "from": [-3, -16, 26.8], "to": [0, 16.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-16, 5.9, 28.8]}, "faces": { "north": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, @@ -231,6 +265,8 @@ { "from": [28, -16, 26.8], "to": [31, -0.1, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [44, 5.9, 28.8]}, "faces": { "north": {"uv": [11.75, 3.75, 11, 9.5], "texture": "#1"}, @@ -244,6 +280,8 @@ { "from": [25, -16, 26.8], "to": [28, 4.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [41, 5.9, 28.8]}, "faces": { "north": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, @@ -257,6 +295,8 @@ { "from": [22, -16, 26.8], "to": [25, 8.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [38, 5.9, 28.8]}, "faces": { "north": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, @@ -270,6 +310,8 @@ { "from": [19, -16, 26.8], "to": [22, 12.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [35, 5.9, 28.8]}, "faces": { "north": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, @@ -283,6 +325,8 @@ { "from": [16, -16, 26.8], "to": [19, 16.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [32, 5.9, 28.8]}, "faces": { "north": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, @@ -296,6 +340,8 @@ { "from": [0, -16, 26.8], "to": [16, 21.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [0, 5.9, 28.8]}, "faces": { "north": {"uv": [8, 0, 4, 9.5], "texture": "#1"}, @@ -309,6 +355,8 @@ { "from": [-10.7, -16, -15], "to": [-10.7, -0.1, -12], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -28]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -322,6 +370,8 @@ { "from": [-10.7, -16, 16], "to": [-10.7, 16.9, 19], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 32]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -335,6 +385,8 @@ { "from": [-10.7, -16, 19], "to": [-10.7, 12.9, 22], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 35]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -348,6 +400,8 @@ { "from": [-10.7, -16, 22], "to": [-10.7, 8.9, 25], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 38]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -361,6 +415,8 @@ { "from": [-10.7, -16, 25], "to": [-10.7, 4.9, 28], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 41]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -374,6 +430,8 @@ { "from": [-10.7, -16, 28], "to": [-10.7, -0.1, 31], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 44]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -387,6 +445,8 @@ { "from": [-10.7, -16, -12], "to": [-10.7, 4.9, -9], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -25]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -400,6 +460,8 @@ { "from": [-10.7, -16, -9], "to": [-10.7, 8.9, -6], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -22]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -413,6 +475,8 @@ { "from": [-10.7, -16, -6], "to": [-10.7, 12.9, -3], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -19]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -426,6 +490,8 @@ { "from": [-10.7, -16, -3], "to": [-10.7, 16.9, 0], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -16]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -439,6 +505,8 @@ { "from": [-10.7, -16, 0], "to": [-10.7, 21.9, 16], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 0]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -452,6 +520,8 @@ { "from": [26.7, -16, -15], "to": [26.7, -0.1, -12], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -28]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -465,6 +535,8 @@ { "from": [26.7, -16, 16], "to": [26.7, 16.9, 19], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 32]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -478,6 +550,8 @@ { "from": [26.7, -16, 19], "to": [26.7, 12.9, 22], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 35]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -491,6 +565,8 @@ { "from": [26.7, -16, 22], "to": [26.7, 8.9, 25], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 38]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -504,6 +580,8 @@ { "from": [26.7, -16, 25], "to": [26.7, 4.9, 28], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 41]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -517,6 +595,8 @@ { "from": [26.7, -16, 28], "to": [26.7, -0.1, 31], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 44]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -530,6 +610,8 @@ { "from": [26.7, -16, -12], "to": [26.7, 4.9, -9], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -25]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -543,6 +625,8 @@ { "from": [26.7, -16, -9], "to": [26.7, 8.9, -6], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -22]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -556,6 +640,8 @@ { "from": [26.7, -16, -6], "to": [26.7, 12.9, -3], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -19]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -569,6 +655,8 @@ { "from": [26.7, -16, -3], "to": [26.7, 16.9, 0], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -16]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -582,6 +670,8 @@ { "from": [26.7, -16, 0], "to": [26.7, 21.9, 16], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 0]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, diff --git a/kubejs/assets/tfg/models/block/reflector_day_2.json b/kubejs/assets/tfg/models/block/reflector_day_2.json index ce700036f..e2d493b06 100644 --- a/kubejs/assets/tfg/models/block/reflector_day_2.json +++ b/kubejs/assets/tfg/models/block/reflector_day_2.json @@ -11,6 +11,8 @@ { "from": [0, 0, 0], "to": [16, 16, 16], + "shade": false, + "light_emission": 15, "faces": { "north": {"uv": [0, 12, 4, 16], "texture": "#1"}, "east": {"uv": [0, 12, 4, 16], "texture": "#1"}, @@ -23,6 +25,8 @@ { "from": [-15, -16, -10.8], "to": [-12, -0.1, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-28, 5.9, -12.8]}, "faces": { "north": {"uv": [11, 5.5, 11.75, 9.5], "texture": "#1"}, @@ -36,6 +40,8 @@ { "from": [-12, -16, -10.8], "to": [-9, 4.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-25, 5.9, -12.8]}, "faces": { "north": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, @@ -49,6 +55,8 @@ { "from": [-9, -16, -10.8], "to": [-6, 8.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-22, 5.9, -12.8]}, "faces": { "north": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, @@ -62,6 +70,8 @@ { "from": [-6, -16, -10.8], "to": [-3, 12.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-19, 5.9, -12.8]}, "faces": { "north": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, @@ -75,6 +85,8 @@ { "from": [-3, -16, -10.8], "to": [0, 16.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-16, 5.9, -12.8]}, "faces": { "north": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, @@ -88,6 +100,8 @@ { "from": [28, -16, -10.8], "to": [31, -0.1, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [44, 5.9, -12.8]}, "faces": { "north": {"uv": [11.75, 5.5, 11, 9.5], "texture": "#1"}, @@ -101,6 +115,8 @@ { "from": [25, -16, -10.8], "to": [28, 4.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [41, 5.9, -12.8]}, "faces": { "north": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, @@ -114,6 +130,8 @@ { "from": [22, -16, -10.8], "to": [25, 8.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [38, 5.9, -12.8]}, "faces": { "north": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, @@ -127,6 +145,8 @@ { "from": [19, -16, -10.8], "to": [22, 12.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [35, 5.9, -12.8]}, "faces": { "north": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, @@ -140,6 +160,8 @@ { "from": [16, -16, -10.8], "to": [19, 16.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [32, 5.9, -12.8]}, "faces": { "north": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, @@ -153,6 +175,8 @@ { "from": [0, -16, -10.8], "to": [16, 21.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [0, 5.9, -12.8]}, "faces": { "north": {"uv": [4, 0, 8, 9.5], "texture": "#1"}, @@ -166,6 +190,8 @@ { "from": [-15, -16, 26.8], "to": [-12, -0.1, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-28, 5.9, 28.8]}, "faces": { "north": {"uv": [11, 3.75, 11.75, 9.5], "texture": "#1"}, @@ -179,6 +205,8 @@ { "from": [-12, -16, 26.8], "to": [-9, 4.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-25, 5.9, 28.8]}, "faces": { "north": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, @@ -192,6 +220,8 @@ { "from": [-9, -16, 26.8], "to": [-6, 8.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-22, 5.9, 28.8]}, "faces": { "north": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, @@ -205,6 +235,8 @@ { "from": [-6, -16, 26.8], "to": [-3, 12.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-19, 5.9, 28.8]}, "faces": { "north": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, @@ -218,6 +250,8 @@ { "from": [-3, -16, 26.8], "to": [0, 16.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-16, 5.9, 28.8]}, "faces": { "north": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, @@ -231,6 +265,8 @@ { "from": [28, -16, 26.8], "to": [31, -0.1, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [44, 5.9, 28.8]}, "faces": { "north": {"uv": [11.75, 3.75, 11, 9.5], "texture": "#1"}, @@ -244,6 +280,8 @@ { "from": [25, -16, 26.8], "to": [28, 4.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [41, 5.9, 28.8]}, "faces": { "north": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, @@ -257,6 +295,8 @@ { "from": [22, -16, 26.8], "to": [25, 8.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [38, 5.9, 28.8]}, "faces": { "north": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, @@ -270,6 +310,8 @@ { "from": [19, -16, 26.8], "to": [22, 12.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [35, 5.9, 28.8]}, "faces": { "north": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, @@ -283,6 +325,8 @@ { "from": [16, -16, 26.8], "to": [19, 16.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [32, 5.9, 28.8]}, "faces": { "north": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, @@ -296,6 +340,8 @@ { "from": [0, -16, 26.8], "to": [16, 21.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [0, 5.9, 28.8]}, "faces": { "north": {"uv": [8, 0, 4, 9.5], "texture": "#1"}, @@ -309,6 +355,8 @@ { "from": [-10.7, -16, -15], "to": [-10.7, -0.1, -12], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -28]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -322,6 +370,8 @@ { "from": [-10.7, -16, 16], "to": [-10.7, 16.9, 19], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 32]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -335,6 +385,8 @@ { "from": [-10.7, -16, 19], "to": [-10.7, 12.9, 22], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 35]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -348,6 +400,8 @@ { "from": [-10.7, -16, 22], "to": [-10.7, 8.9, 25], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 38]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -361,6 +415,8 @@ { "from": [-10.7, -16, 25], "to": [-10.7, 4.9, 28], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 41]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -374,6 +430,8 @@ { "from": [-10.7, -16, 28], "to": [-10.7, -0.1, 31], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 44]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -387,6 +445,8 @@ { "from": [-10.7, -16, -12], "to": [-10.7, 4.9, -9], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -25]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -400,6 +460,8 @@ { "from": [-10.7, -16, -9], "to": [-10.7, 8.9, -6], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -22]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -413,6 +475,8 @@ { "from": [-10.7, -16, -6], "to": [-10.7, 12.9, -3], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -19]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -426,6 +490,8 @@ { "from": [-10.7, -16, -3], "to": [-10.7, 16.9, 0], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -16]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -439,6 +505,8 @@ { "from": [-10.7, -16, 0], "to": [-10.7, 21.9, 16], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 0]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -452,6 +520,8 @@ { "from": [26.7, -16, -15], "to": [26.7, -0.1, -12], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -28]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -465,6 +535,8 @@ { "from": [26.7, -16, 16], "to": [26.7, 16.9, 19], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 32]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -478,6 +550,8 @@ { "from": [26.7, -16, 19], "to": [26.7, 12.9, 22], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 35]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -491,6 +565,8 @@ { "from": [26.7, -16, 22], "to": [26.7, 8.9, 25], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 38]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -504,6 +580,8 @@ { "from": [26.7, -16, 25], "to": [26.7, 4.9, 28], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 41]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -517,6 +595,8 @@ { "from": [26.7, -16, 28], "to": [26.7, -0.1, 31], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 44]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -530,6 +610,8 @@ { "from": [26.7, -16, -12], "to": [26.7, 4.9, -9], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -25]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -543,6 +625,8 @@ { "from": [26.7, -16, -9], "to": [26.7, 8.9, -6], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -22]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -556,6 +640,8 @@ { "from": [26.7, -16, -6], "to": [26.7, 12.9, -3], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -19]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -569,6 +655,8 @@ { "from": [26.7, -16, -3], "to": [26.7, 16.9, 0], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -16]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -582,6 +670,8 @@ { "from": [26.7, -16, 0], "to": [26.7, 21.9, 16], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 0]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, diff --git a/kubejs/assets/tfg/models/block/reflector_day_3.json b/kubejs/assets/tfg/models/block/reflector_day_3.json index 989d7bc01..721465ba9 100644 --- a/kubejs/assets/tfg/models/block/reflector_day_3.json +++ b/kubejs/assets/tfg/models/block/reflector_day_3.json @@ -11,6 +11,8 @@ { "from": [0, 0, 0], "to": [16, 16, 16], + "shade": false, + "light_emission": 15, "faces": { "north": {"uv": [0, 12, 4, 16], "texture": "#1"}, "east": {"uv": [0, 12, 4, 16], "texture": "#1"}, @@ -23,6 +25,8 @@ { "from": [-15, -16, -10.8], "to": [-12, -0.1, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-28, 5.9, -12.8]}, "faces": { "north": {"uv": [11, 5.5, 11.75, 9.5], "texture": "#1"}, @@ -36,6 +40,8 @@ { "from": [-12, -16, -10.8], "to": [-9, 4.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-25, 5.9, -12.8]}, "faces": { "north": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, @@ -49,6 +55,8 @@ { "from": [-9, -16, -10.8], "to": [-6, 8.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-22, 5.9, -12.8]}, "faces": { "north": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, @@ -62,6 +70,8 @@ { "from": [-6, -16, -10.8], "to": [-3, 12.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-19, 5.9, -12.8]}, "faces": { "north": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, @@ -75,6 +85,8 @@ { "from": [-3, -16, -10.8], "to": [0, 16.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-16, 5.9, -12.8]}, "faces": { "north": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, @@ -88,6 +100,8 @@ { "from": [28, -16, -10.8], "to": [31, -0.1, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [44, 5.9, -12.8]}, "faces": { "north": {"uv": [11.75, 5.5, 11, 9.5], "texture": "#1"}, @@ -101,6 +115,8 @@ { "from": [25, -16, -10.8], "to": [28, 4.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [41, 5.9, -12.8]}, "faces": { "north": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, @@ -114,6 +130,8 @@ { "from": [22, -16, -10.8], "to": [25, 8.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [38, 5.9, -12.8]}, "faces": { "north": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, @@ -127,6 +145,8 @@ { "from": [19, -16, -10.8], "to": [22, 12.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [35, 5.9, -12.8]}, "faces": { "north": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, @@ -140,6 +160,8 @@ { "from": [16, -16, -10.8], "to": [19, 16.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [32, 5.9, -12.8]}, "faces": { "north": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, @@ -153,6 +175,8 @@ { "from": [0, -16, -10.8], "to": [16, 21.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [0, 5.9, -12.8]}, "faces": { "north": {"uv": [4, 0, 8, 9.5], "texture": "#1"}, @@ -166,6 +190,8 @@ { "from": [-15, -16, 26.8], "to": [-12, -0.1, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-28, 5.9, 28.8]}, "faces": { "north": {"uv": [11, 3.75, 11.75, 9.5], "texture": "#1"}, @@ -179,6 +205,8 @@ { "from": [-12, -16, 26.8], "to": [-9, 4.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-25, 5.9, 28.8]}, "faces": { "north": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, @@ -192,6 +220,8 @@ { "from": [-9, -16, 26.8], "to": [-6, 8.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-22, 5.9, 28.8]}, "faces": { "north": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, @@ -205,6 +235,8 @@ { "from": [-6, -16, 26.8], "to": [-3, 12.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-19, 5.9, 28.8]}, "faces": { "north": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, @@ -218,6 +250,8 @@ { "from": [-3, -16, 26.8], "to": [0, 16.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-16, 5.9, 28.8]}, "faces": { "north": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, @@ -231,6 +265,8 @@ { "from": [28, -16, 26.8], "to": [31, -0.1, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [44, 5.9, 28.8]}, "faces": { "north": {"uv": [11.75, 3.75, 11, 9.5], "texture": "#1"}, @@ -244,6 +280,8 @@ { "from": [25, -16, 26.8], "to": [28, 4.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [41, 5.9, 28.8]}, "faces": { "north": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, @@ -257,6 +295,8 @@ { "from": [22, -16, 26.8], "to": [25, 8.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [38, 5.9, 28.8]}, "faces": { "north": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, @@ -270,6 +310,8 @@ { "from": [19, -16, 26.8], "to": [22, 12.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [35, 5.9, 28.8]}, "faces": { "north": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, @@ -283,6 +325,8 @@ { "from": [16, -16, 26.8], "to": [19, 16.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [32, 5.9, 28.8]}, "faces": { "north": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, @@ -296,6 +340,8 @@ { "from": [0, -16, 26.8], "to": [16, 21.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [0, 5.9, 28.8]}, "faces": { "north": {"uv": [8, 0, 4, 9.5], "texture": "#1"}, @@ -309,6 +355,8 @@ { "from": [-10.7, -16, -15], "to": [-10.7, -0.1, -12], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -28]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -322,6 +370,8 @@ { "from": [-10.7, -16, 16], "to": [-10.7, 16.9, 19], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 32]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -335,6 +385,8 @@ { "from": [-10.7, -16, 19], "to": [-10.7, 12.9, 22], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 35]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -348,6 +400,8 @@ { "from": [-10.7, -16, 22], "to": [-10.7, 8.9, 25], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 38]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -361,6 +415,8 @@ { "from": [-10.7, -16, 25], "to": [-10.7, 4.9, 28], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 41]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -374,6 +430,8 @@ { "from": [-10.7, -16, 28], "to": [-10.7, -0.1, 31], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 44]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -387,6 +445,8 @@ { "from": [-10.7, -16, -12], "to": [-10.7, 4.9, -9], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -25]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -400,6 +460,8 @@ { "from": [-10.7, -16, -9], "to": [-10.7, 8.9, -6], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -22]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -413,6 +475,8 @@ { "from": [-10.7, -16, -6], "to": [-10.7, 12.9, -3], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -19]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -426,6 +490,8 @@ { "from": [-10.7, -16, -3], "to": [-10.7, 16.9, 0], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -16]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -439,6 +505,8 @@ { "from": [-10.7, -16, 0], "to": [-10.7, 21.9, 16], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 0]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -452,6 +520,8 @@ { "from": [26.7, -16, -15], "to": [26.7, -0.1, -12], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -28]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -465,6 +535,8 @@ { "from": [26.7, -16, 16], "to": [26.7, 16.9, 19], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 32]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -478,6 +550,8 @@ { "from": [26.7, -16, 19], "to": [26.7, 12.9, 22], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 35]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -491,6 +565,8 @@ { "from": [26.7, -16, 22], "to": [26.7, 8.9, 25], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 38]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -504,6 +580,8 @@ { "from": [26.7, -16, 25], "to": [26.7, 4.9, 28], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 41]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -517,6 +595,8 @@ { "from": [26.7, -16, 28], "to": [26.7, -0.1, 31], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 44]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -530,6 +610,8 @@ { "from": [26.7, -16, -12], "to": [26.7, 4.9, -9], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -25]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -543,6 +625,8 @@ { "from": [26.7, -16, -9], "to": [26.7, 8.9, -6], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -22]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -556,6 +640,8 @@ { "from": [26.7, -16, -6], "to": [26.7, 12.9, -3], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -19]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -569,6 +655,8 @@ { "from": [26.7, -16, -3], "to": [26.7, 16.9, 0], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -16]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -582,6 +670,8 @@ { "from": [26.7, -16, 0], "to": [26.7, 21.9, 16], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 0]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, diff --git a/kubejs/assets/tfg/models/block/reflector_night.json b/kubejs/assets/tfg/models/block/reflector_night.json index ad2b8884a..7793a9e71 100644 --- a/kubejs/assets/tfg/models/block/reflector_night.json +++ b/kubejs/assets/tfg/models/block/reflector_night.json @@ -19,578 +19,6 @@ "up": {"uv": [4, 12, 8, 16], "texture": "#1"}, "down": {"uv": [4, 12, 8, 16], "texture": "#1"} } - }, - { - "from": [-15, -16, -10.8], - "to": [-12, -0.1, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [-28, 5.9, -12.8]}, - "faces": { - "north": {"uv": [11, 5.5, 11.75, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [11.75, 3.75, 11, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [-12, -16, -10.8], - "to": [-9, 4.9, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [-25, 5.9, -12.8]}, - "faces": { - "north": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [-9, -16, -10.8], - "to": [-6, 8.9, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [-22, 5.9, -12.8]}, - "faces": { - "north": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [-6, -16, -10.8], - "to": [-3, 12.9, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [-19, 5.9, -12.8]}, - "faces": { - "north": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [-3, -16, -10.8], - "to": [0, 16.9, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [-16, 5.9, -12.8]}, - "faces": { - "north": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [28, -16, -10.8], - "to": [31, -0.1, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [44, 5.9, -12.8]}, - "faces": { - "north": {"uv": [11.75, 5.5, 11, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [11, 3.75, 11.75, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "texture": "#1"} - } - }, - { - "from": [25, -16, -10.8], - "to": [28, 4.9, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [41, 5.9, -12.8]}, - "faces": { - "north": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "texture": "#1"} - } - }, - { - "from": [22, -16, -10.8], - "to": [25, 8.9, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [38, 5.9, -12.8]}, - "faces": { - "north": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "texture": "#1"} - } - }, - { - "from": [19, -16, -10.8], - "to": [22, 12.9, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [35, 5.9, -12.8]}, - "faces": { - "north": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "texture": "#1"} - } - }, - { - "from": [16, -16, -10.8], - "to": [19, 16.9, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [32, 5.9, -12.8]}, - "faces": { - "north": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "texture": "#1"} - } - }, - { - "from": [0, -16, -10.8], - "to": [16, 21.9, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [0, 5.9, -12.8]}, - "faces": { - "north": {"uv": [4, 0, 8, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [4, 0, 8, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [-15, -16, 26.8], - "to": [-12, -0.1, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [-28, 5.9, 28.8]}, - "faces": { - "north": {"uv": [11, 3.75, 11.75, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [11.75, 5.5, 11, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [-12, -16, 26.8], - "to": [-9, 4.9, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [-25, 5.9, 28.8]}, - "faces": { - "north": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [-9, -16, 26.8], - "to": [-6, 8.9, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [-22, 5.9, 28.8]}, - "faces": { - "north": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [-6, -16, 26.8], - "to": [-3, 12.9, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [-19, 5.9, 28.8]}, - "faces": { - "north": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [-3, -16, 26.8], - "to": [0, 16.9, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [-16, 5.9, 28.8]}, - "faces": { - "north": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [28, -16, 26.8], - "to": [31, -0.1, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [44, 5.9, 28.8]}, - "faces": { - "north": {"uv": [11.75, 3.75, 11, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [11, 5.5, 11.75, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "texture": "#1"} - } - }, - { - "from": [25, -16, 26.8], - "to": [28, 4.9, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [41, 5.9, 28.8]}, - "faces": { - "north": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "texture": "#1"} - } - }, - { - "from": [22, -16, 26.8], - "to": [25, 8.9, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [38, 5.9, 28.8]}, - "faces": { - "north": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "texture": "#1"} - } - }, - { - "from": [19, -16, 26.8], - "to": [22, 12.9, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [35, 5.9, 28.8]}, - "faces": { - "north": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "texture": "#1"} - } - }, - { - "from": [16, -16, 26.8], - "to": [19, 16.9, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [32, 5.9, 28.8]}, - "faces": { - "north": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "texture": "#1"} - } - }, - { - "from": [0, -16, 26.8], - "to": [16, 21.9, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [0, 5.9, 28.8]}, - "faces": { - "north": {"uv": [8, 0, 4, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [8, 0, 4, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [-10.7, -16, -15], - "to": [-10.7, -0.1, -12], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -28]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [11, 5.5, 11.75, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [11.75, 5.5, 11, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-10.7, -16, 16], - "to": [-10.7, 16.9, 19], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 32]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-10.7, -16, 19], - "to": [-10.7, 12.9, 22], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 35]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-10.7, -16, 22], - "to": [-10.7, 8.9, 25], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 38]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [10.25, 2.25, 9.5, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-10.7, -16, 25], - "to": [-10.7, 4.9, 28], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 41]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-10.7, -16, 28], - "to": [-10.7, -0.1, 31], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 44]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [11.75, 5.5, 11, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [11, 5.5, 11.75, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-10.7, -16, -12], - "to": [-10.7, 4.9, -9], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -25]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-10.7, -16, -9], - "to": [-10.7, 8.9, -6], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -22]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [9.5, 2.25, 10.25, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-10.7, -16, -6], - "to": [-10.7, 12.9, -3], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -19]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-10.7, -16, -3], - "to": [-10.7, 16.9, 0], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -16]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-10.7, -16, 0], - "to": [-10.7, 21.9, 16], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 0]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [8, 0, 4, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [8, 0, 4, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, -15], - "to": [26.7, -0.1, -12], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -28]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [11, 5.5, 11.75, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [11.75, 5.5, 11, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, 16], - "to": [26.7, 16.9, 19], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 32]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, 19], - "to": [26.7, 12.9, 22], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 35]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, 22], - "to": [26.7, 8.9, 25], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 38]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [9.5, 2.25, 10.25, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, 25], - "to": [26.7, 4.9, 28], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 41]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, 28], - "to": [26.7, -0.1, 31], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 44]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [11.75, 5.5, 11, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [11, 5.5, 11.75, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, -12], - "to": [26.7, 4.9, -9], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -25]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, -9], - "to": [26.7, 8.9, -6], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -22]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [10.25, 2.25, 9.5, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, -6], - "to": [26.7, 12.9, -3], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -19]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, -3], - "to": [26.7, 16.9, 0], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -16]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, 0], - "to": [26.7, 21.9, 16], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 0]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [4, 0, 8, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [4, 0, 8, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } } ], "display": { @@ -623,32 +51,5 @@ "fixed": { "scale": [0.5, 0.5, 0.5] } - }, - "groups": [ - 0, - { - "name": "ray1", - "origin": [-28, 5.9, -12.8], - "color": 0, - "children": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] - }, - { - "name": "ray2", - "origin": [-28, 5.9, -12.8], - "color": 0, - "children": [12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22] - }, - { - "name": "ray3", - "origin": [-28, 5.9, -12.8], - "color": 0, - "children": [23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33] - }, - { - "name": "ray3", - "origin": [-28, 5.9, -12.8], - "color": 0, - "children": [34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44] - } - ] + } } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/recipes.metals.js b/kubejs/server_scripts/tfc/recipes.metals.js index 0a005c29c..ec358a554 100644 --- a/kubejs/server_scripts/tfc/recipes.metals.js +++ b/kubejs/server_scripts/tfc/recipes.metals.js @@ -200,6 +200,28 @@ function registerTFCMetalsRecipes(event) { .duration(700) .EUt(4) + // Rose Gold + const copper_types = [ + "#forge:ingots/copper", + "#forge:dusts/copper", + "#forge:ingots/annealed_copper", + "#forge:dusts/annealed_copper" + ]; + const gold_types = [ + "#forge:ingots/gold", + "#forge:dusts/gold" + ]; + + copper_types.forEach(copper_types_array => { + gold_types.forEach(gold_types_array => { + event.recipes.gtceu.alloy_smelter(`rose_gold_from_${copper_types_array.replace(/:/g, "/").replace(/#/g, "")}_and_${gold_types_array.replace(/:/g, "/").replace(/#/g, "")}`) + .itemInputs(Ingredient.of(copper_types_array).withCount(1), Ingredient.of(gold_types_array).withCount(4)) + .itemOutputs(ChemicalHelper.get(TagPrefix.ingot, GTMaterials.RoseGold, 5)) + .duration(20*10) + .EUt(GTValues.VA[GTValues.LV]) + }) + }); + const TFC_INTERMEDIATE_METALS = [ { metal: 'pig_iron', meltTemp: 1535 }, diff --git a/kubejs/server_scripts/tfg/json_tool.armor_trim.js b/kubejs/server_scripts/tfg/json_tool.armor_trim.js index 813fb4143..4f66e02ce 100644 --- a/kubejs/server_scripts/tfg/json_tool.armor_trim.js +++ b/kubejs/server_scripts/tfg/json_tool.armor_trim.js @@ -2,63 +2,67 @@ //priority: 0 "use strict"; +/* + * Set this const to true only when you need to run the tool because you added a new material. + * It does not need to be enabled all the time. + */ +const enableTool = false; + //#region Assign materials -////////////////////////////// -////////////////////////////// //Assign a new material here with the name of the material, the hex color for the name display, the item id that is used during smithing, and an index number that should be !!!unique!!! const materials = [ //Gems - {materialName: 'almandine_tfc', nameColor: '#7b1112', itemName: 'gtceu:exquisite_almandine_gem', indexNumber: 0.11, lang_en_us: 'Almandine'}, - {materialName: 'andradite_tfc', nameColor: '#c29d1e', itemName: 'gtceu:exquisite_andradite_gem', indexNumber: 0.12, lang_en_us: 'Andradite'}, - {materialName: 'blue_topaz_tfc', nameColor: '#a7c1c6', itemName: 'gtceu:exquisite_blue_topaz_gem', indexNumber: 0.13, lang_en_us: 'Blue Topaz'}, - {materialName: 'cinnabar_tfc', nameColor: '#c2274a', itemName: 'gtceu:exquisite_cinnabar_gem', indexNumber: 0.14, lang_en_us: 'Cinnabar'}, - {materialName: 'coal_tfc', nameColor: '#2b2f32', itemName: 'gtceu:exquisite_coal_gem', indexNumber: 0.15, lang_en_us: 'Coal'}, - {materialName: 'diamond_tfc', nameColor: '#98c2c6', itemName: 'gtceu:exquisite_diamond_gem', indexNumber: 0.16, lang_en_us: 'Diamond'}, - {materialName: 'emerald_tfc', nameColor: '#11c254', itemName: 'gtceu:exquisite_emerald_gem', indexNumber: 0.17, lang_en_us: 'Emerald'}, - {materialName: 'green_sapphire_tfc', nameColor: '#75af89', itemName: 'gtceu:exquisite_green_sapphire_gem', indexNumber: 0.18, lang_en_us: 'Green Sapphire'}, - {materialName: 'grossular_tfc', nameColor: '#c28b5c', itemName: 'gtceu:exquisite_grossular_gem', indexNumber: 0.19, lang_en_us: 'Grossular'}, - {materialName: 'rutile_tfc', nameColor: '#681c05', itemName: 'gtceu:exquisite_rutile_gem', indexNumber: 0.191, lang_en_us: 'Rutile'}, - {materialName: 'lazurite_tfc', nameColor: '#1e29bb', itemName: 'gtceu:exquisite_lazurite_gem', indexNumber: 0.192, lang_en_us: 'Lazurite'}, - {materialName: 'pyrope_tfc', nameColor: '#b11344', itemName: 'gtceu:exquisite_pyrope_gem', indexNumber: 0.193, lang_en_us: 'Pyrope'}, - {materialName: 'rock_salt_tfc', nameColor: '#c2b2af', itemName: 'gtceu:exquisite_rock_salt_gem', indexNumber: 0.194, lang_en_us: 'Rock Salt'}, - {materialName: 'ruby_tfc', nameColor: '#a41b0c', itemName: 'gtceu:exquisite_ruby_gem', indexNumber: 0.195, lang_en_us: 'Ruby'}, - {materialName: 'salt_tfc', nameColor: '#bebec2', itemName: 'gtceu:exquisite_salt_gem', indexNumber: 0.196, lang_en_us: 'salt'}, - {materialName: 'sapphire_tfc', nameColor: '#2628b0', itemName: 'gtceu:exquisite_sapphire_gem', indexNumber: 0.197, lang_en_us: 'Sapphire'}, - {materialName: 'sodalite_tfc', nameColor: '#2e40c6', itemName: 'gtceu:exquisite_sodalite_gem', indexNumber: 0.198, lang_en_us: 'Sodalite'}, - {materialName: 'coke_tfc', nameColor: '#424847', itemName: 'gtceu:exquisite_coke_gem', indexNumber: 0.199, lang_en_us: 'Coke'}, - {materialName: 'spessartine_tfc', nameColor: '#c28017', itemName: 'gtceu:exquisite_spessartine_gem', indexNumber: 0.181, lang_en_us: 'Spessartine'}, - {materialName: 'topaz_tfc', nameColor: '#b1a42d', itemName: 'gtceu:exquisite_topaz_gem', indexNumber: 0.182, lang_en_us: 'Topaz'}, - {materialName: 'uvarovite_tfc', nameColor: '#22b43b', itemName: 'gtceu:exquisite_uvarovite_gem', indexNumber: 0.183, lang_en_us: 'Uvarovite'}, - {materialName: 'nether_quartz_tfc', nameColor: '#bdb6b0', itemName: 'gtceu:exquisite_nether_quartz_gem', indexNumber: 0.184, lang_en_us: 'Nether Quartz'}, - {materialName: 'certus_quartz_tfc', nameColor: '#8ca4c4', itemName: 'gtceu:exquisite_certus_quartz_gem', indexNumber: 0.185, lang_en_us: 'Certus Quartz'}, - {materialName: 'quartzite_tfc', nameColor: '#b8bab8', itemName: 'gtceu:exquisite_quartzite_gem', indexNumber: 0.186, lang_en_us: 'Quartzite'}, - {materialName: 'realgar_tfc', nameColor: '#c22e28', itemName: 'gtceu:exquisite_realgar_gem', indexNumber: 0.187, lang_en_us: 'Realgar'}, - {materialName: 'malachite_tfc', nameColor: '#00b789', itemName: 'gtceu:exquisite_malachite_gem', indexNumber: 0.188, lang_en_us: 'Malachite'}, - {materialName: 'glass_tfc', nameColor: '#c2c2c6', itemName: 'gtceu:exquisite_glass_gem', indexNumber: 0.189, lang_en_us: 'Glass'}, - {materialName: 'olivine_tfc', nameColor: '#7fad03', itemName: 'gtceu:exquisite_olivine_gem', indexNumber: 0.171, lang_en_us: 'Olivine'}, - {materialName: 'opal_tfc', nameColor: '#bdadb6', itemName: 'gtceu:exquisite_opal_gem', indexNumber: 0.172, lang_en_us: 'Opal'}, - {materialName: 'amethyst_tfc', nameColor: '#9b78ba', itemName: 'gtceu:exquisite_amethyst_gem', indexNumber: 0.173, lang_en_us: 'Amethyst'}, - // {materialName: 'echo_shard_tfc', nameColor: '#002123', itemName: 'gtceu:exquisite_echo_shard_gem', indexNumber: 0.174, lang_en_us: 'Echo Shard'}, // disabled - {materialName: 'lapis_tfc', nameColor: '#6581c6', itemName: 'gtceu:exquisite_lapis_gem', indexNumber: 0.175, lang_en_us: 'Lapis'}, - {materialName: 'apatite_tfc', nameColor: '#059cbb', itemName: 'gtceu:exquisite_apatite_gem', indexNumber: 0.176, lang_en_us: 'Apatite'}, - {materialName: 'red_garnet_tfc', nameColor: '#710910', itemName: 'gtceu:exquisite_red_garnet_gem', indexNumber: 0.177, lang_en_us: 'Red Garnet'}, - {materialName: 'yellow_garnet_tfc', nameColor: '#bbc207', itemName: 'gtceu:exquisite_yellow_garnet_gem', indexNumber: 0.178, lang_en_us: 'Yellow Garnet'}, - {materialName: 'monazite_tfc', nameColor: '#9eb576', itemName: 'gtceu:exquisite_monazite_gem', indexNumber: 0.179, lang_en_us: 'Monazite'}, - {materialName: 'rose_quartz_tfc', nameColor: '#ba3458', itemName: 'gtceu:exquisite_rose_quartz_gem', indexNumber: 0.161, lang_en_us: 'Rose Quartz'}, - {materialName: 'fluix_tfc', nameColor: '#53458d', itemName: 'tfg:exquisite_fluix_gem', indexNumber: 0.162, lang_en_us: 'Fluix'}, + {materialName: 'almandine_tfc', nameColor: '#7b1112', itemName: 'gtceu:exquisite_almandine_gem', indexNumber: 0.11}, + {materialName: 'andradite_tfc', nameColor: '#c29d1e', itemName: 'gtceu:exquisite_andradite_gem', indexNumber: 0.12}, + {materialName: 'blue_topaz_tfc', nameColor: '#a7c1c6', itemName: 'gtceu:exquisite_blue_topaz_gem', indexNumber: 0.13}, + {materialName: 'cinnabar_tfc', nameColor: '#c2274a', itemName: 'gtceu:exquisite_cinnabar_gem', indexNumber: 0.14}, + {materialName: 'coal_tfc', nameColor: '#2b2f32', itemName: 'gtceu:exquisite_coal_gem', indexNumber: 0.15}, + {materialName: 'diamond_tfc', nameColor: '#98c2c6', itemName: 'gtceu:exquisite_diamond_gem', indexNumber: 0.16}, + {materialName: 'emerald_tfc', nameColor: '#11c254', itemName: 'gtceu:exquisite_emerald_gem', indexNumber: 0.17}, + {materialName: 'green_sapphire_tfc', nameColor: '#75af89', itemName: 'gtceu:exquisite_green_sapphire_gem', indexNumber: 0.18}, + {materialName: 'grossular_tfc', nameColor: '#c28b5c', itemName: 'gtceu:exquisite_grossular_gem', indexNumber: 0.19}, + {materialName: 'rutile_tfc', nameColor: '#681c05', itemName: 'gtceu:exquisite_rutile_gem', indexNumber: 0.191}, + {materialName: 'lazurite_tfc', nameColor: '#1e29bb', itemName: 'gtceu:exquisite_lazurite_gem', indexNumber: 0.192}, + {materialName: 'pyrope_tfc', nameColor: '#b11344', itemName: 'gtceu:exquisite_pyrope_gem', indexNumber: 0.193}, + {materialName: 'rock_salt_tfc', nameColor: '#c2b2af', itemName: 'gtceu:exquisite_rock_salt_gem', indexNumber: 0.194}, + {materialName: 'ruby_tfc', nameColor: '#a41b0c', itemName: 'gtceu:exquisite_ruby_gem', indexNumber: 0.195}, + {materialName: 'salt_tfc', nameColor: '#bebec2', itemName: 'gtceu:exquisite_salt_gem', indexNumber: 0.196}, + {materialName: 'sapphire_tfc', nameColor: '#2628b0', itemName: 'gtceu:exquisite_sapphire_gem', indexNumber: 0.197}, + {materialName: 'sodalite_tfc', nameColor: '#2e40c6', itemName: 'gtceu:exquisite_sodalite_gem', indexNumber: 0.198}, + {materialName: 'coke_tfc', nameColor: '#424847', itemName: 'gtceu:exquisite_coke_gem', indexNumber: 0.199}, + {materialName: 'spessartine_tfc', nameColor: '#c28017', itemName: 'gtceu:exquisite_spessartine_gem', indexNumber: 0.181}, + {materialName: 'topaz_tfc', nameColor: '#b1a42d', itemName: 'gtceu:exquisite_topaz_gem', indexNumber: 0.182}, + {materialName: 'uvarovite_tfc', nameColor: '#22b43b', itemName: 'gtceu:exquisite_uvarovite_gem', indexNumber: 0.183}, + {materialName: 'nether_quartz_tfc', nameColor: '#bdb6b0', itemName: 'gtceu:exquisite_nether_quartz_gem', indexNumber: 0.184}, + {materialName: 'certus_quartz_tfc', nameColor: '#8ca4c4', itemName: 'gtceu:exquisite_certus_quartz_gem', indexNumber: 0.185}, + {materialName: 'quartzite_tfc', nameColor: '#b8bab8', itemName: 'gtceu:exquisite_quartzite_gem', indexNumber: 0.186}, + {materialName: 'realgar_tfc', nameColor: '#c22e28', itemName: 'gtceu:exquisite_realgar_gem', indexNumber: 0.187}, + {materialName: 'malachite_tfc', nameColor: '#00b789', itemName: 'gtceu:exquisite_malachite_gem', indexNumber: 0.188}, + {materialName: 'glass_tfc', nameColor: '#c2c2c6', itemName: 'gtceu:exquisite_glass_gem', indexNumber: 0.189}, + {materialName: 'olivine_tfc', nameColor: '#7fad03', itemName: 'gtceu:exquisite_olivine_gem', indexNumber: 0.171}, + {materialName: 'opal_tfc', nameColor: '#bdadb6', itemName: 'gtceu:exquisite_opal_gem', indexNumber: 0.172}, + {materialName: 'amethyst_tfc', nameColor: '#9b78ba', itemName: 'gtceu:exquisite_amethyst_gem', indexNumber: 0.173}, + // {materialName: 'echo_shard_tfc', nameColor: '#002123', itemName: 'gtceu:exquisite_echo_shard_gem', indexNumber: 0.174}, // disabled + {materialName: 'lapis_tfc', nameColor: '#6581c6', itemName: 'gtceu:exquisite_lapis_gem', indexNumber: 0.175}, + {materialName: 'apatite_tfc', nameColor: '#059cbb', itemName: 'gtceu:exquisite_apatite_gem', indexNumber: 0.176}, + {materialName: 'red_garnet_tfc', nameColor: '#710910', itemName: 'gtceu:exquisite_red_garnet_gem', indexNumber: 0.177}, + {materialName: 'yellow_garnet_tfc', nameColor: '#bbc207', itemName: 'gtceu:exquisite_yellow_garnet_gem', indexNumber: 0.178}, + {materialName: 'monazite_tfc', nameColor: '#9eb576', itemName: 'gtceu:exquisite_monazite_gem', indexNumber: 0.179}, + {materialName: 'rose_quartz_tfc', nameColor: '#ba3458', itemName: 'gtceu:exquisite_rose_quartz_gem', indexNumber: 0.161}, + {materialName: 'fluix_tfc', nameColor: '#53458d', itemName: 'tfg:exquisite_fluix_gem', indexNumber: 0.162}, //Metals - {materialName: 'silver_tfc', nameColor: '#d8d8f4', itemName: 'vintageimprovements:silver_sheet', indexNumber: 0.162, lang_en_us: 'Silver'}, - {materialName: 'sterling_silver_tfc', nameColor: '#eae5d3', itemName: 'gtceu:sterling_silver_plate', indexNumber: 0.163, lang_en_us: 'Sterling Silver'}, - {materialName: 'gold_tfc', nameColor: '#ede65b', itemName: 'create:golden_sheet', indexNumber: 0.164, lang_en_us: 'Gold'}, - {materialName: 'rose_gold_tfc', nameColor: '#eddedb', itemName: 'vintageimprovements:rose_gold_sheet', indexNumber: 0.165, lang_en_us: 'Rose Gold'}, - {materialName: 'nickel_tfc', nameColor: '#bfd1ea', itemName: 'vintageimprovements:nickel_sheet', indexNumber: 0.166, lang_en_us: 'Nickel'}, - {materialName: 'platinum_tfc', nameColor: '#d8cea1', itemName: 'vintageimprovements:platinum_sheet', indexNumber: 0.167, lang_en_us: 'Platinum'}, - {materialName: 'titanium_tfc', nameColor: '#c496d8', itemName: 'gtceu:titanium_plate', indexNumber: 0.168, lang_en_us: 'Titanium'}, - {materialName: 'bismuth_tfc', nameColor: '#607c79', itemName: 'gtceu:bismuth_plate', indexNumber: 0.169, lang_en_us: 'Bismuth'}, - {materialName: 'neutronium_tfc', nameColor: '#d7d7db', itemName: 'gtceu:neutronium_plate', indexNumber: 0.151, lang_en_us: 'Neutronium'}, + {materialName: 'silver_tfc', nameColor: '#d8d8f4', itemName: 'vintageimprovements:silver_sheet', indexNumber: 0.162}, + {materialName: 'sterling_silver_tfc', nameColor: '#eae5d3', itemName: 'gtceu:sterling_silver_plate', indexNumber: 0.163}, + {materialName: 'gold_tfc', nameColor: '#ede65b', itemName: 'create:golden_sheet', indexNumber: 0.164}, + {materialName: 'rose_gold_tfc', nameColor: '#eddedb', itemName: 'vintageimprovements:rose_gold_sheet', indexNumber: 0.165}, + {materialName: 'nickel_tfc', nameColor: '#bfd1ea', itemName: 'vintageimprovements:nickel_sheet', indexNumber: 0.166}, + {materialName: 'platinum_tfc', nameColor: '#d8cea1', itemName: 'vintageimprovements:platinum_sheet', indexNumber: 0.167}, + {materialName: 'titanium_tfc', nameColor: '#c496d8', itemName: 'gtceu:titanium_plate', indexNumber: 0.168}, + {materialName: 'bismuth_tfc', nameColor: '#607c79', itemName: 'gtceu:bismuth_plate', indexNumber: 0.169}, + {materialName: 'neutronium_tfc', nameColor: '#d7d7db', itemName: 'gtceu:neutronium_plate', indexNumber: 0.151}, //Other - {materialName: 'pyrite_tfc', nameColor: '#a75e10', itemName: 'gtceu:rich_raw_pyrite', indexNumber: 0.152, lang_en_us: 'Pyrite'}, - {materialName: 'redx_tfc', nameColor: '#a06156', itemName: 'morered:red_alloy_wire', indexNumber: 0.153, lang_en_us: 'RedX'} + {materialName: 'pyrite_tfc', nameColor: '#a75e10', itemName: 'gtceu:rich_raw_pyrite', indexNumber: 0.152}, + {materialName: 'redx_tfc', nameColor: '#a06156', itemName: 'morered:red_alloy_wire', indexNumber: 0.153} ] ///////////////////////////// ///////////////////////////// @@ -75,136 +79,143 @@ function registerTFGTrimTags(event) { //#region Trim Item Atlas //Automatically creates armor_trims.json file -const trimfilePath = 'kubejs/assets/minecraft/atlases/armor_trims.json'; -let trimdata = JsonIO.read(trimfilePath) || {}; -trimdata["sources"] = trimdata["sources"] || []; +if (enableTool) { -let trimsource = trimdata["sources"].find(s => s.type === "paletted_permutations"); + const trimfilePath = 'kubejs/assets/minecraft/atlases/armor_trims.json'; + let trimdata = JsonIO.read(trimfilePath) || {}; + trimdata["sources"] = trimdata["sources"] || []; -if (!trimsource) { - trimsource = { - type: "paletted_permutations", - textures: [ - "trims/models/armor/coast", - "trims/models/armor/coast_leggings", - "trims/models/armor/sentry", - "trims/models/armor/sentry_leggings", - "trims/models/armor/dune", - "trims/models/armor/dune_leggings", - "trims/models/armor/wild", - "trims/models/armor/wild_leggings", - "trims/models/armor/ward", - "trims/models/armor/ward_leggings", - "trims/models/armor/eye", - "trims/models/armor/eye_leggings", - "trims/models/armor/vex", - "trims/models/armor/vex_leggings", - "trims/models/armor/tide", - "trims/models/armor/tide_leggings", - "trims/models/armor/snout", - "trims/models/armor/snout_leggings", - "trims/models/armor/rib", - "trims/models/armor/rib_leggings", - "trims/models/armor/spire", - "trims/models/armor/spire_leggings", - "trims/models/armor/wayfinder", - "trims/models/armor/wayfinder_leggings", - "trims/models/armor/shaper", - "trims/models/armor/shaper_leggings", - "trims/models/armor/silence", - "trims/models/armor/silence_leggings", - "trims/models/armor/raiser", - "trims/models/armor/raiser_leggings", - "trims/models/armor/host", - "trims/models/armor/host_leggings" - ], - palette_key: "trims/color_palettes/trim_palette", - permutations: {} - }; - trimdata["sources"].push(trimsource); -} + let trimsource = trimdata["sources"].find(s => s.type === "paletted_permutations"); -trimsource.permutations = trimsource.permutations || {}; + if (!trimsource) { + trimsource = { + type: "paletted_permutations", + textures: [ + "trims/models/armor/coast", + "trims/models/armor/coast_leggings", + "trims/models/armor/sentry", + "trims/models/armor/sentry_leggings", + "trims/models/armor/dune", + "trims/models/armor/dune_leggings", + "trims/models/armor/wild", + "trims/models/armor/wild_leggings", + "trims/models/armor/ward", + "trims/models/armor/ward_leggings", + "trims/models/armor/eye", + "trims/models/armor/eye_leggings", + "trims/models/armor/vex", + "trims/models/armor/vex_leggings", + "trims/models/armor/tide", + "trims/models/armor/tide_leggings", + "trims/models/armor/snout", + "trims/models/armor/snout_leggings", + "trims/models/armor/rib", + "trims/models/armor/rib_leggings", + "trims/models/armor/spire", + "trims/models/armor/spire_leggings", + "trims/models/armor/wayfinder", + "trims/models/armor/wayfinder_leggings", + "trims/models/armor/shaper", + "trims/models/armor/shaper_leggings", + "trims/models/armor/silence", + "trims/models/armor/silence_leggings", + "trims/models/armor/raiser", + "trims/models/armor/raiser_leggings", + "trims/models/armor/host", + "trims/models/armor/host_leggings" + ], + palette_key: "trims/color_palettes/trim_palette", + permutations: {} + }; + trimdata["sources"].push(trimsource); + } -materials.forEach(material => { - trimsource.permutations[material.materialName] = `tfc:color_palettes/trims/${material.materialName}`; -}); -JsonIO.write(trimfilePath, trimdata); -//#endregion + trimsource.permutations = trimsource.permutations || {}; -//#region Trim Block Atlas -//Automatically creates blocks.json file -const blockfilePath = 'kubejs/assets/minecraft/atlases/blocks.json'; -let blockdata = JsonIO.read(blockfilePath) || {}; -blockdata["sources"] = blockdata["sources"] || []; - -let blocksource = blockdata["sources"].find(s => s.type === "paletted_permutations"); - -if (!blocksource) { - blocksource = { - type: "paletted_permutations", - textures: [ - "trims/items/leggings_trim", - "trims/items/chestplate_trim", - "trims/items/helmet_trim", - "trims/items/boots_trim", - "tfc:item/helmet_trim", - "tfc:item/chestplate_trim", - "tfc:item/greaves_trim", - "tfc:item/boots_trim" - ], - palette_key: "trims/color_palettes/trim_palette", - permutations: {} - }; - blockdata["sources"].push(blocksource); -} - -blocksource.permutations = blocksource.permutations || {}; - -materials.forEach(material => { - blocksource.permutations[material.materialName] = `tfc:color_palettes/trims/${material.materialName}`; -}); -JsonIO.write(blockfilePath, blockdata); -//#endregion - -//#region Trim Material Data -//Automatically creates material.json files -materials.forEach(material => { - const trimfilepaths = [ - `kubejs/data/minecraft/trim_material/${material.materialName}.json`, - `kubejs/data/tfc/trim_material/${material.materialName}.json` - ]; - - const newtrimdata = { - asset_name: material.materialName, - description: { - color: material.nameColor, - translate: `trim_material.tfc.${material.materialName}` - }, - ingredient: material.itemName, - item_model_index: material.indexNumber - }; - - trimfilepaths.forEach(trimfilepaths => { - const existingData = JsonIO.read(trimfilepaths); - - // Only write if the file is missing or contents are different - if (JSON.stringify(existingData) !== JSON.stringify(newtrimdata)) { - JsonIO.write(trimfilepaths, newtrimdata); - } + materials.forEach(material => { + trimsource.permutations[material.materialName] = `tfc:color_palettes/trims/${material.materialName}`; }); - }); -//#endregion - -//#region Lang -//en_us -//reads the existing file, inserts new key-value pair, writes info back to the file -const langfilePath = 'kubejs/assets/tfc/lang/en_us.json'; -let langdata = JsonIO.read(langfilePath) || {}; - -materials.forEach(material => { - langdata[`trim_material.tfc.${material.materialName}`] = material.lang_en_us; -}); - -JsonIO.write(langfilePath, langdata); + JsonIO.write(trimfilePath, trimdata); + //#endregion + + //#region Trim Block Atlas + //Automatically creates blocks.json file + const blockfilePath = 'kubejs/assets/minecraft/atlases/blocks.json'; + let blockdata = JsonIO.read(blockfilePath) || {}; + blockdata["sources"] = blockdata["sources"] || []; + + let blocksource = blockdata["sources"].find(s => s.type === "paletted_permutations"); + + if (!blocksource) { + blocksource = { + type: "paletted_permutations", + textures: [ + "trims/items/leggings_trim", + "trims/items/chestplate_trim", + "trims/items/helmet_trim", + "trims/items/boots_trim", + "tfc:item/helmet_trim", + "tfc:item/chestplate_trim", + "tfc:item/greaves_trim", + "tfc:item/boots_trim" + ], + palette_key: "trims/color_palettes/trim_palette", + permutations: {} + }; + blockdata["sources"].push(blocksource); + } + + blocksource.permutations = blocksource.permutations || {}; + + materials.forEach(material => { + blocksource.permutations[material.materialName] = `tfc:color_palettes/trims/${material.materialName}`; + }); + JsonIO.write(blockfilePath, blockdata); + //#endregion + + //#region Trim Material Data + //Automatically creates material.json files + materials.forEach(material => { + const trimfilepaths = [ + `kubejs/data/minecraft/trim_material/${material.materialName}.json`, + `kubejs/data/tfc/trim_material/${material.materialName}.json` + ]; + + const newtrimdata = { + asset_name: material.materialName, + description: { + color: material.nameColor, + translate: `trim_material.tfc.${material.materialName}` + }, + ingredient: material.itemName, + item_model_index: material.indexNumber + }; + + trimfilepaths.forEach(trimfilepaths => { + const existingData = JsonIO.read(trimfilepaths); + + // Only write if the file is missing or contents are different + if (JSON.stringify(existingData) !== JSON.stringify(newtrimdata)) { + JsonIO.write(trimfilepaths, newtrimdata); + } + }); + }); + //#endregion + + /* + ** Depreciated. I will leave this here for future reference. ** + + en_us + reads the existing file, inserts new key-value pair, writes info back to the file + + const langfilePath = 'kubejs/assets/tfc/lang/en_us.json'; + let langdata = JsonIO.read(langfilePath) || {}; + + materials.forEach(material => { + langdata[`trim_material.tfc.${material.materialName}`] = material.lang_en_us; + }); + + JsonIO.write(langfilePath, langdata); + */ +}; //#endregion From 6134da9caf0e2860905545ffbae64f7bde20acd6 Mon Sep 17 00:00:00 2001 From: Redeix Date: Thu, 21 Aug 2025 02:36:22 -0500 Subject: [PATCH 088/158] Update CHANGELOG.md Signed-off-by: Redeix --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f6cb7615..a57a3c42c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Fixed recipe for pyroxenite button (again) (#1625) @Pyritie - Refactored locometal recipes to use stonecutters, metal plated locometal is now also much cheaper (#1624) @Pyritie - Increased the air capacity of space suits by 250% @Pyritie +- Converted custom tooltips to lang strings for translations (#1663) @Redeix ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop @@ -23,6 +24,8 @@ - Moved the golden apple recipe over to the food processor so it respects food expiry data @Pyritie - Removed some remaining swine-steel crafting recipes @Pyritie - Added missing hoe/scythe mineable tags from custom crops (#1622) @Pyritie +- Added missing rose gold alloy smelter recipes (#1664) @Redeix +- Fixed some (but not all) model issues with the reflector block (#1664) @Redeix ## [0.10.9] - 10-08-2025 ### Changes From 4d801d9c96f456f9122296e2ace20070d3906943 Mon Sep 17 00:00:00 2001 From: TomPlop Date: Thu, 21 Aug 2025 04:42:07 -0400 Subject: [PATCH 089/158] Disable energy p2p (#1661) * github being github * First bandage fix for removing FE P2P --- config/ae2/common.json | 2 +- .../tfg/blockstates/large_nest_box.json | 278 +++++++++--------- .../blockstates/large_nest_box_warped.json | 278 +++++++++--------- .../assets/tfg/models/item/sniffer_egg.json | 10 +- .../loot_tables/entities/conductor.json | 8 +- kubejs/server_scripts/ae2/recipes.js | 2 + kubejs/server_scripts/ae2/tags.js | 2 + kubejs/startup_scripts/ae2/constants.js | 1 + 8 files changed, 293 insertions(+), 288 deletions(-) diff --git a/config/ae2/common.json b/config/ae2/common.json index 6f089b803..2c91128bd 100644 --- a/config/ae2/common.json +++ b/config/ae2/common.json @@ -76,7 +76,7 @@ "CrystalResonanceGeneratorRate_comment": "How much energy a crystal resonance generator generates per tick.", "CrystalResonanceGeneratorRate": 20.0, "p2pTunnelEnergyTax_comment": "The cost to transport energy through an energy P2P tunnel expressed as a factor of the transported energy.", - "p2pTunnelEnergyTax": 0.025, + "p2pTunnelEnergyTax": 0.999, "p2pTunnelTransportTax_comment": "The cost to transport items/fluids/etc. through P2P tunnels, expressed in AE energy per equivalent I/O bus operation for the transported object type (i.e. items\u003dper 1 item, fluids\u003dper 125mb).", "p2pTunnelTransportTax": 0.025 }, diff --git a/kubejs/assets/tfg/blockstates/large_nest_box.json b/kubejs/assets/tfg/blockstates/large_nest_box.json index 93f899574..810bfd65f 100644 --- a/kubejs/assets/tfg/blockstates/large_nest_box.json +++ b/kubejs/assets/tfg/blockstates/large_nest_box.json @@ -1,140 +1,140 @@ -{ - "variants": { - "facing=north,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - "facing=north,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=north,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=north,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - - - "facing=south,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=south,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=south,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=south,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - - - "facing=east,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=east,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=east,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - "facing=east,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - - - "facing=west,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=west,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - - }, - "facing=west,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=west,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - - }, - - - "facing=north,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0" - }, - "facing=north,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 90 - }, - "facing=north,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 270 - }, - "facing=north,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 180 - }, - - "facing=south,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 180 - }, - "facing=south,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 270 - }, - "facing=south,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 90 - }, - "facing=south,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3" - }, - - "facing=east,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 90 - }, - "facing=east,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 180 - }, - "facing=east,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2" - }, - "facing=east,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 270 - }, - - "facing=west,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 270 - }, - "facing=west,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1" - - }, - "facing=west,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 180 - }, - "facing=west,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 90 - - } - - } +{ + "variants": { + "facing=north,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + "facing=north,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=north,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=north,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + + + "facing=south,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=south,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=south,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=south,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + + + "facing=east,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=east,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=east,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + "facing=east,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + + + "facing=west,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=west,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + + }, + "facing=west,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=west,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + + }, + + + "facing=north,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0" + }, + "facing=north,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 90 + }, + "facing=north,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 270 + }, + "facing=north,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 180 + }, + + "facing=south,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 180 + }, + "facing=south,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 270 + }, + "facing=south,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 90 + }, + "facing=south,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3" + }, + + "facing=east,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 90 + }, + "facing=east,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 180 + }, + "facing=east,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2" + }, + "facing=east,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 270 + }, + + "facing=west,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 270 + }, + "facing=west,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1" + + }, + "facing=west,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 180 + }, + "facing=west,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 90 + + } + + } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/large_nest_box_warped.json b/kubejs/assets/tfg/blockstates/large_nest_box_warped.json index 89e95bf8a..5b7e00742 100644 --- a/kubejs/assets/tfg/blockstates/large_nest_box_warped.json +++ b/kubejs/assets/tfg/blockstates/large_nest_box_warped.json @@ -1,140 +1,140 @@ -{ - "variants": { - "facing=north,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - "facing=north,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=north,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=north,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - - - "facing=south,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=south,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=south,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=south,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - - - "facing=east,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=east,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=east,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - "facing=east,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - - - "facing=west,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=west,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - - }, - "facing=west,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=west,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - - }, - - - "facing=north,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0" - }, - "facing=north,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 90 - }, - "facing=north,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 270 - }, - "facing=north,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 180 - }, - - "facing=south,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 180 - }, - "facing=south,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 270 - }, - "facing=south,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 90 - }, - "facing=south,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3" - }, - - "facing=east,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 90 - }, - "facing=east,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 180 - }, - "facing=east,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2" - }, - "facing=east,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 270 - }, - - "facing=west,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 270 - }, - "facing=west,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1" - - }, - "facing=west,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 180 - }, - "facing=west,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 90 - - } - - } +{ + "variants": { + "facing=north,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + "facing=north,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=north,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=north,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + + + "facing=south,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=south,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=south,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=south,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + + + "facing=east,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=east,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=east,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + "facing=east,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + + + "facing=west,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=west,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + + }, + "facing=west,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=west,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + + }, + + + "facing=north,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0" + }, + "facing=north,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 90 + }, + "facing=north,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 270 + }, + "facing=north,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 180 + }, + + "facing=south,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 180 + }, + "facing=south,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 270 + }, + "facing=south,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 90 + }, + "facing=south,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3" + }, + + "facing=east,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 90 + }, + "facing=east,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 180 + }, + "facing=east,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2" + }, + "facing=east,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 270 + }, + + "facing=west,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 270 + }, + "facing=west,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1" + + }, + "facing=west,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 180 + }, + "facing=west,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 90 + + } + + } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/sniffer_egg.json b/kubejs/assets/tfg/models/item/sniffer_egg.json index 4ff54261b..ee27e4927 100644 --- a/kubejs/assets/tfg/models/item/sniffer_egg.json +++ b/kubejs/assets/tfg/models/item/sniffer_egg.json @@ -1,6 +1,6 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "minecraft:item/sniffer_egg" - } +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/sniffer_egg" + } } \ No newline at end of file diff --git a/kubejs/data/railways/loot_tables/entities/conductor.json b/kubejs/data/railways/loot_tables/entities/conductor.json index 1f3b78b18..6fe9965c2 100644 --- a/kubejs/data/railways/loot_tables/entities/conductor.json +++ b/kubejs/data/railways/loot_tables/entities/conductor.json @@ -1,5 +1,5 @@ -{ - "type": "minecraft:entity", - "pools": [], - "random_sequence": "railways:entities/conductor" +{ + "type": "minecraft:entity", + "pools": [], + "random_sequence": "railways:entities/conductor" } \ No newline at end of file diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index 7198628da..2e7b72e49 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -17,6 +17,8 @@ const registerAE2Recipes = (event) => { ], mod: 'ae2' }); + event.remove( { output: 'ae2:fe_p2p_tunnel' } ) + // Cutting knives (for renaming things) event.shaped('ae2:certus_quartz_cutting_knife', [ ' A', diff --git a/kubejs/server_scripts/ae2/tags.js b/kubejs/server_scripts/ae2/tags.js index 316431166..30ad88670 100644 --- a/kubejs/server_scripts/ae2/tags.js +++ b/kubejs/server_scripts/ae2/tags.js @@ -10,6 +10,8 @@ const registerAE2ItemTags = (event) => { event.remove('forge:storage_blocks', 'ae2:quartz_block') event.remove('forge:storage_blocks/certus_quartz', 'ae2:quartz_block') + + event.removeAll('ae2:p2p_attunements/fe_p2p_tunnel') event.add('tfg:certus_quartz_blocks', 'gtceu:certus_quartz_block') event.add('tfg:certus_quartz_blocks', 'ae2:quartz_block') diff --git a/kubejs/startup_scripts/ae2/constants.js b/kubejs/startup_scripts/ae2/constants.js index 9496276a9..88e39d121 100644 --- a/kubejs/startup_scripts/ae2/constants.js +++ b/kubejs/startup_scripts/ae2/constants.js @@ -25,6 +25,7 @@ global.AE2_DISABLED_ITEMS = [ 'ae2:charged_staff', 'ae2:name_press', 'ae2:charger', + 'ae2:fe_p2p_tunnel', // Блоки 'ae2:vibration_chamber', From 08011735a11fc315286d240439b9f59cc27853dd Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 12:01:02 +0100 Subject: [PATCH 090/158] whitespace? github tweakin again --- .../tfg/blockstates/large_nest_box.json | 278 +++++++++--------- .../blockstates/large_nest_box_warped.json | 278 +++++++++--------- .../assets/tfg/models/item/sniffer_egg.json | 10 +- 3 files changed, 283 insertions(+), 283 deletions(-) diff --git a/kubejs/assets/tfg/blockstates/large_nest_box.json b/kubejs/assets/tfg/blockstates/large_nest_box.json index 93f899574..8fcac03c3 100644 --- a/kubejs/assets/tfg/blockstates/large_nest_box.json +++ b/kubejs/assets/tfg/blockstates/large_nest_box.json @@ -1,140 +1,140 @@ -{ - "variants": { - "facing=north,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - "facing=north,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=north,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=north,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - - - "facing=south,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=south,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=south,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=south,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - - - "facing=east,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=east,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=east,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - "facing=east,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - - - "facing=west,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=west,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - - }, - "facing=west,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=west,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - - }, - - - "facing=north,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0" - }, - "facing=north,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 90 - }, - "facing=north,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 270 - }, - "facing=north,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 180 - }, - - "facing=south,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 180 - }, - "facing=south,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 270 - }, - "facing=south,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 90 - }, - "facing=south,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3" - }, - - "facing=east,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 90 - }, - "facing=east,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 180 - }, - "facing=east,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2" - }, - "facing=east,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 270 - }, - - "facing=west,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 270 - }, - "facing=west,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1" - - }, - "facing=west,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 180 - }, - "facing=west,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 90 - - } - - } +{ + "variants": { + "facing=north,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + "facing=north,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=north,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=north,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + + + "facing=south,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=south,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=south,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=south,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + + + "facing=east,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=east,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=east,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + "facing=east,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + + + "facing=west,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=west,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + + }, + "facing=west,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=west,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + + }, + + + "facing=north,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0" + }, + "facing=north,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 90 + }, + "facing=north,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 270 + }, + "facing=north,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 180 + }, + + "facing=south,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 180 + }, + "facing=south,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 270 + }, + "facing=south,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 90 + }, + "facing=south,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3" + }, + + "facing=east,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 90 + }, + "facing=east,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 180 + }, + "facing=east,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2" + }, + "facing=east,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 270 + }, + + "facing=west,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 270 + }, + "facing=west,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1" + + }, + "facing=west,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 180 + }, + "facing=west,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 90 + + } + + } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/large_nest_box_warped.json b/kubejs/assets/tfg/blockstates/large_nest_box_warped.json index 89e95bf8a..b5894ba69 100644 --- a/kubejs/assets/tfg/blockstates/large_nest_box_warped.json +++ b/kubejs/assets/tfg/blockstates/large_nest_box_warped.json @@ -1,140 +1,140 @@ -{ - "variants": { - "facing=north,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - "facing=north,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=north,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=north,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - - - "facing=south,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=south,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=south,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=south,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - - - "facing=east,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=east,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=east,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - "facing=east,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - - - "facing=west,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=west,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - - }, - "facing=west,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=west,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - - }, - - - "facing=north,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0" - }, - "facing=north,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 90 - }, - "facing=north,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 270 - }, - "facing=north,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 180 - }, - - "facing=south,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 180 - }, - "facing=south,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 270 - }, - "facing=south,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 90 - }, - "facing=south,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3" - }, - - "facing=east,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 90 - }, - "facing=east,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 180 - }, - "facing=east,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2" - }, - "facing=east,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 270 - }, - - "facing=west,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 270 - }, - "facing=west,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1" - - }, - "facing=west,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 180 - }, - "facing=west,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 90 - - } - - } +{ + "variants": { + "facing=north,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + "facing=north,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=north,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=north,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + + + "facing=south,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=south,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=south,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=south,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + + + "facing=east,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=east,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=east,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + "facing=east,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + + + "facing=west,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=west,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + + }, + "facing=west,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=west,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + + }, + + + "facing=north,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0" + }, + "facing=north,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 90 + }, + "facing=north,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 270 + }, + "facing=north,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 180 + }, + + "facing=south,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 180 + }, + "facing=south,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 270 + }, + "facing=south,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 90 + }, + "facing=south,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3" + }, + + "facing=east,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 90 + }, + "facing=east,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 180 + }, + "facing=east,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2" + }, + "facing=east,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 270 + }, + + "facing=west,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 270 + }, + "facing=west,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1" + + }, + "facing=west,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 180 + }, + "facing=west,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 90 + + } + + } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/sniffer_egg.json b/kubejs/assets/tfg/models/item/sniffer_egg.json index 4ff54261b..ee27e4927 100644 --- a/kubejs/assets/tfg/models/item/sniffer_egg.json +++ b/kubejs/assets/tfg/models/item/sniffer_egg.json @@ -1,6 +1,6 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "minecraft:item/sniffer_egg" - } +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/sniffer_egg" + } } \ No newline at end of file From a2a30eb84b3a6dafcdbef7522c1ecff6ac0c60c7 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 12:06:38 +0100 Subject: [PATCH 091/158] sterling silver alloy smelter --- CHANGELOG.md | 2 +- kubejs/server_scripts/tfc/recipes.metals.js | 30 ++++++++++++++------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a57a3c42c..ea8eb76c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,13 +18,13 @@ - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop - Fixed duplicate mixer recipes for rose gold and sterling silver @Pyritie +- Added missing rose gold + sterling silver alloy smelter recipes (#1664) @Redeix - Fixed mechanical mixers requiring an alloy that needed that tier of mixer @Pyritie - Finally fixed all the issues with upgrading the toolbelt - now you can safely dye and undye, upgrade with and without tools inside it, etc (#368) @Pyritie - Fixed a dupe with certus quartz @Pyritie - Moved the golden apple recipe over to the food processor so it respects food expiry data @Pyritie - Removed some remaining swine-steel crafting recipes @Pyritie - Added missing hoe/scythe mineable tags from custom crops (#1622) @Pyritie -- Added missing rose gold alloy smelter recipes (#1664) @Redeix - Fixed some (but not all) model issues with the reflector block (#1664) @Redeix ## [0.10.9] - 10-08-2025 diff --git a/kubejs/server_scripts/tfc/recipes.metals.js b/kubejs/server_scripts/tfc/recipes.metals.js index ec358a554..a1026e886 100644 --- a/kubejs/server_scripts/tfc/recipes.metals.js +++ b/kubejs/server_scripts/tfc/recipes.metals.js @@ -116,49 +116,49 @@ function registerTFCMetalsRecipes(event) { event.recipes.gtceu.forge_hammer('tfg/refined_bloom') .itemInputs('tfc:raw_iron_bloom') .itemOutputs('tfc:refined_iron_bloom') - .duration(400) + .duration(200) .EUt(4) // Укрепленная крица -> Слиток кованного железа event.recipes.gtceu.forge_hammer('tfg/wrought_iron_ingot') .itemInputs('tfc:refined_iron_bloom') .itemOutputs('gtceu:wrought_iron_ingot') - .duration(400) + .duration(200) .EUt(4) // Чугун -> Высокоуглеродная сталь event.recipes.gtceu.forge_hammer('tfg/high_carbon_steel') .itemInputs('tfc:metal/ingot/pig_iron') .itemOutputs('tfc:metal/ingot/high_carbon_steel') - .duration(500) + .duration(300) .EUt(4) // Высокоуглеродная сталь -> Cталь event.recipes.gtceu.forge_hammer('tfg/steel') .itemInputs('tfc:metal/ingot/high_carbon_steel') .itemOutputs('gtceu:steel_ingot') - .duration(500) + .duration(300) .EUt(4) // Высокоуглеродная черная сталь -> черная сталь event.recipes.gtceu.forge_hammer('tfg/black_steel') .itemInputs('tfc:metal/ingot/high_carbon_black_steel') .itemOutputs('tfc:metal/ingot/black_steel') - .duration(600) + .duration(300) .EUt(4) // Высокоуглеродная синяя сталь -> синяя сталь event.recipes.gtceu.forge_hammer('tfg/blue_steel') .itemInputs('tfc:metal/ingot/high_carbon_blue_steel') .itemOutputs('tfc:metal/ingot/blue_steel') - .duration(700) + .duration(400) .EUt(4) // Высокоуглеродная красная сталь -> красная сталь event.recipes.gtceu.forge_hammer('tfg/red_steel') .itemInputs('tfc:metal/ingot/high_carbon_red_steel') .itemOutputs('tfc:metal/ingot/red_steel') - .duration(700) + .duration(400) .EUt(4) // Слабая сталь + Чугун -> Высокоуглеродная черная сталь @@ -200,7 +200,7 @@ function registerTFCMetalsRecipes(event) { .duration(700) .EUt(4) - // Rose Gold + // Rose Gold + Sterling Silver const copper_types = [ "#forge:ingots/copper", "#forge:dusts/copper", @@ -211,6 +211,10 @@ function registerTFCMetalsRecipes(event) { "#forge:ingots/gold", "#forge:dusts/gold" ]; + const silver_types = [ + "#forge:ingots/silver", + "#forge:dusts/silver" + ]; copper_types.forEach(copper_types_array => { gold_types.forEach(gold_types_array => { @@ -219,9 +223,17 @@ function registerTFCMetalsRecipes(event) { .itemOutputs(ChemicalHelper.get(TagPrefix.ingot, GTMaterials.RoseGold, 5)) .duration(20*10) .EUt(GTValues.VA[GTValues.LV]) - }) + }); + silver_types.forEach(silver_types_array => { + event.recipes.gtceu.alloy_smelter(`sterling_silver_from_${copper_types_array.replace(/:/g, "/").replace(/#/g, "")}_and_${silver_types_array.replace(/:/g, "/").replace(/#/g, "")}`) + .itemInputs(Ingredient.of(copper_types_array).withCount(1), Ingredient.of(silver_types_array).withCount(4)) + .itemOutputs(ChemicalHelper.get(TagPrefix.ingot, GTMaterials.SterlingSilver, 5)) + .duration(20*10) + .EUt(GTValues.VA[GTValues.LV]) + }); }); + const TFC_INTERMEDIATE_METALS = [ { metal: 'pig_iron', meltTemp: 1535 }, From dbed48eedf0e765205c64aecdcd00d2aa9b0092c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 12:13:49 +0100 Subject: [PATCH 092/158] update CL --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea8eb76c3..7c65fc7cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ - Refactored locometal recipes to use stonecutters, metal plated locometal is now also much cheaper (#1624) @Pyritie - Increased the air capacity of space suits by 250% @Pyritie - Converted custom tooltips to lang strings for translations (#1663) @Redeix +- Removed energy P2P (#1661) @TomPlop @BlueBoat29 +- Fixed grammar on death messages and added some new ones (#1642) @vdegans ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop @@ -26,6 +28,8 @@ - Removed some remaining swine-steel crafting recipes @Pyritie - Added missing hoe/scythe mineable tags from custom crops (#1622) @Pyritie - Fixed some (but not all) model issues with the reflector block (#1664) @Redeix +- Fixed food processor outputs not stacking @gustovafing +- Fixed using the grappling hook on a ladder killing you (#106) @Zippity ## [0.10.9] - 10-08-2025 ### Changes From 4395da4c2b4d4e30bebdf95e81c5ea04f81af2d1 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 12:15:07 +0100 Subject: [PATCH 093/158] fix #1639 Related Work Items: #1 --- kubejs/server_scripts/gregtech/recipes.tfcmetals.js | 1 - 1 file changed, 1 deletion(-) diff --git a/kubejs/server_scripts/gregtech/recipes.tfcmetals.js b/kubejs/server_scripts/gregtech/recipes.tfcmetals.js index 18afc77a1..ee1ecd260 100644 --- a/kubejs/server_scripts/gregtech/recipes.tfcmetals.js +++ b/kubejs/server_scripts/gregtech/recipes.tfcmetals.js @@ -43,7 +43,6 @@ function registerGTCEuTFCMetalsRecipes(event) { event.remove({ id: 'gtceu:electric_blast_furnace/blast_black_bronze' }) event.remove({ id: 'gtceu:electric_blast_furnace/blast_black_bronze_gas' }) event.remove({ id: 'gtceu:vacuum_freezer/cool_hot_black_bronze_ingot' }) - event.remove({ id: 'gtceu:vacuum_freezer/black_bronze' }) event.remove({ id: 'gtceu:electric_blast_furnace/blast_sterling_silver' }) event.remove({ id: 'gtceu:electric_blast_furnace/blast_sterling_silver_gas' }) event.remove({ id: 'gtceu:electric_blast_furnace/blast_rose_gold' }) From d5fe25fccc4d9cf4436c2120777f483885267c5f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 12:41:31 +0100 Subject: [PATCH 094/158] why is ender chest still enabled --- config/ftbqoptimizer.snbt | 13 ------------- defaultconfigs/ftbessentials-server.snbt | 2 +- defaultconfigs/ftbessentials.snbt | 2 +- defaultconfigs/ftbqoptimizer.snbt | 3 --- 4 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 config/ftbqoptimizer.snbt delete mode 100644 defaultconfigs/ftbqoptimizer.snbt diff --git a/config/ftbqoptimizer.snbt b/config/ftbqoptimizer.snbt deleted file mode 100644 index a62cf278c..000000000 --- a/config/ftbqoptimizer.snbt +++ /dev/null @@ -1,13 +0,0 @@ -# FTBQuestOptimizer config file -# If you're a modpack maker, edit defaultconfigs/ftbqoptimizer-server.snbt instead - -{ - # Enable optimization of quest completion detection - # Default: true - detect_optimization: true - - # Number of tick skips for checking player inventories, 0 to disable tick skipping. Experiment and find the best value for you! - # Default: 5 - # Range: 0 ~ 100 - skip_ticks_amount: 5 -} diff --git a/defaultconfigs/ftbessentials-server.snbt b/defaultconfigs/ftbessentials-server.snbt index c3f5803c5..9faf16ec7 100644 --- a/defaultconfigs/ftbessentials-server.snbt +++ b/defaultconfigs/ftbessentials-server.snbt @@ -49,7 +49,7 @@ # Allows users to access their ender chest, as well as admins to manage other players' ender chests. enderchest: { # Default: true - enabled: true + enabled: false } # Allows users to set a custom hat as their head item by using a command diff --git a/defaultconfigs/ftbessentials.snbt b/defaultconfigs/ftbessentials.snbt index 888367213..570c0568e 100644 --- a/defaultconfigs/ftbessentials.snbt +++ b/defaultconfigs/ftbessentials.snbt @@ -40,7 +40,7 @@ # Allows users to access their ender chest, as well as admins to manage other players' ender chests. enderchest: { # Default: true - enabled: true + enabled: false } # Allows users to set a custom hat as their head item by using a command diff --git a/defaultconfigs/ftbqoptimizer.snbt b/defaultconfigs/ftbqoptimizer.snbt deleted file mode 100644 index b5327ff6a..000000000 --- a/defaultconfigs/ftbqoptimizer.snbt +++ /dev/null @@ -1,3 +0,0 @@ -# Default config file that will be copied to instance's config/ftbqoptimizer.snbt location - -{ } From b623efc8942d83c673475e1890cf1b9b0383652e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Nieto?= Date: Thu, 21 Aug 2025 22:28:30 +0200 Subject: [PATCH 095/158] fix: Fixed quests.metal_age.red_blu to not be stuck when migrating worlds (#1667) --- config/ftbquests/quests/chapters/questsmetallurgy.snbt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt index af71cddaf..fd604ce90 100644 --- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt +++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt @@ -630,11 +630,9 @@ id: "5792DDAA82895E67" subtitle: "{quests.metal_age.red_blu.subtitle}" tasks: [{ - dimension: "minecraft:overworld" - icon: "gtceu:overworld_marker" - id: "720D64916D1E3892" - title: "{quests.stone_age.temperature.task}" - type: "dimension" + id: "63890641DCD6659F" + title: "{quests.tasktype.checkmark}" + type: "checkmark" }] title: "{quests.metal_age.red_blu.title}" x: 24.0d From ac8f873373027a46c3eb1b3501634779b995a9a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Nieto?= Date: Thu, 21 Aug 2025 22:29:59 +0200 Subject: [PATCH 096/158] fix: Fixed quests.metal_age.redblu_anvil having both steel requirements instead of one (#1666) Co-authored-by: Redeix --- config/ftbquests/quests/chapters/questsmetallurgy.snbt | 1 + 1 file changed, 1 insertion(+) diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt index fd604ce90..ae7f936e9 100644 --- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt +++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt @@ -659,6 +659,7 @@ "5088768AAA28FCBA" "6D04BAC5B215F90F" ] + dependency_requirement: "one_completed" description: ["{quests.metal_age.redblu_anvil.desc}"] id: "56CA2EB7812529C5" shape: "octagon" From 5e85474cf1765bd17050656556c5a2c9e2e4b57c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 21:37:46 +0100 Subject: [PATCH 097/158] fix #1652 --- kubejs/server_scripts/gregtech/recipes.removes.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 21f0b09f3..895467739 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -653,6 +653,8 @@ function removeGTCEURecipes(event) { removeMaceratorRecipe(event, 'macerate_treated_wood_boat') removeMaceratorRecipe(event, 'macerate_treated_wood_chest_boat') + removeMaceratorRecipe(event, 'macerate_marble') + event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__fireclay' }) event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__ender_eye' }) From 0804d81d6c4ead45c80eec8f47878da81c300bd8 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 21:39:31 +0100 Subject: [PATCH 098/158] fix #1659 --- kubejs/server_scripts/firmalife/recipes.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 97b87ad98..c8bfe83ef 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -581,14 +581,14 @@ const registerFirmaLifeRecipes = (event) => { 'firmalife:mixing_bowl' ]).id(`tfg:shapeless/${grain}_dough_3`) - event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`4x tfc:food/${grain}_dough`).copyFood(), [ + event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`2x tfc:food/${grain}_dough`).copyFood(), [ 'firmalife:spoon', TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), TFC.ingredient.fluid(TFC.fluidStackIngredient('minecraft:water', 100)), 'firmalife:mixing_bowl' ]).id(`tfg:shapeless/${grain}_flatbread_dough`) - event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`8x tfc:food/${grain}_dough`).copyFood(), [ + event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`4x tfc:food/${grain}_dough`).copyFood(), [ 'firmalife:spoon', TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), @@ -596,7 +596,7 @@ const registerFirmaLifeRecipes = (event) => { 'firmalife:mixing_bowl' ]).id(`tfg:shapeless/${grain}_flatbread_dough_2`) - event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`12x tfc:food/${grain}_dough`).copyFood(), [ + event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`6x tfc:food/${grain}_dough`).copyFood(), [ 'firmalife:spoon', TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), @@ -605,7 +605,7 @@ const registerFirmaLifeRecipes = (event) => { 'firmalife:mixing_bowl' ]).id(`tfg:shapeless/${grain}_flatbread_dough_3`) - event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`16x tfc:food/${grain}_dough`).copyFood(), [ + event.recipes.tfc.advanced_shapeless_crafting(TFC.isp.of(`8x tfc:food/${grain}_dough`).copyFood(), [ 'firmalife:spoon', TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), From b192a347a9c9d1e07177d09987e4771970b61c72 Mon Sep 17 00:00:00 2001 From: Bogdan <57633804+bogdan-nikitin@users.noreply.github.com> Date: Thu, 21 Aug 2025 23:59:49 +0300 Subject: [PATCH 099/158] Fix link in README (#1668) Signed-off-by: Bogdan <57633804+bogdan-nikitin@users.noreply.github.com> --- .github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index efbbc238d..ec88c111d 100644 --- a/.github/README.md +++ b/.github/README.md @@ -56,7 +56,7 @@ This modpack is still a work in progress, and is constantly being updated. In it Interested in contributing? For detailed setup instructions, coding standards, and guidelines, please read [this](CONTRIBUTING.md). -Want to help translate? Please read [this](../kubejs/README%20IF%20TRANSLATING.md) instead. +Want to help translate? Please read [this](../kubejs/README_IF_TRANSLATING.md) instead. --- From c60849185794409c4c36b6c5a78a5d071d141081 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 22:19:55 +0100 Subject: [PATCH 100/158] added some more food recipes for #1638, fixed the wrong chocolate in #1632 --- CHANGELOG.md | 1 + kubejs/server_scripts/firmalife/recipes.js | 7 ++ kubejs/server_scripts/tfg/recipes.food.js | 96 ++++++++++++++++++- kubejs/startup_scripts/firmalife/constants.js | 4 +- 4 files changed, 106 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c65fc7cd..422287bb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ - Fixed some (but not all) model issues with the reflector block (#1664) @Redeix - Fixed food processor outputs not stacking @gustovafing - Fixed using the grappling hook on a ladder killing you (#106) @Zippity +- Added more missing food processor recipes (#1632, #1638) @Pyritie ## [0.10.9] - 10-08-2025 ### Changes diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index c8bfe83ef..2249bac00 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -743,4 +743,11 @@ const registerFirmaLifeRecipes = (event) => { Fluid.of('afc:birch_syrup', 1000)) .outputItem('createaddition:honey_cake') .id('tfg:mixing_bowl/birch_honey_cake') + + event.remove({ id: 'firmalife:mixing_bowl/chocolate_ice_cream' }) + event.recipes.firmalife.mixing_bowl() + .ingredients([TFC.ingredient.notRotten('firmalife:food/vanilla_ice_cream')], + Fluid.of('tfcchannelcasting:milk_chocolate', 100)) + .outputItem(TFC.isp.of('firmalife:food/chocolate_ice_cream').copyFood()) + .id('tfg:mixing_bowl/chocolate_ice_cream') } diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index 660257cda..a99006432 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -545,8 +545,17 @@ function registerTFGFoodRecipes(event) { itemOutputs: ["firmalife:food/tortilla_chips"], itemOutputProvider: TFC.isp.of("firmalife:food/tortilla_chips").copyFood() }) + + processorRecipe("tomato_sauce", 300, 8, { + circuit: 1, + itemInputs: ['tfc:food/tomato', 'tfc:powder/salt', 'tfc:food/garlic'], + fluidInputs: ['tfg:clean_water 200'], + itemOutputs: ['5x firmalife:food/tomato_sauce'], + itemOutputProvider: TFC.isp.of('5x firmalife:food/tomato_sauce').copyOldestFood() + }) processorRecipe("tomato_sauce_mix", 600, 8, { + circuit: 2, itemInputs: ['tfc:food/tomato', 'tfc:powder/salt', 'tfc:food/garlic'], itemOutputs: ['5x firmalife:food/tomato_sauce_mix'], itemOutputProvider: TFC.isp.of('5x firmalife:food/tomato_sauce_mix').copyOldestFood(), @@ -597,6 +606,7 @@ function registerTFGFoodRecipes(event) { fluidOutputs: [Fluid.of('tfc:vinegar', 250)], }) + // Pizza processorRecipe("pizza_no_extra", 600, 16, { itemInputs: ["firmalife:food/pizza_dough", "firmalife:food/tomato_sauce", "firmalife:food/shredded_cheese"], itemOutputs: ["firmalife:food/raw_pizza"], @@ -633,6 +643,20 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of("4x firmalife:food/pizza_dough").copyOldestFood() }) + processorRecipe("shredded_cheese", 100, 16, { + itemInputs: ['#firmalife:foods/cheeses'], + itemOutputs: ['4x firmalife:food/shredded_cheese'], + circuit: 30, + itemOutputProvider: TFC.isp.of('firmalife:food/shredded_cheese').copyFood() + }) + + processorRecipe("basil", 20, 16, { + itemInputs: ['firmalife:plant/basil'], + itemOutputs: ['2x firmalife:spice/basil_leaves'], + circuit: 30 + }) + + // Ice cream processorRecipe("vanilla_ice_cream", 300, 16, { itemInputs: ['firmalife:ice_shavings', '#tfc:sweetener', 'firmalife:spice/vanilla'], itemOutputs: ['2x firmalife:food/vanilla_ice_cream'], @@ -643,7 +667,7 @@ function registerTFGFoodRecipes(event) { processorRecipe("chocolate_ice_cream", 300, 16, { itemInputs: ['firmalife:food/vanilla_ice_cream'], itemOutputs: ['firmalife:food/chocolate_ice_cream'], - fluidInputs: [Fluid.of('firmalife:chocolate', 1000)], + fluidInputs: [Fluid.of('tfcchannelcasting:milk_chocolate', 100)], itemOutputProvider: TFC.isp.of("firmalife:food/chocolate_ice_cream").resetFood() }) @@ -659,6 +683,13 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of("firmalife:food/cookie_dough_ice_cream").resetFood() }) + processorRecipe("banana_split", 500, 16, { + itemInputs: ['firmalife:food/vanilla_ice_cream', 'firmalife:food/strawberry_ice_cream', 'firmalife:food/chocolate_ice_cream', 'firmalife:food/pineapple', 'tfc:food/cherry', '2x tfc:food/banana'], + itemOutputs: ['2x firmalife:food/banana_split'], + itemOutputProvider: TFC.isp.of('2x firmalife:food/banana_split').resetFood(), + circuit: 4 + }) + processorRecipe("butter", 300, 16, { itemInputs: ["tfc:powder/salt"], fluidInputs: [Fluid.of('firmalife:cream', 1000)], @@ -755,6 +786,62 @@ function registerTFGFoodRecipes(event) { itemOutputProvider: TFC.isp.of('firmalife:food/soy_mixture').copyOldestFood() }) + processorRecipe("brown_mushroom", 100, 8, { + circuit: 30, + itemInputs: ["minecraft:brown_mushroom_block"], + itemOutputs: ["4x minecraft:brown_mushroom"], + itemOutputProvider: TFC.isp.of("4x minecraft:brown_mushroom").resetFood() + }) + + processorRecipe("red_mushroom", 100, 8, { + circuit: 30, + itemInputs: ["minecraft:red_mushroom_block"], + itemOutputs: ["4x minecraft:red_mushroom"], + itemOutputProvider: TFC.isp.of("4x minecraft:red_mushroom").resetFood() + }) + + processorRecipe("cut_pumpkin", 100, 8, { + circuit: 30, + itemInputs: ["tfc:pumpkin"], + itemOutputs: ["4x tfc:food/pumpkin_chunks"], + itemOutputProvider: TFC.isp.of("4x tfc:food/pumpkin_chunks").copyOldestFood() + }) + + processorRecipe("cut_melon", 100, 8, { + circuit: 30, + itemInputs: ["tfc:melon"], + itemOutputs: ["4x tfc:food/melon_slice"], + itemOutputProvider: TFC.isp.of("4x tfc:food/melon_slice").copyOldestFood() + }) + + processorRecipe("salsa", 300, 8, { + circuit: 1, + itemInputs: ['tfc:food/tomato', 'tfc:powder/salt', 'firmalife:plant/cilantro'], + itemOutputs: ['5x firmalife:food/salsa'], + itemOutputProvider: TFC.isp.of('5x firmalife:food/salsa').copyOldestFood() + }) + + processorRecipe("bacon", 300, 8, { + circuit: 1, + itemInputs: [/*TFC.ingredient.hasTrait(*/'tfc:food/pork'/*, 'firmalife:smoked')*/, 'tfc:powder/salt'], + itemOutputs: ['4x firmalife:food/bacon'], + itemOutputProvider: TFC.isp.of('4x firmalife:food/bacon').copyOldestFood() + }) + + processorRecipe("picked_egg", 1000, 8, { + circuit: 1, + itemInputs: ['minecraft:clay_ball', 'tfc:powder/wood_ash', 'tfc:powder/salt', 'tfc:food/boiled_egg'], + itemOutputs: ['firmalife:food/pickled_egg'], + itemOutputProvider: TFC.isp.of('firmalife:food/pickled_egg').copyOldestFood() + }) + + processorRecipe("garlic_bread", 300, 8, { + circuit: 1, + itemInputs: ['firmalife:food/toast', 'firmalife:food/butter', 'tfc:food/garlic'], + itemOutputs: ['firmalife:food/garlic_bread'], + itemOutputProvider: TFC.isp.of('firmalife:food/garlic_bread').copyOldestFood() + }) + // Alcohols global.TFC_ALCOHOL.forEach(alcohol => { @@ -964,6 +1051,13 @@ function registerTFGFoodRecipes(event) { [TFC.ingredient.notRotten('betterend:cave_pumpkin'), '#tfc:knives'], 'betterend:cave_pumpkin') .id(`tfg:crafting/cave_pumpkin_chunks_knife`) + processorRecipe("cut_cave_pumpkin", 100, 8, { + circuit: 30, + itemInputs: ["betterend:cave_pumpkin"], + itemOutputs: ["4x betterend:cave_pumpkin_chunks"], + itemOutputProvider: TFC.isp.of("4x betterend:cave_pumpkin_chunks").copyOldestFood() + }) + processorRecipe("cave_pumpkin_pie_dough", 300, GTValues.VA[GTValues.HV], { itemInputs: ['#tfg:martian_eggs', '2x betterend:cave_pumpkin_chunks', 'betterend:amber_root_product', '#tfc:sweetener'], fluidInputs: ['minecraft:water 1000'], diff --git a/kubejs/startup_scripts/firmalife/constants.js b/kubejs/startup_scripts/firmalife/constants.js index 5253ef8d1..83747ad96 100644 --- a/kubejs/startup_scripts/firmalife/constants.js +++ b/kubejs/startup_scripts/firmalife/constants.js @@ -33,7 +33,9 @@ global.FIRMALIFE_DISABLED_ITEMS = [ 'firmalife:irrigation_tank', // disabled so people use tongs instead - 'firmalife:peel' + 'firmalife:peel', + + 'firmalife:bucket/chocolate' ]; global.FIRMALIFE_HIDED_ITEMS = [ From cdd8213bedc128ce1be297389235415e6823df86 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 22:29:55 +0100 Subject: [PATCH 101/158] langs --- kubejs/assets/beneath/lang/uk_ua.json | 2 + kubejs/assets/betterend/lang/uk_ua.json | 30 +++-- kubejs/assets/create/lang/uk_ua.json | 12 +- kubejs/assets/createdeco/lang/uk_ua.json | 1 + kubejs/assets/firmalife/lang/uk_ua.json | 2 +- kubejs/assets/gtceu/lang/en_us.json | 2 + kubejs/assets/gtceu/lang/uk_ua.json | 7 +- kubejs/assets/minecraft/lang/uk_ua.json | 15 ++- kubejs/assets/tfc/lang/en_us.json | 133 ++++++++++++----------- kubejs/assets/tfc/lang/uk_ua.json | 10 +- kubejs/assets/tfg/lang/en_us.json | 69 ++++++------ kubejs/assets/tfg/lang/uk_ua.json | 131 +++++++++++++++------- 12 files changed, 242 insertions(+), 172 deletions(-) diff --git a/kubejs/assets/beneath/lang/uk_ua.json b/kubejs/assets/beneath/lang/uk_ua.json index b7c4cbe1e..142ace301 100644 --- a/kubejs/assets/beneath/lang/uk_ua.json +++ b/kubejs/assets/beneath/lang/uk_ua.json @@ -10,7 +10,9 @@ "block.beneath.crackrack": "Кератофір", "block.beneath.soul_clay": "Брудна Глина", "block.beneath.wood.fallen_leaves.crimson": "Занепала червона ламела", + "block.beneath.wood.leaves.crimson": "Багряна пластинка", "block.beneath.wood.fallen_leaves.warped": "Занепала викривлена ламела", + "block.beneath.wood.leaves.warped": "Покручена пластинка", "item.beneath.cursed_hide": "Лавостійка Шкіра", "item.beneath.blackstone_brick": "Цегла з Піроксеніту", "item.beneath.cursecoal": "Антрацит", diff --git a/kubejs/assets/betterend/lang/uk_ua.json b/kubejs/assets/betterend/lang/uk_ua.json index de416474c..d3c47af1c 100644 --- a/kubejs/assets/betterend/lang/uk_ua.json +++ b/kubejs/assets/betterend/lang/uk_ua.json @@ -72,21 +72,17 @@ "block.betterend.umbrella_moss": "Парасолькоподібний мох", "block.betterend.umbrella_moss_tall": "Парасолькоподібний мох", "block.betterend.vaiolush_fern": "Папороть Вайолаш", - "item.betterend.amber_root_product": "Бурштинові паростки", - "item.betterend.amber_root_seeds": "Насіння бурштинових пагонів", - "item.betterend.blossom_berry_product": "Цвіт ягод", - "item.betterend.blossom_berry_seeds": "Цвітіння насінини ягоди", - "item.betterend.bolux_mushroom_cooked": "Приготований гриб Болукс", - "item.betterend.bolux_mushroom_product": "Гриб Болукс", - "item.betterend.bolux_mushroom_seeds": "Спори гриба Болукс", - "item.betterend.cave_pumpkin_chunks": "Шматки Балбкіна", - "item.betterend.cave_pumpkin_product": "Балбкін", - "item.betterend.cave_pumpkin_plant_seeds": "Насіння Балбкіна", - "item.betterend.cave_pumpkin_pie": "Пиріг із Балбкіна", - "item.betterend.chorus_mushroom_cooked": "Приготований гриб Чалмі", - "item.betterend.chorus_mushroom_product": "Гриб Чалмі", - "item.betterend.chorus_mushroom_seeds": "Спори гриба Чалмі", - "item.betterend.shadow_berry_cooked": "Приготована ягода Нокс", - "item.betterend.shadow_berry_product": "Нокс ягода", - "item.betterend.shadow_berry_seeds": "Насіння нокс ягоди" + "item.create.netherite_diving_helmet.tooltip.summary": "Разом з _Blue Steel Backtank_, це може захистити вас від _extreme heat_. Щоб бути ефективними, _Legs and Feet_ повинні бути вкриті _Blue Steel Diving Equipment_, також.", + "item.create.netherite_backtank": "Бактанк із Синьої Сталі", + "item.create.netherite_diving_helmet": "Шолом для Дайвінгу із Синьої Сталі", + "item.create.netherite_diving_boots": "Черевики для Дайвінгу із Синьої Сталі", + "item.create.copper_sheet": "Мідна пластина", + "item.create.brass_sheet": "Латунна пластина", + "item.create.golden_sheet": "Золотий лист", + "item.create.crushed_raw_gold": "Очищена Золота Руда", + "item.create.crushed_raw_copper": "Очищена Мідна Руда", + "item.create.crushed_raw_zinc": "Очищена Цинкова Руда", + "item.create.crushed_raw_silver": "Очищена Срібна Руда", + "item.create.crushed_raw_tin": "Очищена Олов'яна Руда", + "item.create.crushed_raw_lead": "Очищена Свинцева Руда" } \ No newline at end of file diff --git a/kubejs/assets/create/lang/uk_ua.json b/kubejs/assets/create/lang/uk_ua.json index 62ef6ace1..591f2768a 100644 --- a/kubejs/assets/create/lang/uk_ua.json +++ b/kubejs/assets/create/lang/uk_ua.json @@ -91,10 +91,10 @@ "item.create.crushed_raw_tin": "Очищена Олов'яна Руда", "item.create.crushed_raw_lead": "Очищена Свинцева Руда", "create.ponder.andesite_tunnel.header": "Використання металевих тунелів", - "create.ponder.andesite_tunnel.text_1": "Металеві тунелі можна використовувати для приховування твоїх конвеєрних стрічок.", - "create.ponder.andesite_tunnel.text_2": "Коли металевий тунель має з'єднання з боків...", - "create.ponder.belt_casing.text_1": "Латунний або металевий корпус можна використовувати для декорування механічних ременів.", - "create.ponder.brass_funnel.text_1": "Металеві лійки можуть витягувати лише одиничні предмети.", - "create.ponder.cogwheel_casing.text_1": "Латунний або металевий корпус можна використовувати для декорування зубчастих коліс.", - "create.ponder.shaft_casing.text_1": "Латунний або металевий корпус можна використовувати для декорування валів." + "create.ponder.andesite_tunnel.text_1": "Металеві тунелі можна використовувати для приховування ременів", + "create.ponder.andesite_tunnel.text_2": "Якщо металевий тунель має з'єднання з боковими сторонами...", + "create.ponder.belt_casing.text_1": "Латунний або металевий кожух можна використовувати для декорування механічних ременів", + "create.ponder.brass_funnel.text_1": "Металеві воронки можуть витягувати лише окремі предмети.", + "create.ponder.cogwheel_casing.text_1": "Латунний або металевий кожух можна використовувати для декорування зубчастих коліс", + "create.ponder.shaft_casing.text_1": "Для оздоблення валів можна використовувати латунний або металевий кожух" } \ No newline at end of file diff --git a/kubejs/assets/createdeco/lang/uk_ua.json b/kubejs/assets/createdeco/lang/uk_ua.json index a6c767a13..2c95eeeca 100644 --- a/kubejs/assets/createdeco/lang/uk_ua.json +++ b/kubejs/assets/createdeco/lang/uk_ua.json @@ -63,6 +63,7 @@ "block.createdeco.locked_industrial_iron_door": "Зачинені Сталеві Двері", "block.createdeco.industrial_iron_trapdoor": "Сталевий Лаз", "block.createdeco.industrial_iron_ladder": "Сталева Драбина", + "block.createdeco.industrial_iron_facade": "Сталевий фасад", "item.createdeco.iron_coin": "Монета з Кованого Заліза", "item.createdeco.netherite_coin": "Монета з Синьої Сталі", "item.createdeco.industrial_iron_coin": "Монета зі Сталі", diff --git a/kubejs/assets/firmalife/lang/uk_ua.json b/kubejs/assets/firmalife/lang/uk_ua.json index b1c0bd510..b4c8b5a2c 100644 --- a/kubejs/assets/firmalife/lang/uk_ua.json +++ b/kubejs/assets/firmalife/lang/uk_ua.json @@ -18,5 +18,5 @@ "block.firmalife.treated_wood_greenhouse_door": "Двері теплиці з обробленої воском деревини", "block.firmalife.treated_wood": "Оброблена воском деревина", "greenhouse.firmalife.treated_wood": "Оброблена воском деревина", - "item.firmalife.treated_lumber": "Оброблена Воском Деревина" + "item.firmalife.treated_lumber": "Оброблені воском пиломатеріали" } \ No newline at end of file diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index e0d487eea..cee31871e 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -87,6 +87,8 @@ "item.gtceu.treated_wood_plate": "Treated Medium Density Fiberboard", "item.gtceu.wood_plate": "Medium Density Fiberboard", "item.gtceu.treated_wood_dust": "Treated Chipboard Composite", + "item.gtceu.small_treated_wood_dust": "Small Pile of Treated Chipboard Composite", + "item.gtceu.tiny_treated_wood_dust": "Tiny Pile of Treated Chipboard Composite", "material.gtceu.ice": "Ice Slush", "material.gtceu.damascus_steel": "Swine-steel", "material.gtceu.cooperite": "Cooperite", diff --git a/kubejs/assets/gtceu/lang/uk_ua.json b/kubejs/assets/gtceu/lang/uk_ua.json index c98584ff7..4dda465b9 100644 --- a/kubejs/assets/gtceu/lang/uk_ua.json +++ b/kubejs/assets/gtceu/lang/uk_ua.json @@ -95,6 +95,7 @@ "material.gtceu.ostrum": "Острум", "material.gtceu.calorite": "Калорит", "material.gtceu.etrium": "Етріум", + "material.gtceu.aluminium_silicate": "Алюмосилікат", "material.gtceu.rocket_alloy_t1": "Алюміносталевий ракетний сплав R-класу", "material.gtceu.rocket_alloy_t3": "Ракетний сплав вольфрамової сталі 45-Ti", "material.gtceu.vitrified_asbestos": "Вітрифікований азбест", @@ -154,14 +155,14 @@ "tagprefix.pickaxe_head": "%s Лезо кайла", "tagprefix.shovel_head": "%s Лезо лопати", "tagprefix.axe_head": "%s Лезо сокири", - "tagprefix.hoe_head": "%s Лезо мотики", + "tagprefix.hoe_head": "%s Оголів'я мотики", "tagprefix.scythe_head": "%s Лезо коси", - "tagprefix.file_head": "%s Лезо напилка", + "tagprefix.file_head": "%s Оголів'я напилка", "tagprefix.hammer_head": "%s Оголів'я молота", "tagprefix.saw_head": "%s Лезо пили", "tagprefix.knife_head": "%s Лезо ножа", "tagprefix.butchery_knife_head": "%s Лезо тесака", - "tagprefix.mining_hammer_head": "%s Лезо скельного молота", + "tagprefix.mining_hammer_head": "%s Оголів'я скельного молота", "tagprefix.spade_head": "%s Лезо лопати", "tagprefix.double_ingot": "%s Подвійний злиток", "tagprefix.poor_raw": "Бідна(е, ий) сира(е, ий) %s", diff --git a/kubejs/assets/minecraft/lang/uk_ua.json b/kubejs/assets/minecraft/lang/uk_ua.json index d7f7df16d..cbc46730e 100644 --- a/kubejs/assets/minecraft/lang/uk_ua.json +++ b/kubejs/assets/minecraft/lang/uk_ua.json @@ -45,7 +45,20 @@ "block.minecraft.pearlescent_froglight": "Перламутровий Світлобутон", "block.minecraft.verdant_froglight": "Зеленіючий Світлобутон", "block.minecraft.ochre_froglight": "Охристий Світлобутон", - "minecraft:nether_wart_block": "Блок багрового наросту", + "block.minecraft.nether_wart_block": "Блок багрового бородавника", + "block.minecraft.weeping_vines_plant": "Багряна виноградна лоза", + "block.minecraft.weeping_vines": "Багряні лози", + "block.minecraft.red_sand": "Гематитний пісок", + "block.minecraft.red_sandstone": "Гематитний пісковик", + "block.minecraft.red_sandstone_stairs": "Гематитні пісковикові сходи", + "block.minecraft.red_sandstone_slab": "Гематитна пісковикова плита", + "block.minecraft.red_sandstone_wall": "Гематитна пісковикова стіна", + "block.minecraft.chiseled_red_sandstone": "Різьблений гематитний пісковик", + "block.minecraft.smooth_red_sandstone": "Гладкий гематитний пісковик", + "block.minecraft.smooth_red_sandstone_stairs": "Гладкі гематитні пісковикові сходи", + "block.minecraft.smooth_red_sandstone_slab": "Гладка гематитна пісковикова плита", + "block.minecraft.cut_red_sandstone": "Різаний гематитний пісковик", + "block.minecraft.cut_red_sandstone_slab": "Різана гематитна пісковикова плита", "item.minecraft.iron_nugget": "Самородок чавуну", "item.minecraft.iron_ingot": "Чавунний злиток", "item.minecraft.iron_block": "Чавунний блок", diff --git a/kubejs/assets/tfc/lang/en_us.json b/kubejs/assets/tfc/lang/en_us.json index 61aab90fe..265eef153 100644 --- a/kubejs/assets/tfc/lang/en_us.json +++ b/kubejs/assets/tfc/lang/en_us.json @@ -1,67 +1,70 @@ { - "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", - "block.tfc.fluid.salt_water": "Sea Water", - "block.tfc.cauldron.salt_water": "Sea Water Cauldron", - "fluid.tfc.salt_water": "Sea Water", - "item.tfc.bucket.salt_water": "Sea Water Bucket", - "item.tfc.powder.saltpeter": "Saltpeter Powder", - "item.tfc.powder.sulfur": "Sulfur Powder", - "tfc.jei.raw_hide_knapping": "Raw Hide Knapping", - "metal.tfg.redstone": "Redstone", - "metal.tfg.red_alloy": "Red Alloy", - "metal.tfg.tin_alloy": "Tin Alloy", - "metal.tfg.lead": "Lead", - "metal.tfg.invar": "Invar", - "metal.tfg.potin": "Potin", - "metal.tfg.cobalt": "Cobalt", - "metal.tfg.cobalt_brass": "Cobalt Brass", - "metal.tfg.aluminium_silicate": "Aluminium Silicate", - "trim_material.tfc.almandine_tfc": "Almandine", - "trim_material.tfc.andradite_tfc": "Andradite", - "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", - "trim_material.tfc.cinnabar_tfc": "Cinnabar", - "trim_material.tfc.coal_tfc": "Coal", - "trim_material.tfc.diamond_tfc": "Diamond", - "trim_material.tfc.emerald_tfc": "Emerald", - "trim_material.tfc.green_sapphire_tfc": "Green Sapphire", - "trim_material.tfc.grossular_tfc": "Grossular", - "trim_material.tfc.rutile_tfc": "Rutile", - "trim_material.tfc.lazurite_tfc": "Lazurite", - "trim_material.tfc.pyrope_tfc": "Pyrope", - "trim_material.tfc.rock_salt_tfc": "Rock Salt", - "trim_material.tfc.ruby_tfc": "Ruby", - "trim_material.tfc.salt_tfc": "salt", - "trim_material.tfc.sapphire_tfc": "Sapphire", - "trim_material.tfc.sodalite_tfc": "Sodalite", - "trim_material.tfc.coke_tfc": "Coke", - "trim_material.tfc.spessartine_tfc": "Spessartine", - "trim_material.tfc.topaz_tfc": "Topaz", - "trim_material.tfc.uvarovite_tfc": "Uvarovite", - "trim_material.tfc.nether_quartz_tfc": "Nether Quartz", - "trim_material.tfc.certus_quartz_tfc": "Certus Quartz", - "trim_material.tfc.quartzite_tfc": "Quartzite", - "trim_material.tfc.realgar_tfc": "Realgar", - "trim_material.tfc.malachite_tfc": "Malachite", - "trim_material.tfc.glass_tfc": "Glass", - "trim_material.tfc.olivine_tfc": "Olivine", - "trim_material.tfc.opal_tfc": "Opal", - "trim_material.tfc.amethyst_tfc": "Amethyst", - "trim_material.tfc.lapis_tfc": "Lapis", - "trim_material.tfc.apatite_tfc": "Apatite", - "trim_material.tfc.red_garnet_tfc": "Red Garnet", - "trim_material.tfc.yellow_garnet_tfc": "Yellow Garnet", - "trim_material.tfc.monazite_tfc": "Monazite", - "trim_material.tfc.rose_quartz_tfc": "Rose Quartz", - "trim_material.tfc.fluix_tfc": "Fluix", - "trim_material.tfc.silver_tfc": "Silver", - "trim_material.tfc.sterling_silver_tfc": "Sterling Silver", - "trim_material.tfc.gold_tfc": "Gold", - "trim_material.tfc.rose_gold_tfc": "Rose Gold", - "trim_material.tfc.nickel_tfc": "Nickel", - "trim_material.tfc.platinum_tfc": "Platinum", - "trim_material.tfc.titanium_tfc": "Titanium", - "trim_material.tfc.bismuth_tfc": "Bismuth", - "trim_material.tfc.neutronium_tfc": "Neutronium", - "trim_material.tfc.pyrite_tfc": "Pyrite", - "trim_material.tfc.redx_tfc": "RedX" + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.tfc.fluid.salt_water": "Sea Water", + "block.tfc.cauldron.salt_water": "Sea Water Cauldron", + "fluid.tfc.salt_water": "Sea Water", + "block.fluid.tfc.salt_water": "Sea Water", + "fluid.tfc.river_water": "River Water", + "block.fluid.tfc.river_water": "River Water", + "item.tfc.bucket.salt_water": "Sea Water Bucket", + "item.tfc.powder.saltpeter": "Saltpeter Powder", + "item.tfc.powder.sulfur": "Sulfur Powder", + "tfc.jei.raw_hide_knapping": "Raw Hide Knapping", + "metal.tfg.redstone": "Redstone", + "metal.tfg.red_alloy": "Red Alloy", + "metal.tfg.tin_alloy": "Tin Alloy", + "metal.tfg.lead": "Lead", + "metal.tfg.invar": "Invar", + "metal.tfg.potin": "Potin", + "metal.tfg.cobalt": "Cobalt", + "metal.tfg.cobalt_brass": "Cobalt Brass", + "metal.tfg.aluminium_silicate": "Aluminium Silicate", + "trim_material.tfc.almandine_tfc": "Almandine", + "trim_material.tfc.andradite_tfc": "Andradite", + "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", + "trim_material.tfc.cinnabar_tfc": "Cinnabar", + "trim_material.tfc.coal_tfc": "Coal", + "trim_material.tfc.diamond_tfc": "Diamond", + "trim_material.tfc.emerald_tfc": "Emerald", + "trim_material.tfc.green_sapphire_tfc": "Green Sapphire", + "trim_material.tfc.grossular_tfc": "Grossular", + "trim_material.tfc.rutile_tfc": "Rutile", + "trim_material.tfc.lazurite_tfc": "Lazurite", + "trim_material.tfc.pyrope_tfc": "Pyrope", + "trim_material.tfc.rock_salt_tfc": "Rock Salt", + "trim_material.tfc.ruby_tfc": "Ruby", + "trim_material.tfc.salt_tfc": "salt", + "trim_material.tfc.sapphire_tfc": "Sapphire", + "trim_material.tfc.sodalite_tfc": "Sodalite", + "trim_material.tfc.coke_tfc": "Coke", + "trim_material.tfc.spessartine_tfc": "Spessartine", + "trim_material.tfc.topaz_tfc": "Topaz", + "trim_material.tfc.uvarovite_tfc": "Uvarovite", + "trim_material.tfc.nether_quartz_tfc": "Nether Quartz", + "trim_material.tfc.certus_quartz_tfc": "Certus Quartz", + "trim_material.tfc.quartzite_tfc": "Quartzite", + "trim_material.tfc.realgar_tfc": "Realgar", + "trim_material.tfc.malachite_tfc": "Malachite", + "trim_material.tfc.glass_tfc": "Glass", + "trim_material.tfc.olivine_tfc": "Olivine", + "trim_material.tfc.opal_tfc": "Opal", + "trim_material.tfc.amethyst_tfc": "Amethyst", + "trim_material.tfc.lapis_tfc": "Lapis", + "trim_material.tfc.apatite_tfc": "Apatite", + "trim_material.tfc.red_garnet_tfc": "Red Garnet", + "trim_material.tfc.yellow_garnet_tfc": "Yellow Garnet", + "trim_material.tfc.monazite_tfc": "Monazite", + "trim_material.tfc.rose_quartz_tfc": "Rose Quartz", + "trim_material.tfc.fluix_tfc": "Fluix", + "trim_material.tfc.silver_tfc": "Silver", + "trim_material.tfc.sterling_silver_tfc": "Sterling Silver", + "trim_material.tfc.gold_tfc": "Gold", + "trim_material.tfc.rose_gold_tfc": "Rose Gold", + "trim_material.tfc.nickel_tfc": "Nickel", + "trim_material.tfc.platinum_tfc": "Platinum", + "trim_material.tfc.titanium_tfc": "Titanium", + "trim_material.tfc.bismuth_tfc": "Bismuth", + "trim_material.tfc.neutronium_tfc": "Neutronium", + "trim_material.tfc.pyrite_tfc": "Pyrite", + "trim_material.tfc.redx_tfc": "RedX" } \ No newline at end of file diff --git a/kubejs/assets/tfc/lang/uk_ua.json b/kubejs/assets/tfc/lang/uk_ua.json index d2cbb659b..dede5e361 100644 --- a/kubejs/assets/tfc/lang/uk_ua.json +++ b/kubejs/assets/tfc/lang/uk_ua.json @@ -12,6 +12,10 @@ "metal.tfg.tin_alloy": "Олов'яний сплав", "metal.tfg.lead": "Свинець", "metal.tfg.invar": "Інвар", + "metal.tfg.potin": "Потин", + "metal.tfg.cobalt": "Кобальт", + "metal.tfg.cobalt_brass": "Кобальтова латунь", + "metal.tfg.aluminium_silicate": "Алюмосилікат", "trim_material.tfc.almandine_tfc": "Альмандин", "trim_material.tfc.andradite_tfc": "Андрадіт", "trim_material.tfc.blue_topaz_tfc": "Синій Топаз", @@ -22,7 +26,7 @@ "trim_material.tfc.green_sapphire_tfc": "Зелений Сапфір", "trim_material.tfc.grossular_tfc": "Гроссуляр", "trim_material.tfc.rutile_tfc": "Рутил", - "trim_material.tfc.lazurite_tfc": "Лазурите", + "trim_material.tfc.lazurite_tfc": "Лазурит", "trim_material.tfc.pyrope_tfc": "Піроп", "trim_material.tfc.rock_salt_tfc": "Кам'яна Сіль", "trim_material.tfc.ruby_tfc": "Рубін", @@ -33,7 +37,7 @@ "trim_material.tfc.spessartine_tfc": "Спесартин", "trim_material.tfc.topaz_tfc": "Топаз", "trim_material.tfc.uvarovite_tfc": "Уваровіт", - "trim_material.tfc.nether_quartz_tfc": "Кварц Нижнього Світу", + "trim_material.tfc.nether_quartz_tfc": "Незерський кварц", "trim_material.tfc.certus_quartz_tfc": "Істинний кварц", "trim_material.tfc.quartzite_tfc": "Кварцит", "trim_material.tfc.realgar_tfc": "Реальгар", @@ -42,7 +46,7 @@ "trim_material.tfc.olivine_tfc": "Олівін", "trim_material.tfc.opal_tfc": "Опал", "trim_material.tfc.amethyst_tfc": "Аметист", - "trim_material.tfc.lapis_tfc": "Лазурит", + "trim_material.tfc.lapis_tfc": "Лапіс", "trim_material.tfc.apatite_tfc": "Апатит", "trim_material.tfc.red_garnet_tfc": "Червоний Гранат", "trim_material.tfc.yellow_garnet_tfc": "Жовтий Гранат", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 8670c0a70..f88883ad9 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -222,6 +222,7 @@ "block.tfg.grass.amber_mycelium": "Amber Mycelium", "block.tfg.grass.rusticus_mycelium": "Rusticus Mycelium", "block.tfg.grass.sangnum_mycelium": "Sangnum Mycelium", + "block.tfg.sapling.glacian": "Glacian Mushroom", "block.tfg.electromagnetic_accelerator": "Electromagnetic Accelerator", "block.tfg.superconductor_coil_large": "Large Superconductor Coil", "block.tfg.superconductor_coil_small": "Small Superconductor Coil", @@ -744,40 +745,6 @@ "tfg.tooltip.food_trait.refrigerating": "§bRefrigerating", "tfg.tooltip.foodtrait.freeze_dried": "Cryodesiccated", "tfg.tooltip.extraterrestrial_farming": "§4Temperature:§r An oxygenated environment provides 15°C", - "tfg.tooltip.nametag": "§7Used on a Scribing Table along with an item to name it, or with black dye to name the tag.", - "tfg.tooltip.yeast_starter": "§7Created with dried fruit", - "tfg.tooltip.beehive": "§7Needs to be filled with empty frames and surrounded by flowers to attract bees.", - "tfg.tooltip.obsolete.tree_tap": "§4Obsolete§f: Replaced by the AFC TreeTap, you can craft it from this one by placing this in a crafting table!", - "tfg.tooltip.obsolete.fridge": "§4Obsolete§f: Replaced by the TFG Refrigerator, you can craft it from this one by placing this in a crafting table!", - "tfg.tooltip.blaze_burner": "§cSuperheat§r §7with Coke, Anthracite, or Flawless and Exquisite coal gems.", - "tfg.tooltip.machine.perfect_overclock": "This machine has §2Perfect Overclocking§r!", - "tfg.tooltip.nether_dome_1": "§7Artificial enviroment to simulate the Nether.", - "tfg.tooltip.machine.customize_interior": "§7The interior is customizable! Check the multiblock preview in JEI.", - "tfg.tooltip.end_dome_1": "§7Artificial enviroment to simulate the End.", - "tfg.tooltip.armor.copper_diving_suit_warmth": "§7Warmth: -1", - "tfg.tooltip.armor.copper_diving_suit_insulation": "§7Insulation: +1", - "tfg.tooltip.armor.netherite_diving_suit_warmth": "§7Warmth: -2", - "tfg.tooltip.armor.netherite_diving_suit_insulation": "§7Insulation: +9", - "tfg.tooltip.armor.netherite_diving_suit_set": "§7Wear the full set to be §eHeatproof§7 from ambient temperatures.", - "tfg.tooltip.armor.nanomuscle_warmth": "§7Warmth: 0", - "tfg.tooltip.armor.nanomuscle_insulation": "§7Insulation: +10", - "tfg.tooltip.armor.nanomuscle_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", - "tfg.tooltip.armor.quarktech_warmth": "§7Warmth: 0", - "tfg.tooltip.armor.quarktech_insulation": "§7Insulation: +10", - "tfg.tooltip.armor.quarktech_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", - "tfg.tooltip.armor.space_suit_warmth": "§7Warmth: 0", - "tfg.tooltip.armor.space_suit_insulation": "§7Insulation: +10", - "tfg.tooltip.armor.space_suit_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", - "tfg.tooltip.support.tier1": "§79 x 5 x 9", - "tfg.tooltip.support.tier2": "§717 x 9 x 17", - "tfg.tooltip.support.tier3": "§733 x 13 x 33", - "tfg.tooltip.vessels": "§cMax: 3024mB", - "tfg.tooltip.solar_panel.single": "Produces §6256 FE/t§r (64 EU/t) on the §6moon§r during the §6day§r", - "tfg.tooltip.solar_panel.large_tier1": "Massive structure producing from §61024 to 4096 EU/t§r on the §6moon§r during the §6day§r", - "tfg.tooltip.solar_panel.large_tier2": "Massive structure producing from §64096 to 16384 EU/t§r on the §6moon§r during the §6day§r", - "tfg.tooltip.solar_panel.large_tier3": "Massive structure producing from §616384 to 65536 EU/t§r on the §6moon§r during the §6day§r", - "tfg.tooltip.petrified_egg": "§7Requires Magma to Incubate", - "tfg.tooltip.obsolete.depreciated": "§cDeprecated, cannot be crafted any more", "entity.tfg.moon_rabbit.male": "Moon Rabbit", "entity.tfg.moon_rabbit.female": "Moon Rabbit", "tfg.tooltip.moon_rabbit_variant.pink": "Pink Fur", @@ -931,6 +898,40 @@ "tooltip.tfg.ore_prospector_mode_vein": "per-vein", "tooltip.tfg.ore_prospector_mode_block": "per-block", "tfg.hangglider.disabled_dimension": "You can't use a hang glider here!", + "tfg.tooltip.nametag": "§7Used on a Scribing Table along with an item to name it, or with black dye to name the tag.", + "tfg.tooltip.yeast_starter": "§7Created with dried fruit", + "tfg.tooltip.beehive": "§7Needs to be filled with empty frames and surrounded by flowers to attract bees.", + "tfg.tooltip.obsolete.tree_tap": "§4Obsolete§f: Replaced by the AFC TreeTap, you can craft it from this one by placing this in a crafting table!", + "tfg.tooltip.obsolete.fridge": "§4Obsolete§f: Replaced by the TFG Refrigerator, you can craft it from this one by placing this in a crafting table!", + "tfg.tooltip.blaze_burner": "§cSuperheat§r §7with Coke, Anthracite, or Flawless and Exquisite coal gems.", + "tfg.tooltip.machine.perfect_overclock": "This machine has §2Perfect Overclocking§r!", + "tfg.tooltip.nether_dome_1": "§7Artificial enviroment to simulate the Nether.", + "tfg.tooltip.machine.customize_interior": "§7The interior is customizable! Check the multiblock preview in JEI.", + "tfg.tooltip.end_dome_1": "§7Artificial enviroment to simulate the End.", + "tfg.tooltip.armor.copper_diving_suit_warmth": "§7Warmth: -1", + "tfg.tooltip.armor.copper_diving_suit_insulation": "§7Insulation: +1", + "tfg.tooltip.armor.netherite_diving_suit_warmth": "§7Warmth: -2", + "tfg.tooltip.armor.netherite_diving_suit_insulation": "§7Insulation: +9", + "tfg.tooltip.armor.netherite_diving_suit_set": "§7Wear the full set to be §eHeatproof§7 from ambient temperatures.", + "tfg.tooltip.armor.nanomuscle_warmth": "§7Warmth: 0", + "tfg.tooltip.armor.nanomuscle_insulation": "§7Insulation: +10", + "tfg.tooltip.armor.nanomuscle_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", + "tfg.tooltip.armor.quarktech_warmth": "§7Warmth: 0", + "tfg.tooltip.armor.quarktech_insulation": "§7Insulation: +10", + "tfg.tooltip.armor.quarktech_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", + "tfg.tooltip.armor.space_suit_warmth": "§7Warmth: 0", + "tfg.tooltip.armor.space_suit_insulation": "§7Insulation: +10", + "tfg.tooltip.armor.space_suit_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", + "tfg.tooltip.support.tier1": "§79 x 5 x 9", + "tfg.tooltip.support.tier2": "§717 x 9 x 17", + "tfg.tooltip.support.tier3": "§733 x 13 x 33", + "tfg.tooltip.vessels": "§cMax: 3024mB", + "tfg.tooltip.solar_panel.single": "Produces §6256 FE/t§r (64 EU/t) on the §6moon§r during the §6day§r", + "tfg.tooltip.solar_panel.large_tier1": "Massive structure producing from §61024 to 4096 EU/t§r on the §6moon§r during the §6day§r", + "tfg.tooltip.solar_panel.large_tier2": "Massive structure producing from §64096 to 16384 EU/t§r on the §6moon§r during the §6day§r", + "tfg.tooltip.solar_panel.large_tier3": "Massive structure producing from §616384 to 65536 EU/t§r on the §6moon§r during the §6day§r", + "tfg.tooltip.petrified_egg": "§7Requires Magma to Incubate", + "tfg.tooltip.obsolete.depreciated": "§cDeprecated, cannot be crafted any more", "tfc.jei.flint_knapping": "Flint Knapping", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "Dyeing", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.gray": "Dyeing", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index 1938dd42d..932f5c4a4 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -218,6 +218,7 @@ "block.tfg.ev_gas_pressurizer": "§bПокращений газовий пресуризатор III§r", "block.tfg.semiheavy_ammoniacal_water": "Термохімічно збагачена амоніачна напівважка вода", "block.tfg.grass.mars_dirt": "Марсіанський ґрунт", + "block.tfg.grass.mars_farmland": "Марсіанське поле", "block.tfg.grass.amber_mycelium": "Бурштиновий міцелій", "block.tfg.grass.rusticus_mycelium": "Міцелій Rusticus", "block.tfg.grass.sangnum_mycelium": "Сангнумний міцелій", @@ -248,12 +249,13 @@ "block.tfg.zpm_railgun_item_loader_out": "§cZPM Міжпланетний рейкотронний вихідний модуль§r", "block.tfg.uv_railgun_item_loader_out": "§3UV Міжпланетний рейкотронний вихідний модуль§r", "block.tfg.uhv_railgun_item_loader_out": "§4UHV Міжпланетний рейкотронний вихідний модуль§r", - "block.tfg.sunflower": "Cоняшник", + "block.tfg.reflector": "Відбивний блок", + "block.tfg.sunflower": "Соняшник", "block.tfg.sunflower_wild": "Дикий соняшник", "block.tfg.sunflower_dead": "Мертвий соняшник", - "block.tfg.rapeseed": "Pіпак", - "block.tfg.rapeseed_wild": "Дикий ріпак", - "block.tfg.rapeseed_dead": "Мертвий ріпак", + "block.tfg.rapeseed": "Канола", + "block.tfg.rapeseed_wild": "Дика канола", + "block.tfg.rapeseed_dead": "Мертва канола", "block.tfg.casings.machine_casing_iron_desh": "Обшивка машини з дешу", "block.tfg.casings.machine_casing_stainless_evaporation": "Корпус випарної машини з нержавіючої сталі", "block.tfg.casings.machine_casing_blue_solar_panel": "Корпус базової сонячної панелі", @@ -380,7 +382,6 @@ "item.tfg.soaked_hardwood_strip": "Просочена Смуга Твердого Дерева", "item.tfg.prepared_leather_gloves": "Підготовлені Шкіряні Рукавички", "item.tfg.latex_soaked_gloves": "Латексно-Просякнуті Рукавички", - "item.tfg.spade_head_extruder_mold": "Форма екструдера (лезо лопати)", "item.tfg.unfired_chalk": "Необпалена Крейдяна Паличка", "item.tfg.armor_stand_arms": "Стійка для Броні з Руками", "item.tfg.flint_club_head": "Кам’яне оголів'я булави", @@ -474,9 +475,18 @@ "item.tfg.food.freeze_dried.melon_slice": "Сублімований скибочка дині", "item.tfg.food.freeze_dried.fig": "Сублімований інжир", "item.tfg.food.freeze_dried.pineapple": "Сублімований ананас", + "item.tfg.food.freeze_dried.blossom_berry": "Цвітіння сублімованої ягоди", + "item.tfg.food.freeze_dried.shadow_berry": "Сублімована ягода нокс", + "item.tfg.food.freeze_dried.cave_pumpkin": "Сублімовані шматки бульбкіна", "item.tfg.food.calorie_paste": "Калорійна паста", "item.tfg.food.meal_bag": "Сумка для їжі", "item.tfg.food.ice_soup": "Крижаний суп", + "item.tfg.food.raw_glacian_mutton": "Сире гляціанське бараняче м’ясо", + "item.tfg.food.cooked_glacian_mutton": "Смажене гляціанське бараняче м’ясо", + "item.tfg.spawn_egg.glacian_ram": "Яйце ghbpjde Гляціанця", + "item.tfg.food.raw_sniffer_beef": "Сире м’ясо нюхача", + "item.tfg.food.cooked_sniffer_beef": "Смажене м’ясо нюхача", + "item.tfg.spawn_egg.sniffer": "Яйце призову Нюхача", "item.tfg.roasted_sunflower_seeds": "Смажене насіння соняшника", "item.tfg.sunflower_seeds": "Насіння соняшника", "item.tfg.sunflower_product": "Соняшнткова Кепка", @@ -520,7 +530,9 @@ "item.tfg.wood.lumber.aeronos": "Деревина Аеронос", "item.tfg.wood.lumber.strophar": "Деревина Строфар", "item.tfg.wood.lumber.glacian": "Деревина Глаціан", - "item.tfg.aes_polyurethane": "Армована R-поліуретанова піна AES", + "item.tfg.glacian_wool": "Шерсть гляціанського барана", + "item.tfg.sniffer_wool": "Мінералонасичені пучки", + "item.tfg.aes_polyurethane": "Біо-АЕС армована R-поліуретанова піна", "item.tfg.mli_shielding": "Багатошарове ізольоване екранування", "item.tfg.rocket_cone_t3": "Високотехнологічний носовий обтічник ракети", "item.tfg.rocket_fin_t3": "Високотехнологічне ракетне оперення", @@ -530,6 +542,7 @@ "item.tfg.universal_compost_browns": "Коричневий універсальний компост", "item.tfg.universal_compost_greens": "Зелений універсальний компост", "item.tfg.etching_diamond_tip": "Гравіювальний алмазний наконечник", + "item.tfg.spade_head_extruder_mold": "Форма екструдера (лезо лопати)", "item.tfg.mining_hammer_head_extruder_mold": "Форма екструдера (оголів'я шахтного молота)", "item.tfg.sword_head_extruder_mold": "Форма екструдера (лезо меча)", "item.tfg.pickaxe_head_extruder_mold": "Форма екструдера (лезо кирки)", @@ -555,6 +568,8 @@ "item.tfg.small_casing_extruder_mold": "Форма екструдера (гільза малого калібру)", "item.tfg.shell_casing_extruder_mold": "Форма екструдера (гільза для снаряда)", "item.tfg.large_casing_extruder_mold": "Форма екструдера (гільза великого калібру)", + "item.tfg.photo_cell_t1": "Базова фотоелементна капсула", + "item.tfg.electric_extendo_grip": "Електричне подовжене руків’я", "material.tfg.latex": "Латекс", "material.tfg.vulcanized_latex": "Вулканізований Латекс", "material.tfg.fluix": "Флюс", @@ -627,13 +642,13 @@ "ore_vein.tfg.deep_pitchblende": "Ураніт & Пітчбленд", "ore_vein.tfg.deep_sapphire": "Сапфір і Альмадін", "ore_vein.tfg.deep_scheelite": "Шеєліт та Вольфрам", - "ore_vein.tfg.deep_sheldonite": "Шелдоніт і Борніт", + "ore_vein.tfg.deep_sheldonite": "Куперит і Борніт", "ore_vein.tfg.deep_topaz": "Топаз і Халькоцит", "ore_vein.tfg.normal_apatite": "Апатит і Пірохлор", "ore_vein.tfg.normal_basaltic_sands": "Мінеральні піски", "ore_vein.tfg.normal_beryllium": "Смарагд і Берилій", - "ore_vein.tfg.normal_bismuthinite": "Вісмут (Звичайний)", - "ore_vein.tfg.normal_cassiterite": "Каситерит (Звичайний)", + "ore_vein.tfg.normal_bismuthinite": "Бісмут (Звичайний)", + "ore_vein.tfg.normal_cassiterite": "Каситерит (звичайний)", "ore_vein.tfg.normal_coal": "Вугілля", "ore_vein.tfg.normal_copper": "Мідь та Халькопірит", "ore_vein.tfg.normal_garnet_tin": "Гранат і Каситеритові піски", @@ -643,7 +658,7 @@ "ore_vein.tfg.normal_hematite": "Гематит та Лімоніт", "ore_vein.tfg.normal_lapis": "Лапіс, Лазурит та Содаліт", "ore_vein.tfg.normal_limonite": "Лімоніт", - "ore_vein.tfg.normal_lubricant": "Стеатит, Тальк і Трона", + "ore_vein.tfg.normal_lubricant": "Соапостон, Тальк і Трона", "ore_vein.tfg.normal_magnetite": "Магнетит і Ванадій", "ore_vein.tfg.normal_manganese": "Марганець і Тантал", "ore_vein.tfg.normal_mica": "Кіаніт, Слюда та Боксити", @@ -659,30 +674,30 @@ "ore_vein.tfg.normal_spodumene": "Сподумен та Лепідоліт", "ore_vein.tfg.normal_sulfur": "Сірка та Пірит", "ore_vein.tfg.normal_tetrahedrite": "Тетраедрит (Звичайний)", - "ore_vein.tfg.surface_bismuthinite": "Вісмут (Поверхня)", - "ore_vein.tfg.surface_cassiterite": "Каситерит (Поверхнивий)", + "ore_vein.tfg.surface_bismuthinite": "Вісмут (Поверхневий)", + "ore_vein.tfg.surface_cassiterite": "Каситерит (Поверхневий)", "ore_vein.tfg.surface_copper": "Халькопірит та Реальгар", "ore_vein.tfg.surface_sphalerite": "Сфалерит і Сірка", - "ore_vein.tfg.surface_tetrahedrite": "Тетраедрит (Поверхня)", + "ore_vein.tfg.surface_tetrahedrite": "Тетраедрит (Поверхневий)", "ore_vein.tfg.moon_apatite": "Апатит і Пірохлор", "ore_vein.tfg.moon_bauxite": "Боксит і Ільменіт", "ore_vein.tfg.moon_beryllium": "Смарагд і Берилій", "ore_vein.tfg.moon_desh": "Деш і Ільменіт", "ore_vein.tfg.moon_garnierite": "Гарнієрит і Кобальтит", "ore_vein.tfg.moon_graphite": "Графіт і Діамант", - "ore_vein.tfg.moon_lubricant": "Стеатит, Тальк і Трона", + "ore_vein.tfg.moon_lubricant": "Соапостон, Тальк і Трона", "ore_vein.tfg.moon_magnetite": "Хроміт і Магнетит", "ore_vein.tfg.moon_manganese": "Марганець і Тантал", "ore_vein.tfg.moon_mica": "Кіаніт, Слюда та Боксити", "ore_vein.tfg.moon_molybdenum": "Вульфеніт і Молібденіт", "ore_vein.tfg.moon_monazite": "Бастнезит і Монацит", "ore_vein.tfg.moon_pyrolusite": "Піролюзит і Кобальт", - "ore_vein.tfg.moon_quartz": "Істинний Кварц", + "ore_vein.tfg.moon_quartz": "Істинний кварц", "ore_vein.tfg.moon_redstone": "Редстоун, Кіновар і Рубін", "ore_vein.tfg.moon_saltpeter": "Селітра та Електротин", "ore_vein.tfg.moon_sapphire": "Сапфір і Альмадін", "ore_vein.tfg.moon_scheelite": "Шеєліт та Вольфрам", - "ore_vein.tfg.moon_sheldonite": "Шелдоніт і Борніт", + "ore_vein.tfg.moon_sheldonite": "Куперит і Борніт", "ore_vein.tfg.moon_silver": "Срібло, Гален і Свинець", "ore_vein.tfg.moon_sphalerite": "Сфалерит і Пірит", "ore_vein.tfg.moon_topaz": "Топаз і Халькоцит", @@ -690,31 +705,31 @@ "ore_vein.tfg.nether_apatite": "Апатит і Пірохлор", "ore_vein.tfg.nether_basaltic_sands": "Мінеральні піски", "ore_vein.tfg.nether_beryllium": "Смарагд і Берилій", - "ore_vein.tfg.nether_cassiterite": "Каситерит", + "ore_vein.tfg.nether_cassiterite": "Касетерит", "ore_vein.tfg.nether_copper": "Мідь та Халькопірит", "ore_vein.tfg.nether_garnet": "Аметист, Опал і Гранат", "ore_vein.tfg.nether_garnet_tin": "Гранат і Каситеритові піски", "ore_vein.tfg.nether_garnierite": "Гарнієрит і Кобальтит", "ore_vein.tfg.nether_goethite": "Гетит", - "ore_vein.tfg.nether_gold": "Золото та Гематит", + "ore_vein.tfg.nether_gold": "Золото і Гематит", "ore_vein.tfg.nether_graphite": "Графіт і Діамант", "ore_vein.tfg.nether_hematite": "Гематит та Лімоніт", "ore_vein.tfg.nether_lapis": "Лапіс, Лазурит та Содаліт", - "ore_vein.tfg.nether_lubricant": "Стеатит, Тальк і Трона", + "ore_vein.tfg.nether_lubricant": "Соапостон, Тальк і Трона", "ore_vein.tfg.nether_magnetite": "Хроміт", "ore_vein.tfg.nether_manganese": "Марганець і Тантал", "ore_vein.tfg.nether_mica": "Кіаніт, Слюда та Боксити", "ore_vein.tfg.nether_molybdenum": "Вульфеніт і Молібденіт", "ore_vein.tfg.nether_monazite": "Бастнезит і Монацит", - "ore_vein.tfg.nether_naquadah": "Наквадак і Плутоній", + "ore_vein.tfg.nether_naquadah": "Наквада і Плутоній", "ore_vein.tfg.nether_olivine": "Бентоніт та Олівін", "ore_vein.tfg.nether_pitchblende": "Ураніт & Пітчбленд", - "ore_vein.tfg.nether_quartz": "Кварц Нижнього Світу", + "ore_vein.tfg.nether_quartz": "Незерський кварц", "ore_vein.tfg.nether_redstone": "Редстоун, Кіновар і Рубін", "ore_vein.tfg.nether_saltpeter": "Селітра та Електротин", "ore_vein.tfg.nether_sapphire": "Сапфір і Альмадін", "ore_vein.tfg.nether_scheelite": "Шеєліт та Вольфрам", - "ore_vein.tfg.nether_sheldonite": "Шелдоніт і Борніт", + "ore_vein.tfg.nether_sheldonite": "Куперит і Борніт", "ore_vein.tfg.nether_silver": "Срібло, Гален і Свинець", "ore_vein.tfg.nether_sphalerite": "Сфалерит і Пірит", "ore_vein.tfg.nether_sulfur": "Сірка та Пірит", @@ -734,6 +749,12 @@ "tfg.tooltip.moon_rabbit_variant.cyan": "Хутро кольору морської піни", "tfg.tooltip.moon_rabbit_variant.purple": "Лавандове хутро", "tfg.tooltip.moon_rabbit_variant.sofu": "Пломбірне хутро", + "entity.tfg.glacian_ram.male": "Glacian Ram", + "entity.tfg.glacian_ram.female": "Glacian Ewe", + "tfg.tooltip.attribution.glacian_ram": "§9§oCredit: Ad Astra", + "entity.tfg.sniffer.male": "Sniffer", + "entity.tfg.sniffer.female": "Sniffer", + "tfg.tooltip.attribution.sniffer": "§9§oCredit: Minecraft", "item.treetap.tap": "Застарілий предмет, створіть для оновлення", "item.gtceu.zinc_ingot": "Застарілий предмет, створіть для оновлення", "item.gtceu.brass_ingot": "Застарілий предмет, створіть для оновлення", @@ -857,6 +878,22 @@ "trim_material.tfc.neutronium_tfc": "Нейтроній", "trim_material.tfc.pyrite_tfc": "Пірит", "trim_material.tfc.redx_tfc": "RedX", + "tfg.emi.ore_veins.rock_types": "Зустрічається в типах порід:", + "tfg.emi.ore_veins.rarity": "Рідкість: %d", + "tfg.emi.ore_veins.density": "Щільність: %d", + "tfg.emi.ore_veins.y_ranges": "Глибина: %d до %d", + "tfg.emi.ore_veins.size": "Розмір: %d", + "tfg.emi.ore_veins.height": "Висота: %d", + "tfg.emi.ore_veins.radius": "Радіус: %d", + "emi.category.tfg.ore_vein_info": "Жили руди", + "tfg.toast.ore_prospector_none": "У межах діапазону руд не знайдено.", + "tfg.toast.ore_prospector_message": "Руди, знайдені в межах %s §6блоків у цьому напрямку: %s", + "tooltip.tfg.ore_prospector_stats": "Діапазон сканування: %s, Поперечний переріз: %s x %s.", + "tooltip.tfg.ore_prospector_count": "Цей розвідник зображатиме кількість руди.", + "tooltip.tfg.ore_prospector_xray": "Цей розвідник відображатиме %s рентгенівський огляд блоків руди.", + "tooltip.tfg.ore_prospector_mode_vein": "per-vein", + "tooltip.tfg.ore_prospector_mode_block": "per-block", + "tfg.hangglider.disabled_dimension": "Тут не можна використовувати дельтаплан!", "tfc.jei.flint_knapping": "Обробка Кременю", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "Фарбування", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.gray": "Фарбування", @@ -915,7 +952,7 @@ "tfc.recipe.barrel.tfg.barrel.cooling_water_3": "Охолоджувальна Вода", "tfc.recipe.barrel.tfg.barrel.cooling_water_4": "Охолоджувальна Вода", "tfc.recipe.barrel.tfg.sealed_barrel.prepared_leather_gloves": "Замочування Шкіряних Рукавичок", - "tfc.recipe.barrel.tfg.barrel.rapeseed_to_oil": "Витискання олії з ріпаку", + "tfc.recipe.barrel.tfg.barrel.rapeseed_to_oil": "Видобуток олії з каноли", "tfc.recipe.barrel.tfg.barrel.sunflower_to_oil": "Витискання олії з соняшника", "gtceu.aqueous_accumulator": "Водний акумулятор", "tfg.food_recipe.brining": "Засолювання", @@ -1026,7 +1063,7 @@ "quests.create_logistics.packager.subtitle": "Запакуй усе", "quests.create_logistics.packager.desc.1": "Коли подається &cсигнал редстоуну&r, &3Пакувальник&r запаковує предмети з блока, до якого він прикріплений (бік підключення можна змінити за допомогою &5гайкового ключа&r), і видає акуратну картонну упаковку. Кожна така упаковка має обсяг на 9 слотів, тож це чудовий спосіб переміщувати багато предметів одночасно. Щоб створити Пакувальник, знадобиться чимало &dКованого заліза&r та &dЕлектронна трубка&r, а також купа &dКартону&r (&dПапір&r і &dКлей&r).\n\nЗверни увагу: після створення Пакувальник працює без додаткового картону, тож про обслуговування можна не турбуватись!", "quests.create_logistics.packager.desc.2": "Якщо прикріпити &3табличку&r до Пакувальника, він автоматично наноситиме її текст на всі упаковки як адресу призначення. Це стане особливо корисним, коли ти почнеш налаштовувати маршрутизацію упаковок по базі.\n\nПакувальники також можуть розпаковувати будь-які упаковки, які потрапляють до них, вивантажуючи вміст у підключений інвентар.\n\n&c&lЗверни увагу: обрамлені таблички для цього не підходять!&r!", - "quests.create_logistics.frogport.title": "Package Frogports", + "quests.create_logistics.frogport.title": "Пакетні жабопорти", "quests.create_logistics.frogport.subtitle": "Ланцюг командування", "quests.create_logistics.frogport.desc.1": "&3Пакувальні Жабопорти&r — один із трьох способів переміщення упаковок і доставки їх у потрібне місце. Вони можуть підвішувати упаковки до &3Ланцюгових конвеєрів&r, по яких ті транспортуються вздовж з’єднань ланцюгів. Щоб їх використовувати, спершу потрібно створити мережу &3Ланцюгових конвеєрів&r, з’єднаних між собою ланцюгами та підключених до живлення: підійде будь-який ланцюг із тегом &d#forge:chains&r. Клацни Пкм по з’єднанню ланцюга перед тим, як встановити Жабопорт, щоб він взаємодіяв із цим сегментом.\n\nЖабопорти, розміщені безпосередньо над &3Пакувальником&r, автоматично підвішують упаковки, створені цим Пакувальником.", "quests.create_logistics.frogport.desc.2": "Жабопорти можуть не лише надсилати упаковки, а й приймати їх. Якщо клацнути ПКМ по Жабопорту, відкриється його назва, яку можна змінити. Ця назва слугує &aадресою&r — якщо якась упаковка має відповідну адресу призначення, Жабопорт &aавтоматично забере її&r з ланцюгової мережі! Отримана упаковка буде поміщена в інвентар блока, на якому встановлено Жабопорт.\n\nГоловне, щоб ланцюгова мережа була &oякось&r з’єднана з вхідними та вихідними Жабопортами — тоді упаковка зрештою знайде шлях. Але ти можеш оптимізувати маршрути, щоб скоротити час подорожі.", @@ -1054,7 +1091,7 @@ "quests.create_logistics.fabricate_rose_quartz.title": "Джерело рожевого кварцу: MV", "quests.create_logistics.fabricate_rose_quartz.subtitle": "Так само добре, як і справжнє", "quests.create_logistics.fabricate_rose_quartz.desc": "Оскільки високорівнева логістика не є критичною для просування, ти можеш відкласти виготовлення Лінзи до етапу &bMV&r, коли зможеш зробити це вдома. &dРожевий кварц&r можна кристалізувати з його порошкової форми (суміш 8 частин редстоуну та 1 частини кварцу з Незеру) за допомогою &bПокращеного &3Автоклава&r, замінивши звичайну (дистильовану) воду на &bКрижану воду&r, щоб імітувати природні умови. Так само, на рівні &bMV&r саму &dЛінзу з рожевого кварцу&r можна вирізати з &dПластини рожевого кварцу&r, яку, своєю чергою, потрібно виготовити з повного блока кварцу (оскільки це пластина з самоцвіту, її слід обробляти в &3Різаку&r).", - "quests.create_logistics.rose_quartz_lens.title": "Rose-tinted Glasses", + "quests.create_logistics.rose_quartz_lens.title": "Рожеві окуляри", "quests.create_logistics.rose_quartz_lens.subtitle": "ПЛО (Потрібен Лише Один)", "quests.create_logistics.rose_quartz_lens.desc": "Яким би способом ти не здобув потрібні матеріали, для створення Лінзи тобі знадобиться &3Токарний верстат&r. &7Базового &3Токарного верстата&r буде достатньо, щоб виготовити лінзу з &dВишуканого рожевого кварцу&r, але якщо ти хочеш зробити її зі звичайної пластини, знадобиться краща техніка — &bПокращений &3Токарний верстат&r.\n\nЩойно лінза буде готова, її можна використати в &7Базовому &3Лазерному гравері&r разом із &dПодвійною пластиною з червоного сплаву&r для створення модуля &dПередавача&r — і при цьому лінза не буде витрачена.", "quests.create_logistics.stock_link.title": "Посилання на запаси", @@ -1139,7 +1176,7 @@ "quests.development.hull_zpm.subtitle": "М'яка і Мокра електроніка", "quests.development.hull_zpm.desc": "Це лінія &9Мокрої&r електроніки.\n\nЦе буде найбільший виклик автоматизації у цьому модпаку. Бажаю успіху.", "quests.gregtech_energy": "GregTech Енергія", - "quests.gregtech_energy.subtitle": "So how does all of that work?", + "quests.gregtech_energy.subtitle": "Ото як усе це працює?", "quests.gregtech_energy.start.title": "Давай щось пояснимо", "quests.gregtech_energy.start.desc": "Ми знаємо, що GregTech — не найпростіший мод для освоєння, особливо коли йдеться про &cенергетичну систему&r. Тому в цьому розділі ми не поспішаємо й пояснимо якомога більше.\n\nДеякі речі тут можуть не повністю зрозумітися до пізніших етапів твого розвитку, тож не переймайся. Просто намагайся засвоїти те, що можеш зараз, і не соромся &dповертатися до цього розділу&r, коли виникатимуть питання.\n\nМи розбили цей розділ на &eчотири категорії&r — кожна охоплює окремий аспект енергетичної системи GregTech. Ми надамо якомога більше прикладів, щоб тобі було легше зрозуміти, як усе працює.", "quests.gregtech_energy.start.task": "Вітаємо на борту", @@ -1169,7 +1206,7 @@ "quests.gregtech_energy.lv_generator.desc.1": "Усі ці — твої базові &61-блокові генератори&r. Вони мають лише один &9вхід&r для палива — чи то &eпра&r, &aгаз&r, чи &6рідке паливо&r — і видають рівно &e1A&r енергії на своєму енергетичному рівні.\n\nЗ ними легко працювати, і вони стануть твоїм &oпершим джерелом енергії&r у &5GregTech&r, доки ти не перейдеш до &dвеликих мультиблокових генераторів&r пізніше.\n\nЩоб дізнатися, яке паливо можна використовувати, &aEMI&r — твій найкращий друг, або ж заглянь у &bзавдання ліворуч&r, де ми перелічили найбільш &aоптимальні варіанти&r. А поки ось &lтри способи&r почати виробництво енергії — усі вони &aдоступні&r, вибір за тобою.", "quests.gregtech_energy.lv_generator.desc.2": "&e1. Парова енергія&r:\n\nЦе найкласичніший метод. Ви можете перетворити пару, вироблену вашими Котлами Високого Тиску, на EU за допомогою Парової Турбіни.\n\nВона генерує &e32 EU/t&r при &e64 mB/t&r пари. Якщо ви оберете цей шлях, ми наполегливо рекомендуємо створити Великий Бронзовий Котел, який легко можна заправити лавою, крезотом або іншими твердими паливами (перевірте JEI!).", "quests.gregtech_energy.lv_generator.desc.3": "&e2. Обертальна енергія&r:\n\nВи можете використати обертальну енергію з модифікації Create разом з Альтернатором для генерації RF, а потім перетворити її на EU за допомогою &7Перетворювача LV&r.\n\n(Перевірте завдання \"Альтернатори\" у LV для отримання додаткової інформації.)", - "quests.gregtech_energy.lv_generator.desc.4": "&e3. Біодизельна енергія (TFG-ексклюзив)&r:\n\nРіпак та соняшники можна переробити у великі об’єми Масла з Насіння. Об'єднайте його з TFC-Спиртом, щоб отримати Біодизель.\n\nЦей метод може здатися складнішим, але Біодизель надзвичайно потужний на рівнях &7LV&r та &bMV&r. У майбутньому він добре масштабується аж до &5EV&r завдяки &eБіодизелю з Підвищеним Цетановим Числом&r.\n\nЩоб використовувати Біодизель, вам знадобиться &7LV&r Двигун Внутрішнього Згоряння. Хоча він може бути трохи дорожчим, кожен mB Біодизелю дає велику кількість EU, що спрощує транспортування та зберігання.\n\nВибір за вами — як почати своє енергетичне виробництво.", + "quests.gregtech_energy.lv_generator.desc.4": "&e3. Біодизельна енергія (TFG-ексклюзив)&r:\n\nКанола та соняшники можна переробити у великі об’єми Масла з Насіння. Об'єднайте його з TFC-Спиртом, щоб отримати Біодизель.\n\nЦей метод може здатися складнішим, але Біодизель надзвичайно потужний на рівнях &7LV&r та &bMV&r. У майбутньому він добре масштабується аж до &5EV&r завдяки &eБіодизелю з Підвищеним Цетановим Числом&r.\n\nЩоб використовувати Біодизель, вам знадобиться &7LV&r Двигун Внутрішнього Згоряння. Хоча він може бути трохи дорожчим, кожен mB Біодизелю дає велику кількість EU, що спрощує транспортування та зберігання.\n\nВибір за вами — як почати своє енергетичне виробництво.", "quests.gregtech_energy.lv_generator.task": "Будь-який Генератор LV", "quests.gregtech_energy.mv_generator.title": "Генератори MV", "quests.gregtech_energy.mv_generator.subtitle": "У принципі такі самі, як і LV-генератори", @@ -1235,7 +1272,7 @@ "quests.gregtech_energy.storage.title": "Збереження Енергії", "quests.gregtech_energy.storage.subtitle": "Треба ж десь подіти всю цю енергію", "quests.gregtech_energy.storage.desc": "Зберігання енергії — одна з фундаментальних засад енергетичної системи в GregTech.\n\nЧому це так? Бо навіть найпотужніші генератори не здатні підтримувати стабільну подачу при запуску великого крафту — особливо на пізніх етапах гри.\n\nЩоб впоратися з цим, GregTech пропонує низку рішень для зберігання астрономічних обсягів EU. Такі сховища працюють як буфер між генерацією енергії та машинами, які її поглинають під час складних операцій.\n\nЧи то ти готуєшся до запуску реактора термоядерного синтезу, ВХР чи ланцюга крафтів масштабу HV–IV, резервний запас енергії стане ключем до стабільності.\n\nНе недооцінюй силу хорошої батареї — саме вона може врятувати твою базу від блекауту у критичний момент.", - "quests.gregtech_energy.storage.task": "Зрозуміло", + "quests.gregtech_energy.storage.task": "Я розумію", "quests.gregtech_energy.tank.title": "Зберігання пального", "quests.gregtech_energy.tank.subtitle": "Існують не лише електричні батареї", "quests.gregtech_energy.tank.desc.1": "Очевидно, що зберігання енергії також охоплює і зберігання пального, яке її генерує.\n\nУ цьому випадку, хоча Бочки та Ящики — непогані варіанти на ранніх етапах, не варто недооцінювати &dСупербак&r і &dСуперскриню&r.", @@ -1261,7 +1298,7 @@ "quests.gregtech_energy.spending_energy.desc.2": "Стандартна механіка:\n- Якщо мультиблок може приймати два енергетичних люки (більшість з них), це дозволяє використовувати рецепти вищого рівня, ніж базовий рівень машини.\n\nПриклад:\nЯкщо ви використовуєте Велику Змішувальну Ємність і встановите два енергетичних люки IV, вона зможе обробляти рецепти Змішувача рівня &cLuV&r.\n\nЦе одна з ключових переваг мультиблоків над одноблоковими машинами — щоб оновити їх до наступного рівня, достатньо замінити енергетичні люки, а не всю машину.", "quests.gregtech_energy.spending_energy.desc.3": "Деякі мультиблоки приймають лише один енергетичний люк, але це не означає, що ви обмежені 1A!\n\nВи все ще можете використовувати енергетичний люк на 4A або 16A. Це дозволить &bРозгону&r рецептів, але не змінить їх рівень.\n\nПриклад:\nВеликий Збирач Схем приймає лише один енергетичний люк. Якщо встановити енергетичний люк IV на 4A, ви зможете розігнати всі рецепти рівня IV і нижче.\n\nОднак він не може створювати рецепти рівня LuV, оскільки машина не підтримує кілька люків. Це обмеження зроблено навмисно, щоб запобігти пропуску системи прогресу GregTech.", "quests.gregtech_energy.spending_energy.desc.4": "Тож пам’ятайте: більше амперів на одному люку означає швидшу обробку, але для розблокування рецептів вищого рівня потрібні два люки.", - "quests.gregtech_energy.spending_energy.task": "Зрозуміло", + "quests.gregtech_energy.spending_energy.task": "Я розумію", "quests.gregtech_energy.overclock.title": "Розгін", "quests.gregtech_energy.overclock.subtitle": "Базова механіка покращення", "quests.gregtech_energy.overclock.desc.1": "Чули про розгін, але не зовсім розумієте, що це? Давайте трохи розберемось.\n\nПочнемо з основ:\n&dLV&r — максимум 32 EU/t — іноді менше, але ніколи більше.\n&dMV&r — до 128 EU/t.\n&dHV&r — досягає 512 EU/t.\nФактично, кожен рівень — це збільшення споживання енергії в 4 рази.", @@ -1289,7 +1326,7 @@ "quests.high_voltage.energium_crystals.subtitle": "Науково-фантастичні батареї!", "quests.high_voltage.energium_crystals.desc": "&aКристали Енергіуму&r зберігають значну кількість &9EU&r. Їх також можна вважати дешевшими.", "quests.high_voltage.autoclave.title": "Автоклав HV", - "quests.high_voltage.autoclave.subtitle": "Home-grown batteries", + "quests.high_voltage.autoclave.subtitle": "Домашні акумулятори власного виробництва", "quests.high_voltage.autoclave.desc": "&3Автоклав Hv&r — хоч і необов’язковий, але це машина, яку ви точно захочете отримати.\n\nВона відкриває доступ до унікальних батарей, які &6значно перевершують&r свої стандартні аналоги.", "quests.high_voltage.chem_bath.title": "Купання під Високою Напругою", "quests.high_voltage.chem_bath.subtitle": "Будь ласка, не приймай ванну з тостером...", @@ -1357,6 +1394,7 @@ "quests.high_voltage.lcr.desc.2": "Існують також ексклюзивні рецепти для &3ВХР&r. Наприклад, &dРадон&r наразі можна створити лише в ВХР.\n\nУсі &dРозгони&r в &3ВХР&r мають &6100%% ефективність&r (так звані \"Ідеальні розгони\"); кожен розгін &5вчетверо&r пришвидшує обробку, на відміну від звичайного подвоєння.\n\n&3ВХР&r має ще одну &6перевагу&r: можна використати &32 Енергетичні люки&r, щоб запускати рецепти &5на наступному рівні&r, подібно до &3Електричної доменної печі&r.", "quests.high_voltage.lcr.desc.3": "&9Порада:&r Враховуючи кількість ВХР, яку ти можеш використати, чому б не застосувати &dспільні стіни&r на повну?\n\nМожна поділити один стандартний &3Енергетичний люк&r (2A) між двома ВХР.\n\nМожна також спробувати поділити &3Люки введення/виведення&r, але переконайся, що кожен ВХР виконує правильний рецепт.\n\nЗверни увагу: &dЛюки обслуговування&r не можна ділити.", "quests.high_voltage.tnt.title": "ТНТ", + "quests.high_voltage.tnt.task": "Будь-яка вибухівка", "quests.high_voltage.tnt.desc.1": "Готуйся створювати вибухівку — вона знадобиться для &cІмплозійного компресора&r. Маєш чотири варіанти, від простого до найскладнішого, але ми радимо якнайшвидше перейти на &dІндустріальний ТНТ&r.", "quests.high_voltage.tnt.desc.2": "&cТНТ&r (тринітротолуол) більше не можна виготовити зі звичайного Пороху та Піску. Натомість доведеться створити &aЗагущений Толуол&r і відреагувати його з Сірчаною кислотою для отримання ТНТ.\n\nРецепт у &3HV Хімічному Реакторі&r дозволяє подвоїти вихід &aЗагущеного Толуолу&r, але потребує додаткових ресурсів.", "quests.high_voltage.tnt.desc.3": "Ніяких простих порад щодо &aТолуолу&r ми не маємо — яким би шляхом ти не пішов, це буде непросто.\n\nАле не пропусти прямий рецепт з &aВажкого пального&r у &aТолуол&r у одноблоковій &3Дистилярні&r.\n\n&aТолуол&r також можна опціонально використати на &5EV&r рівні для створення &dБензину&r.\n\n&cТНТ&r використовується в &3Імплозійному компресорі&r для створення Самоцвітів. А ще він вибухає.", @@ -1449,6 +1487,14 @@ "quests.high_voltage.welcome_moon.title": "Я на &3Місяці&r!", "quests.high_voltage.welcome_moon.subtitle": "Сподіваюся, в тебе є все, щоб повернутися", "quests.high_voltage.welcome_moon.desc": "&2Вітаємо&r, ти успішно приземлився на &7Місяці&r! \nТут ти знайдеш жили &bІстинний кварц&r і метеорити, які дозволяють почати розблоковувати &dAE2&r.\n\nАле це ще не все — деякі жили тут набагато щільніші, ніж на Землі.\n\nНаприклад, на Місяці легко знайти жили &6Ільменіту&r, &7Бокситу&r, &7Алюмінію&r та &5Хроміту&r. \nСтворення невеликої бази тут буде вирішальним для подальшого прогресу.\n\nНайбільшим викликом буде транспортування ресурсів, адже наразі немає зручних міжвимірних інструментів, таких як &5Ендер-Скриня&r або &dAE2 Квантовий Зв’язок&r.\n\nСподіваємось, ти добре підготувався — інакше доведеться майструвати другу ракету та скафандр, щоби забрати свій труп!", + "quests.high_voltage.gun.title": "Візьміть зброю", + "quests.high_voltage.gun.subtitle": "А якщо це не спрацює — використайте більше зброї", + "quests.high_voltage.gun.task1": "Будь-яка зброя", + "quests.high_voltage.gun.task2": "Будь-які ліки або витриманий алкоголь", + "quests.high_voltage.gun.desc": "Занадто розслабився на Землі? На Місяці ти будеш не сам, тож підготуйся до оборони — меча чи кам’яних дротиків буде недостатньо.\n\nОбери гарну гармату (якщо не знаєш яку — радимо &o«Clockwork» Снайперка&r), створи боєприпаси, а якщо хочеш чогось особливого — спробуй насадки.\n\nТакож варто взяти поживну їжу для підвищення макс. HP (спробуй пайки!), а ще алкоголь і ліки для бафів і лікування.", + "quests.high_voltage.space_survival.title": "Затишок далеко від дому", + "quests.high_voltage.space_survival.subtitle": "Більше, ніж просто шахтарський вимір", + "quests.high_voltage.space_survival.desc": "Якщо ти ще не ознайомився, обов’язково переглянь розділ завдань &3Поради — Космічне виживання&r! У ньому є вся необхідна інформація для створення повноцінної колонії на Місяці.", "quests.low_voltage": "&7LV&r – Низька напруга", "quests.low_voltage.subtitle": "Приборкай електрику та розпочни свою подорож у GregTech", "quests.low_voltage.lv_machine_hull.title": "Твій другий корпус машини", @@ -1473,7 +1519,7 @@ "quests.low_voltage.lbb.subtitle": "Бум, бум, бум, бум", "quests.low_voltage.lbb.desc.1": "&3Великий котел&r — це &6необов’язковий&r потужний варіант Малих котлів. Він працює на твердому або рідкому паливі. \n\nЯкщо ти хочеш виробляти енергію на основі пари, це альтернатива паровому двигуну Create. Майбутні варіанти енергопостачання описані в розділі &bMV&r. \n\nНа даний момент, через баг у GTCEu, ця машина ніколи не вибухає, але тобі варто налаштувати її так, щоб вона ніколи не залишалася без води, як і твої Малі котли, щоб вона не вибухнула, коли баг буде виправлений.", "quests.low_voltage.lbb.desc.2": "Після повного нагрівання &3LBB&r виробляє 800 пари за тик, що після конверсії дає &d400EU/t&r, або 12,5 базових парових турбін. Ця (відносно!) величезна потужність має ціну у вигляді &lвеликої&r кількості пального. &5З огляду на це&r, GUI дозволяє тобі &9знизити потужність&r котла до 25 відсотків, що дає 200 пари за тик. Це &d100EU/t&r, або трохи більше 3 базових парових турбін. \n\nМи рекомендуємо відкласти створення цього котла, поки ти не будеш готовий живити свою ЕДП.", - "quests.low_voltage.lbb.desc.3": "У TerraFirmaGreg у тебе є кілька варіантів пального. Ти можеш використовувати шланговий шків, щоб добувати нескінченну &cлаву&r з глибокого підземного озера, або налаштувати ферму дерев, щоб отримувати нескінченні &8вугілля&r та &8креозот&r. Останній варіант — це величезні поверхневі жили &8вугілля&r, які ти можеш добувати за допомогою автоматизованих шахтних машин і перетворювати на кокс, отримуючи значно більше креозоту, ніж із деревного вугілля.", + "quests.low_voltage.lbb.desc.3": "У TerraFirmaGreg у тебе є кілька варіантів палива. Можна використати Шланговий Шків, щоб витягнути лаву з глибокого підземного озера, або створити ферму дерев для отримання деревного вугілля та креозоту. Нарешті, існують величезні поверхневі поклади кам’яного вугілля, які можна добувати за допомогою автоматичних шахтарських машин і перетворювати на кокс, отримуючи значно більше креозоту, ніж із деревного вугілля.", "quests.low_voltage.lv_polariser.title": "Базовий поляризатор", "quests.low_voltage.lv_polariser.subtitle": "Поляризатор поляризує!", "quests.low_voltage.lv_polariser.desc": "Одна з найдешевших — якщо не найдешевша — &7LV&r машина. Використовуй її для створення &6Магнітних Стрижів без Редстоуна&r для своїх моторів. Щоразу, коли ти починаєш масове виробництво моторів, ця машина зекономить тобі цілі стопки Редстоуна.", @@ -1492,8 +1538,8 @@ "quests.low_voltage.lv_seed_oil.desc": "У тебе є два варіанти для виробництва &aОлії з насіння&r: або за допомогою &9Вакуумної камери&r, або, якщо вона вже є, &7Екстрактор Lv&r чудово впорається з цим завданням.\n\nТакож зверни увагу, що &aОлія з насіння&r використовується не лише для створення &2Біодизеля&r.\n\nЇї також можна переробити на &6Мастило&r або одразу відправити до твого &cВогняного пальника&r як паливо.", "quests.low_voltage.lv_seeds.title": "Спочатку візьми насіння", "quests.low_voltage.lv_seeds.subtitle": "Це високі рослини", - "quests.low_voltage.lv_seeds.desc": "Якщо ти натрапиш на ці рослини — збери їх і почни ферму.\n\nВони стануть найкращим джерелом &aОлії з насіння&r — рідини, що використовується для виробництва &eБіодизеля&r. Ріпак трохи стійкіший до низьких температур, а соняшник добре росте в теплому кліматі. Ти також можеш вирощувати їх у своїй Електричній теплиці, якщо не хочеш витрачати багато часу на фермерство — в такому разі використовуй ріпак, адже він не псується.\n\nЦе буде чудовим надбанням для виробництва енергії.", - "quests.low_voltage.lv_seeds.task": "Ріпак або соняшник", + "quests.low_voltage.lv_seeds.desc": "Якщо натрапите на ці рослини — обов’язково підберіть і почніть вирощувати.\n\nВони стануть вашим найкращим джерелом &aРослиної олії&r — рідини, що використовується для виробництва &eБіодизелю&r. Канола трохи стійкіша до низьких температур, а соняшники краще почуваються в теплішому кліматі. Ви також можете вирощувати їх в електричній теплиці, якщо не хочете витрачати багато часу на фермерство — щоправда, доведеться витрачати трохи енергії на їхнє зростання.", + "quests.low_voltage.lv_seeds.task": "Канола або Соняшник", "quests.low_voltage.lv_turbo_charge.title": "Швидка зарядка", "quests.low_voltage.lv_turbo_charge.subtitle": "Корисно для швидшого заряджання електроінструментів", "quests.low_voltage.lv_turbo_charge.desc": "&oЦя тема квесту є необов’язковою, але може зацікавити тебе. Ми додали її заради повноти.&r \n\n&3Швидка зарядка&r заряджає &6RF та EU&r предмети, такі як &9Дрилі&r, надзвичайно швидко. \n\nВін приймає до 4 Ампер на кожен предмет, який заряджає, що робить його &6вдвічі швидшим&r за &3Буфер батарей&r. Однак він не може розряджати. \n\n&eБудь-який&r Зарядний пристрій завершить цей квест.", @@ -1590,7 +1636,7 @@ "quests.low_voltage.other_machines.desc": "Ми не будемо розглядати &dповний масштаб звичайної обробки руди&r. Чому звичайної? Деякі руди потребують спеціальної обробки, але це тема для набагато пізніше. О ні, ми вже захопилися! \n\nДеякі машини, такі як &bХімічна Ванна&r або &bЕлектролізер&r, можуть бути корисними. \n\nЗлякався обробки руди? Переглянь спеціальний розділ &cОбробка Руди&r для повного покрокового керівництва!", "quests.low_voltage.other_machines.task": "Я погоджуюся втратити здоровий глузд", "quests.low_voltage.lv_chemical_bath.title": "Базова Хімічна Ванна", - "quests.low_voltage.lv_chemical_bath.subtitle": "The Chemical Bath bathes...", + "quests.low_voltage.lv_chemical_bath.subtitle": "Хімічна ванна занурює...", "quests.low_voltage.lv_chemical_bath.desc.1": "&lПозa межами обробки руди:&r \n\nТи можеш використовувати Хімічну Ванну для заміни рецептів, що використовують &6запечатану бочку&r, роблячи виробництво паперу та шкіри &6безболісним&r. \n\nЄ й інші менш важливі рецепти, такі як фарбування різних предметів і блоків або їх відбілювання.", "quests.low_voltage.lv_chemical_bath.desc.2": "&lДля обробки руди:&r \n\nДеякі &aДроблені Руди&r мають альтернативні шляхи при промиванні до &aОчищеної Руди&r, що включає купання у &aРтуті&r або &aПерсульфаті Натрію&r. Цей крок не є надто важливим, якщо тільки тобі не потрібен той особливий &6Побічний Продукт&r. Це може бути чудовим альтернативним джерелом Срібла (натяк, натяк!).", "quests.low_voltage.lv_electroliser.title": "Базовий Електролізер", @@ -1665,6 +1711,7 @@ "quests.low_voltage.lv_extractor.desc.2": "&l&3Лор:&r&o Ти помітив, що ця машина поєднує функції Екстрактора та Рідинного Екстрактора? У попередніх версіях GregTech це були окремі машини.", "quests.low_voltage.lv_chemical_reactor.title": "Базовий Хімічний Реактор", "quests.low_voltage.lv_chemical_reactor.subtitle": "Хімія для чайників", + "quests.low_voltage.lv_chemical_reactor.task": "Рідка гума", "quests.low_voltage.lv_chemical_reactor.desc.1": "&3Хімічний Реактор&r буде необхідний для &lбагатьох&r рецептів. \n\nНумо випробуймо його — чому б не використати твій щойно створений Хімічний Реактор, щоб розблокувати новий, &6кращий рецепт Гуми&r? Гума &dнепридатна&r у вигляді рідини, тому тобі знадобиться ще одна машина для її подальшої обробки.", "quests.low_voltage.lv_chemical_reactor.desc.2": "Ти не можеш створити Гуму, використовуючи лише Хімічний Реактор, тому ось кілька &aінших машин&r, які тобі варто розглянути: \n\n&3Затверджувач&r допоможе тобі перетворити рідку Гуму безпосередньо в &aГумові Листи&r. Вони тобі знадобляться надалі. \n\nПотім ти можеш скористатися &3Збирачем&r, щоб використовувати розплавлену Гуму для створення &aКабелів&r. Це не важливо для Олов'яних Кабелів, але кращі кабелі &eпотрібно&r буде створювати саме в Збирачі. \n\n&eПримітка:&r Щоб здати рідину, збережи її в &lбудь-якому&r резервуарі у своєму інвентарі. Бочка — ідеальний варіант.", "quests.low_voltage.lv_fluid_solidifier.title": "Базовий Затверджувач Рідин", @@ -1749,14 +1796,14 @@ "quests.medium_voltage.mv_battery.desc": "Як завжди, ми наполегливо рекомендуємо використовувати &bБуфер Акумуляторів&r — навіть якщо ви споживаєте більше &6енергії&r, ніж виробляєте, ви не втратите її миттєво, а зможете відновити запас, поки ваші машини не працюють.", "quests.medium_voltage.mv_battery.task": "Будь-який MV Буфер Акумуляторів", "quests.medium_voltage.mv_batteries.title": "Кращі батареї", - "quests.medium_voltage.mv_batteries.subtitle": "Baby Got Battery", + "quests.medium_voltage.mv_batteries.subtitle": "У малюка з’явився акумулятор", "quests.medium_voltage.mv_batteries.desc": "&bMV&r Батареї сподобаються тобі, якщо ти хочеш буферизувати Енергію, так само як &7LV&r. \n\nВартість у &aНатрії&r, &aЛітії&r або &aКадмії&r зростає до 8 пилу, тому варто використовувати те, чого у тебе найбільше. Різниця в ємності не &7ТАК&r велика, зрештою! \n\nОтримай &eбудь-яку&r Батарею, щоб завершити Завдання.", "quests.medium_voltage.mv_steel_alloy.title": "Сталеві Сплави", "quests.medium_voltage.mv_steel_alloy.subtitle": "Загартуй своє серце", "quests.medium_voltage.mv_steel_alloy.desc": "Ванадієва сталь потрібна в невеликих кількостях у прогресії. Вона &6майже вчетверо міцніша&r за звичайну сталь, якщо використовується в інструментах GregTech. Ванадій добувається з &aВанадієвого Магнетиту&r, який ти міг зустріти у магнетитових жилах. \n\nІнші сталеві сплави включають Синю Сталь, Червону Сталь та Чорну Сталь! \n\nВізьми трохи Синьої Сталі безкоштовно — вона вдвічі міцніша за звичайну сталь.", "quests.medium_voltage.pyrolyse.title": "Піролізна Піч", "quests.medium_voltage.pyrolyse.subtitle": "Термічний Розклад", - "quests.medium_voltage.pyrolyse.desc.1": "&3Піролізна Піч&r — це електричний аналог &3Коксової Печі&r. Вона може виробляти &9Коксівне Вугілля&r та &9Деревне Вугілля&r з побічним продуктом &9Креозотом&r, як і раніше, але також має додаткові &6Органічні Побічні Продукти&r, найкориснішим з яких є &aДеревний Дьоготь&r. \n\nЩе одним продуктом є &aБіомаса&r, яка зараз є більш актуальною для твого прогресу.", + "quests.medium_voltage.pyrolyse.desc.1": "&3Піролізна Піч&r — це електричний аналог &3Коксової Печі&r. Вона може виробляти &9Коксове Вугілля&r та &9Деревне Вугілля&r з побічним продуктом &9Креозотом&r, як і раніше, але також має додаткові &6Органічні Побічні Продукти&r, найкориснішим з яких є &aДеревний Дьоготь&r. \n\nЩе одним продуктом є &aБіомаса&r, яка зараз є більш актуальною для твого прогресу.", "quests.medium_voltage.pyrolyse.desc.2": "Побічні продукти можна переганяти для отримання різноманітних органічних ресурсів, причому &oрізні&r побічні продукти дають &oрізні&r співвідношення &oрізних&r хімічних речовин. \n\nТобі потрібно заглянути в &9Завдання з Перегонки&r, щоб розібратися в силі дистиляції...", "quests.medium_voltage.pyrolyse.desc.3": "Є рецепти, які можуть приймати &bАзот&r для подвоєння швидкості. Зараз це не надто варто переслідувати, але Азот згодом стане безкоштовним і нескінченним. \n\nТобі цілком вистачить одного &3LV Енергетичного Люка&r та Надпровідників для стабільного постачання &d64 EU/t&r. \n\nКрім того, &3Купронікелеві Котушки&r ідеальні для початкового використання Піролізної Печі, але з часом ти можеш захотіти оновитися до &bКанталу&r.", "quests.medium_voltage.pyrolyse.desc.4": "&9&lПримітка:&r&l Рослинний шлях — один із варіантів отримання &9&lЕтилену&r&l, який є необхідним хімічним елементом для прогресу до &6HV&r&l. Інший шлях включає використання Нафти.&r \n\nПіролізна Піч залишається &dнеобов’язковою&r. Однак її створення дуже вигідне — як для отримання Енергії, так і для різних Побічних Продуктів, тому ми настійно рекомендуємо тобі розглянути цей варіант. \n\n&l&3Лор:&r&o У GT5u структура Піролізної Печі була відомою як гігантська коробка з лише 9 котушками всередині. Гравці зазвичай витрачали кілька хвилин на пошук проблеми через відсутність попереднього перегляду EMI.", @@ -1808,7 +1855,7 @@ "quests.medium_voltage.mv_ethanol.desc": "Поклади свою раніше створену &aБіомасу&r в &3MV Дистилярню&r, щоб отримати &aЕтанол&r. \n\nТобі знадобиться він для &dЕтилену&r, реагуючи з &aСірчаною Кислотою&r у &3MV Хімічному Реакторі&r... якщо тільки ти не обрав Нафтовий шлях. \n\nЯкщо у тебе вже є значний запас Етанолу, подумай про створення та дистиляцію &9Ферментованої Біомаси&r у &3Дистиляційній Вежі&r (коли дійдеш до цього!) для отримання додаткових хімікатів. \n\n&cНе намагайся&r використовувати Етанол як джерело енергії... це, мабуть, найгірше його застосування. Якщо тобі потрібна органічна &9Енергія&r, краще зверни увагу на &dБензол&r!", "quests.medium_voltage.mv_bio_diesel.title": "Церква Біо-Дизелю", "quests.medium_voltage.mv_bio_diesel.subtitle": "Сила квітів", - "quests.medium_voltage.mv_bio_diesel.desc": "Хочеш спробувати щось рослинного походження, але без лісових ферм? Спробуй &3Біо-Дизель&r! Найкращий спосіб його отримання — через &dОлію з Насіння&r, яку можна добути з Соняшників або Ріпаку. Просто змішай її з невеликою кількістю Етанолу та Гідроксиду Натрію (отриманого з Морської Води!) у Хімічному Реакторі — і все готово! Бонусом цей метод також дає Гліцерин, який можна перетворити на &dЕтилен&r!", + "quests.medium_voltage.mv_bio_diesel.desc": "Хочеш спробувати щось рослинного походження, але без лісових ферм? Спробуй &3Біо-Дизель&r! Найкращий спосіб його отримання — через &dОлію з Насіння&r, яку можна добути з Соняшників або Каноли. Просто змішай її з невеликою кількістю Етанолу та Гідроксиду Натрію (отриманого з Морської Води!) у Хімічному Реакторі — і все готово! Бонусом цей метод також дає Гліцерин, який можна перетворити на &dЕтилен&r!", "quests.medium_voltage.mv_mutli_channel.title": "Багатоканальні Труби", "quests.medium_voltage.mv_mutli_channel.subtitle": "Це вже AE2?", "quests.medium_voltage.mv_mutli_channel.desc": "Звичайні &o&dGregTech&r Рідинні Труби можуть транспортувати лише один тип рідини за раз. \n\n&3Чотириканальні Рідинні Труби&r можуть передавати чотири різні типи рідин. &3Дев’ятиканальні Рідинні Труби&r можуть передавати дев’ять різних типів! Корисно для компактних налаштувань. \n\n&3Дев’ятиканальні Рідинні Труби&r будуть корисні на рівні &5EV&r для обробки численних виходів &3Дистиляційної Вежі&r. \n\nОтримай &eбудь-яку&r, щоб завершити цей квест.", @@ -2002,7 +2049,7 @@ "quests.metal_age.beneath_graphite.title": "Джерело графіту: Безодня", "quests.metal_age.beneath_graphite.subtitle": "До Глибин", "quests.metal_age.beneath_graphite.desc": "Глибоко, ГЛИБОКО під землею, за межами основи світу, ви знайдете Безодню — складну мережу печер, наповнених небезпеками різного роду на кожному кроці. У Безодні можна знайти величезні, високі жилки графіту, але певний монстр може її охороняти...!\n\nПоки ви тут, ви також можете шукати антрацит — чудове паливо для виробництва сталі.\n\nВиживання у Безодні є складним, тому зверніться до розділу \"Поради TerraFirmaGreg\" у цьому довіднику та польового посібника для отримання додаткової інформації.", - "quests.metal_age.beneath_graphite.task": "Пройдіть шар основної породи в Основному світі й дістаньтеся Безодні", + "quests.metal_age.beneath_graphite.task": "Пройдіть корінну породу в Основному світі й досягніть Безодні", "quests.metal_age.kaolin_clay.title": "Каолінова глина", "quests.metal_age.kaolin_clay.subtitle": "Подорож за Каоліном: Нове покоління", "quests.metal_age.kaolin_clay.desc": "Як тільки ви знайдете каолінову глину, варто принести стільки, скільки ви зможете перенести! На жаль, лише 20 відсотків з неї успішно випалюється у каолінітовий порошок, тому рекомендується випалювати її на місці за допомогою ямних печей, щоб заощадити місце в інвентарі.\n\nПісля того, як ви створите тигель і доменну піч, вам знадобиться не так багато каолінової глини, але все одно варто взяти більше, ніж здається потрібним, щоб уникнути повторної подорожі.\n\nP.S.: Якщо ви знайшли кров’яні лілії, але не знайшли глину, спробуйте копати трохи глибше! Іноді вона з'являється трохи під землею.", @@ -2223,7 +2270,7 @@ "quests.space_survival.stone_dust_centrifuging.task": "Будь-яке ", "quests.space_survival.compressed_gases.title": "Стиснені гази, придатні для дихання", "quests.space_survival.compressed_gases.subtitle": "Бо чистий кисень — це смертельно небезпечно", - "quests.space_survival.compressed_gases.desc": "Відчуваєш, як трохи бракує повітря? У космосі без чогось для дихання не обійтись — тому варто виробляти один із стиснених газів, заснованих на реальних сумішах для глибоководного занурення!\n\nЗаправити скафандр ними можна так само, як відро — просто перелити. А якщо взяти з собою &bГазовий Балон&r, то з нього можна “пити”, поповнюючи запаси без потреби знімати костюм.\n\n&2Нітрокс&r — найпростіший для виробництва на Землі, а &eГеліокс-3&r — можна створити на Місяці.\n\nПовний скафандр (1000mB) дає тобі &c20 хвилин&r життя.", + "quests.space_survival.compressed_gases.desc": "Відчуваєш, що трохи не вистачає повітря? У космосі без чогось для дихання не обійтись, тож варто звернути увагу на виробництво стиснених газів — вони засновані на реальних сумішах, які використовуються для глибоководного занурення!\n\nКосмічний костюм можна заповнити ними так само, як заповнюється відро, або ж, якщо взяти з собою &bГазовий балон&r, ти зможеш «пити» з нього, щоб поповнити запас газу в костюмі без необхідності його знімати.\n\n&2Нітрокс&r — найпростіший для виробництва на Землі, а &eГеліокс-3&r можна налаштувати на Місяці.\n\nПовністю заповнений костюм (2000 мБ) забезпечить приблизно &c20 хвилин&r дихання.", "quests.space_survival.compressed_gases.task": "Будь-який стиснений газ, придатний для дихання", "quests.space_survival.zip_gun.title": "Повітряна зброя", "quests.space_survival.zip_gun.subtitle": "Наче реактивний ранець у твоїй долоні", @@ -2427,7 +2474,7 @@ "quests.steam_age.steam_engine.desc": "Водяні колеса та вітряки вже не справляються? Яка ж це парова епоха без справжнього парового двигуна! Кожен паровий двигун може видавати цілих 256 ОД (Одиниць Потужності), надаючи тобі значно більше енергії для експериментів.\n\nПалаючі Пальники можна створити, не виходячи з дому, а за допомогою Механічної Руки їх можна автоматично заправляти твердим паливом або рідким паливом у відрі (наприклад, креозотом). Також для перегріву можна використовувати Вугільні Самоцвіти, Антрацит і Кокс.", "quests.steam_age.fuel_sources.title": "Додаткові Джерела Пального", "quests.steam_age.fuel_sources.subtitle": "Впроваджуємо силу в парову силу", - "quests.steam_age.fuel_sources.desc": "Парова машина може працювати з ширшим набором рідинних палив, ніж Котел Високого Тиску. Хоча Креозот або Лава — це найпростіші варіанти на даному етапі, ти можеш зацікавитися й рослинними оліями, такими як &eОлія з Насіння&r з Соняшників або Ріпаку.\n\nКреозот і Лава погано масштабуються на пізніх рівнях, натомість Біопальне може бути перетворене в Дизель, а потім — у Дизель з Цетановим Підсиленням. Тож якщо тобі до душі ця ідея — почни закладати великі поля для вирощування рослин на олію!", + "quests.steam_age.fuel_sources.desc": "Парова машина може працювати з ширшим набором рідинних палив, ніж Котел Високого Тиску. Хоча Креозот або Лава — це найпростіші варіанти на даному етапі, ти можеш зацікавитися й рослинними оліями, такими як &eОлія з Насіння&r з Соняшників або Каноли.\n\nКреозот і Лава погано масштабуються на пізніх рівнях, натомість Біопальне може бути перетворене в Дизель, а потім — у Дизель з Цетановим Підсиленням. Тож якщо тобі до душі ця ідея — почни закладати великі поля для вирощування рослин на олію!", "quests.steam_age.straw.title": "Автоматизація Рідкого Палива", "quests.steam_age.straw.subtitle": "Горючі поїльники", "quests.steam_age.straw.desc": "Якщо клацнути ПКМ по Пекельному Пальнику з &aСоломинкою&r, то можна легко подавати пальне прямо в нього через будь-яку трубу! Під’єднай його до виходу креозоту з Коксової Печі — і твої Парові Двигуни не зупиняться.\n\nУ JEI доступний повний список можливих палив із їхньою ефективністю.", @@ -2621,7 +2668,7 @@ "quests.stone_age.clay_products.title": "Глиняні вироби", "quests.stone_age.clay_products.subtitle": "Я ж казав, що глина універсальна.", "quests.stone_age.clay_products.desc": "Ось усі вироби, які ви можете створити з глини. Форми використовуються для роботи з металами, Корчага — для зберігання предметів, а інші мають призначення, описані в Польовому путівнику. Думаєте, вам під силу створити їх усі?", - "quests.stone_age.make_jug.title": "Керамічний глечик", + "quests.stone_age.make_jug.title": "Керамічний глек", "quests.stone_age.make_jug.subtitle": "Ранній контейнер для рідин", "quests.stone_age.make_jug.desc": "Глечик — це найпростіший контейнер для рідин, але він може вміщати лише 100mB. Ви також можете пити з нього та дути в нього, щоб створювати звуки!", "quests.stone_age.make_saw_mold.title": "Форма для пилки", @@ -2728,7 +2775,7 @@ "quests.tfg_tips.portable_storage.desc": "У своїх подорожах ти можеш дослідити цілу &oкупу&r місць і врешті-решт набрати багато мотлоху. Ця гілка завдань пропонує кілька варіантів для розширення твого мобільного інвентарю.", "quests.tfg_tips.toolbelt.title": "Пояс для інструментів та Сумки", "quests.tfg_tips.toolbelt.subtitle": "Ці інструменти займають багато місця, давай це виправимо!", - "quests.tfg_tips.toolbelt.desc": "З &dПоясом для інструментів&r ти зможеш керувати кількома інструментами без зайвих витрат слотів інвентарю! Цей зручний предмет можна розмістити у спеціальному &3Слоті поясу&r в твоєму &4Меню Curios&r. Ти можеш вставляти та витягати інструменти за допомогою &cгарячої клавіші.&r Спочатку він має лише два слоти, але їх можна розширити, додаючи &aСумки для поясу&r. \n\n&lЧерез баг у цьому моді неможливо покращити &dПояс для інструментів&f, якщо він був пофарбований або містить інструменти. Спочатку спорожни його!", + "quests.tfg_tips.toolbelt.desc": "З &dПоясом інструментів&r ви зможете керувати кількома інструментами без зайвих витрат слотів інвентарю! Цей зручний предмет можна розмістити в спеціальному &3слоті пояса&r у вашому &4меню Curios&r. Ви можете вставляти та діставати інструменти за допомогою &cгарячої клавіші.&r Спочатку він має лише два слоти, але їх кількість можна збільшити, додавши &aСумки для пояса&r.", "quests.tfg_tips.maxed_out_toolbelt.title": "ВСІ ІНСТРУМЕНТИ", "quests.tfg_tips.maxed_out_toolbelt.subtitle": "Цей пояс, мабуть, уже дуже важкий...", "quests.tfg_tips.maxed_out_toolbelt.desc": "&dToolbelt&r може вмістити 7 додаткових сумок, тобто 9 інструментів в одному поясі!", From 3933e6bcf611909a81e42116aef59f673eee1c2b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 22:35:23 +0100 Subject: [PATCH 102/158] update pakku --- pakku-lock.json | 367 ++++++++++++++++++++++++------------------------ 1 file changed, 184 insertions(+), 183 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index 38eaa01cc..5a2807488 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -1401,30 +1401,6 @@ "modrinth": "OfKzpbRU" }, "files": [ - { - "type": "curseforge", - "file_name": "baguettelib-1.20.1-Forge-1.0.0.jar", - "mc_versions": [ - "1.20.2", - "1.20.3", - "1.20.1", - "1.20.4" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6523/425/baguettelib-1.20.1-Forge-1.0.0.jar", - "id": "6523425", - "parent_id": "1264423", - "hashes": { - "sha1": "bb17d8ed796efce38eb8fcc72ec477f3373e6c9f", - "md5": "f27a8d6a333579d93a9881100d559b56" - }, - "required_dependencies": [], - "size": 26550, - "date_published": "2025-05-12T19:47:40.637Z" - }, { "type": "modrinth", "file_name": "baguettelib-1.20.1-Forge-1.0.0.jar", @@ -1446,6 +1422,27 @@ "required_dependencies": [], "size": 26550, "date_published": "2025-06-25T13:03:42.486510Z" + }, + { + "type": "curseforge", + "file_name": "baguettelib-1.20.1-Forge-1.1.0.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6909/482/baguettelib-1.20.1-Forge-1.1.0.jar", + "id": "6909482", + "parent_id": "1264423", + "hashes": { + "sha1": "140ea51f71e5f316e473354cdeeb0dbba5422632", + "md5": "74448bf96f648170cc03ab7bee6a6e3d" + }, + "required_dependencies": [], + "size": 30314, + "date_published": "2025-08-20T23:30:04.997Z" } ] }, @@ -1605,33 +1602,9 @@ "modrinth": "6VieRZiz" }, "files": [ - { - "type": "curseforge", - "file_name": "beneath-1.20.1-1.0.4.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6180/230/beneath-1.20.1-1.0.4.jar", - "id": "6180230", - "parent_id": "1113980", - "hashes": { - "sha1": "68fb9b544f582c45f7dc3402b2ae2f084d347a8b", - "md5": "a8b0315801867b2bc4762e14d3a1c0c7" - }, - "required_dependencies": [ - "302973" - ], - "size": 1500598, - "date_published": "2025-02-11T01:11:10.830Z" - }, { "type": "modrinth", - "file_name": "beneath-1.20.1-1.0.4.jar", + "file_name": "beneath-1.20.1-1.0.5.jar", "mc_versions": [ "1.20.1" ], @@ -1640,18 +1613,42 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/6VieRZiz/versions/BPS3Bb2s/beneath-1.20.1-1.0.4.jar", - "id": "BPS3Bb2s", + "url": "https://cdn.modrinth.com/data/6VieRZiz/versions/d0xgZnLe/beneath-1.20.1-1.0.5.jar", + "id": "d0xgZnLe", "parent_id": "6VieRZiz", "hashes": { - "sha512": "0e2ad7be3e389cb608fbe15c322de849ea05ebe890d8a015ff3e5dc9899cda90b1d1d73da25b57196ac0f0716ad9f6001aae8fe28f6851b1a1133c62267f8e45", - "sha1": "68fb9b544f582c45f7dc3402b2ae2f084d347a8b" + "sha512": "0eec3b25e7aebb8df74804d70a054c96e529f3d4cd437173219f891badef05d98996adcae387e6808e6489e18253aa73e6bd1193cfb9dcaf7ac26c92819e6bc8", + "sha1": "12edd937a9070a71e50dcb53fd757b30d115bc2a" }, "required_dependencies": [ "JaCEZUhg" ], - "size": 1500598, - "date_published": "2025-02-11T01:11:12.901644Z" + "size": 1500972, + "date_published": "2025-08-19T22:18:43.907020Z" + }, + { + "type": "curseforge", + "file_name": "beneath-1.20.1-1.0.5.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6905/461/beneath-1.20.1-1.0.5.jar", + "id": "6905461", + "parent_id": "1113980", + "hashes": { + "sha1": "12edd937a9070a71e50dcb53fd757b30d115bc2a", + "md5": "aeda5af6cf8575a816f7c4ea1630ca97" + }, + "required_dependencies": [ + "302973" + ], + "size": 1500972, + "date_published": "2025-08-19T22:18:40.447Z" } ] }, @@ -3153,37 +3150,9 @@ "modrinth": "pJGcKPh1" }, "files": [ - { - "type": "curseforge", - "file_name": "corpsecurioscompat-1.20.x-Forge-3.0.2.jar", - "mc_versions": [ - "1.20.2", - "1.20.3", - "1.20.1", - "1.20.4" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6616/671/corpsecurioscompat-1.20.x-Forge-3.0.2.jar", - "id": "6616671", - "parent_id": "1138130", - "hashes": { - "sha1": "946d6cc5055eac39900ff252cd2eb72caf95e4ac", - "md5": "f760be75a5b1c4c22c9327e72cd08a2c" - }, - "required_dependencies": [ - "309927", - "1264423", - "316582" - ], - "size": 12495, - "date_published": "2025-06-05T08:45:11.493Z" - }, { "type": "modrinth", - "file_name": "corpsecurioscompat-1.20.x-Forge-3.0.2.jar", + "file_name": "corpsecurioscompat-1.20.1-Forge-3.1.2.jar", "mc_versions": [ "1.20.1", "1.20.2", @@ -3194,18 +3163,44 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/pJGcKPh1/versions/WlXDIt4w/corpsecurioscompat-1.20.x-Forge-3.0.2.jar", - "id": "WlXDIt4w", + "url": "https://cdn.modrinth.com/data/pJGcKPh1/versions/oOV3E7PA/corpsecurioscompat-1.20.1-Forge-3.1.2.jar", + "id": "oOV3E7PA", "parent_id": "pJGcKPh1", "hashes": { - "sha512": "fd41651ff891977acfb2b74ea1738c3259435fdc38f887c8ec7073979faebda27adcd3d65cbb9b3fc98a17edd8df05800b5277ff3687ca0c72e2e4bb71f3be6e", - "sha1": "946d6cc5055eac39900ff252cd2eb72caf95e4ac" + "sha512": "f3a5ad7993bab522decefed9421002a130c5dae652e7e2b3c38a9afcf6dc14569ed00fd140a91fffb5e6baacde3eecb7ed0d0cc1222583a6d066be53c3dc726d", + "sha1": "6bffb8fd1ce4b0c7e504dc67271a05848f7d33a9" }, "required_dependencies": [ - "OfKzpbRU" + "WrpuIfhw", + "OfKzpbRU", + "vvuO3ImH" ], - "size": 12495, - "date_published": "2025-07-11T09:30:13.847826Z" + "size": 24680, + "date_published": "2025-08-19T16:40:42.144982Z" + }, + { + "type": "curseforge", + "file_name": "corpsecurioscompat-1.20.1-Forge-3.1.2.jar", + "mc_versions": [ + "1.20.2", + "1.20.3", + "1.20.1", + "1.20.4" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6898/69/corpsecurioscompat-1.20.1-Forge-3.1.2.jar", + "id": "6898069", + "parent_id": "1138130", + "hashes": { + "sha1": "6bffb8fd1ce4b0c7e504dc67271a05848f7d33a9", + "md5": "5e0ed6620f6576535e429ffe278442ef" + }, + "required_dependencies": [], + "size": 24680, + "date_published": "2025-08-17T21:25:40.290Z" } ] }, @@ -3547,27 +3542,6 @@ "modrinth": "kU1G12Nn" }, "files": [ - { - "type": "curseforge", - "file_name": "createaddition-1.20.1-1.3.1.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6306/951/createaddition-1.20.1-1.3.1.jar", - "id": "6306951", - "parent_id": "439890", - "hashes": { - "sha1": "0c408317b7c3bc3c7f7d5f6dbbb3ee106fa5f4fc", - "md5": "0abfc0f6db9558cba6eaee44266a4447" - }, - "required_dependencies": [], - "size": 1547196, - "date_published": "2025-03-15T13:17:38.737Z" - }, { "type": "modrinth", "file_name": "createaddition-1.20.1-1.3.1.jar", @@ -3590,6 +3564,29 @@ ], "size": 1547196, "date_published": "2025-03-22T16:14:26.357192Z" + }, + { + "type": "curseforge", + "file_name": "createaddition-1.20.1-1.3.2.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6901/922/createaddition-1.20.1-1.3.2.jar", + "id": "6901922", + "parent_id": "439890", + "hashes": { + "sha1": "41ea564e270effea8bad04b937fb30d2a3bb5053", + "md5": "0a70304b24fed06ef44470b613cdb251" + }, + "required_dependencies": [ + "328085" + ], + "size": 1583476, + "date_published": "2025-08-18T21:47:44.397Z" } ] }, @@ -5009,7 +5006,7 @@ "files": [ { "type": "modrinth", - "file_name": "everycomp-1.20-2.8.17-forge.jar", + "file_name": "everycomp-1.20-2.9.0-forge.jar", "mc_versions": [ "1.20.1" ], @@ -5017,22 +5014,22 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/eiktJyw1/versions/pztPAx2c/everycomp-1.20-2.8.17-forge.jar", - "id": "pztPAx2c", + "url": "https://cdn.modrinth.com/data/eiktJyw1/versions/QeAScqwj/everycomp-1.20-2.9.0-forge.jar", + "id": "QeAScqwj", "parent_id": "eiktJyw1", "hashes": { - "sha512": "6608da2f4ac880573c5f434c75995a3a3e917c47189d2d8570e9c3e09113ba78844b8c96510402a7d198e6cfde4502287ba771dc9940b8490cd97b5dc880a425", - "sha1": "79ab372f4b6645e3bd9ad34948a8ad3afa37fed5" + "sha512": "e9677f60675a83f0d645c95503bdcede921d7a5b0ce513766b051b785519bb7191165381deaae1837c716de12458e2f13ef59820a72af2d36788e9ed1f5fca9a", + "sha1": "79b7d93cebf1aa77d9d0b244f196d426a3a71e59" }, "required_dependencies": [ "twkfQtEc" ], - "size": 2781819, - "date_published": "2025-08-14T08:05:13.713026Z" + "size": 2805521, + "date_published": "2025-08-21T08:37:42.008646Z" }, { "type": "curseforge", - "file_name": "everycomp-1.20-2.8.17-forge.jar", + "file_name": "everycomp-1.20-2.9.0-forge.jar", "mc_versions": [ "1.20.1" ], @@ -5040,18 +5037,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6884/861/everycomp-1.20-2.8.17-forge.jar", - "id": "6884861", + "url": "https://edge.forgecdn.net/files/6910/551/everycomp-1.20-2.9.0-forge.jar", + "id": "6910551", "parent_id": "628539", "hashes": { - "sha1": "79ab372f4b6645e3bd9ad34948a8ad3afa37fed5", - "md5": "7d34a6136694fadaef8dc068e18a1455" + "sha1": "79b7d93cebf1aa77d9d0b244f196d426a3a71e59", + "md5": "3ef743fb5d8e8b445edaa56825616f44" }, "required_dependencies": [ "499980" ], - "size": 2781819, - "date_published": "2025-08-14T08:05:03.337Z" + "size": 2805521, + "date_published": "2025-08-21T08:37:31.970Z" } ] }, @@ -6712,7 +6709,7 @@ "files": [ { "type": "modrinth", - "file_name": "greate-0.0.50.jar", + "file_name": "greate-0.0.51.jar", "mc_versions": [ "1.20.1" ], @@ -6721,23 +6718,23 @@ "neoforge" ], "release_type": "alpha", - "url": "https://cdn.modrinth.com/data/8wDcQuht/versions/WqPWraSr/greate-0.0.50.jar", - "id": "WqPWraSr", + "url": "https://cdn.modrinth.com/data/8wDcQuht/versions/uOZLaa3T/greate-0.0.51.jar", + "id": "uOZLaa3T", "parent_id": "8wDcQuht", "hashes": { - "sha512": "57ffbe121c93eb64b95ce66294c3a87e7df37a12c72d9496105690241479273dacc3efe3ee28fd825542156cd5226301021fab2fcdf4a28675cfafb77f4365ce", - "sha1": "c3fbad31a098c0e589260e2714724ec456de3f64" + "sha512": "d333c40a6e2433c6fc46b75979881c6b1f5ad33984968c57eef16cb9357cec35e056d63fc1fc2cfb9878498e8d8861ae0571dc733267dd99395026c2ec61b339", + "sha1": "663d459fae5b64775c79e361f8c34642c6202448" }, "required_dependencies": [ "LNytGWDc", "7tG215v7" ], - "size": 1500510, - "date_published": "2025-08-07T22:26:24.676945Z" + "size": 1500474, + "date_published": "2025-08-16T17:23:29.632692Z" }, { "type": "curseforge", - "file_name": "greate-0.0.50.jar", + "file_name": "greate-0.0.51.jar", "mc_versions": [ "1.20.1" ], @@ -6746,19 +6743,19 @@ "forge" ], "release_type": "alpha", - "url": "https://edge.forgecdn.net/files/6861/250/greate-0.0.50.jar", - "id": "6861250", + "url": "https://edge.forgecdn.net/files/6893/614/greate-0.0.51.jar", + "id": "6893614", "parent_id": "901996", "hashes": { - "sha1": "c3fbad31a098c0e589260e2714724ec456de3f64", - "md5": "99d378e8b1082de0378f283345cb1799" + "sha1": "663d459fae5b64775c79e361f8c34642c6202448", + "md5": "e6c1297fb76c8ada273142b1685e3253" }, "required_dependencies": [ "890405", "328085" ], - "size": 1500510, - "date_published": "2025-08-07T22:26:22.413Z" + "size": 1500474, + "date_published": "2025-08-16T17:23:28.067Z" } ] }, @@ -8940,7 +8937,7 @@ "files": [ { "type": "modrinth", - "file_name": "moonlight-1.20-2.16.1-forge.jar", + "file_name": "moonlight-1.20-2.16.5-forge.jar", "mc_versions": [ "1.20.1" ], @@ -8949,20 +8946,20 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/twkfQtEc/versions/lByJnenL/moonlight-1.20-2.16.1-forge.jar", - "id": "lByJnenL", + "url": "https://cdn.modrinth.com/data/twkfQtEc/versions/uiOJ4NEz/moonlight-1.20-2.16.5-forge.jar", + "id": "uiOJ4NEz", "parent_id": "twkfQtEc", "hashes": { - "sha512": "8a1b463c721568cdf6f197fc7aa6d3c9d11072c1f3b3d8e57402075a660b20293cab7b249654dd2c7ef34ffc88c23cda08ef78dcf0cba7b2be63a30083d45ef8", - "sha1": "17a8bbbdfd87869e7cac5ece8f3daaee380813a7" + "sha512": "c160493b99be1fab942f7eb64c491985d51a72c16dbda18c345fd14cbf8cfb0bd899c1b7627714e507f079a68bf1917b4d4e407340c2ff3b44359e1996e6c2d7", + "sha1": "461b979a7c1f100a17af4558910f34f259bb56b2" }, "required_dependencies": [], - "size": 1310673, - "date_published": "2025-08-15T09:47:04.798820Z" + "size": 1326648, + "date_published": "2025-08-19T05:34:44.417258Z" }, { "type": "curseforge", - "file_name": "moonlight-1.20-2.16.1-forge.jar", + "file_name": "moonlight-1.20-2.16.5-forge.jar", "mc_versions": [ "1.20.1" ], @@ -8971,16 +8968,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6888/940/moonlight-1.20-2.16.1-forge.jar", - "id": "6888940", + "url": "https://edge.forgecdn.net/files/6902/841/moonlight-1.20-2.16.5-forge.jar", + "id": "6902841", "parent_id": "499980", "hashes": { - "sha1": "17a8bbbdfd87869e7cac5ece8f3daaee380813a7", - "md5": "23ef17c141597aeed404c3e483e40161" + "sha1": "461b979a7c1f100a17af4558910f34f259bb56b2", + "md5": "d080ad63ce08e5c69785ab1227bc0af5" }, "required_dependencies": [], - "size": 1310673, - "date_published": "2025-08-15T09:46:55.940Z" + "size": 1326648, + "date_published": "2025-08-19T05:34:28.713Z" } ] }, @@ -13542,49 +13539,53 @@ "modrinth": "nWC3kyL3" }, "files": [ - { - "type": "curseforge", - "file_name": "wab-1.20.1-1.3.0.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6871/96/wab-1.20.1-1.3.0.jar", - "id": "6871096", - "parent_id": "1108604", - "hashes": { - "sha1": "e614c4c18b0623cb26c7aede3f75b9ed43cf54c7", - "md5": "190aa6671f0a42775ee89381a47369a9" - }, - "required_dependencies": [], - "size": 9916516, - "date_published": "2025-08-10T12:28:16.640Z" - }, { "type": "modrinth", - "file_name": "wab-1.20.1-1.3.0.jar", + "file_name": "wab-1.20.1-1.3.1.jar", "mc_versions": [ "1.20.1" ], "loaders": [ - "forge" + "forge", + "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/nWC3kyL3/versions/txtFU0oY/wab-1.20.1-1.3.0.jar", - "id": "txtFU0oY", + "url": "https://cdn.modrinth.com/data/nWC3kyL3/versions/cf1QAPDG/wab-1.20.1-1.3.1.jar", + "id": "cf1QAPDG", "parent_id": "nWC3kyL3", "hashes": { - "sha512": "216b256897bfa01671883aebd9f38dceb1077b8abff63a85f12f80ef800cb28d6b7bd8dd42c54ff928a587dd43d4ddc8fde7a8f45ec85459287bfabe578d4760", - "sha1": "e614c4c18b0623cb26c7aede3f75b9ed43cf54c7" + "sha512": "cc80da2f8bbc7c9780b4ecbbc135b236bac6deec26166bf7149bfc5c9989c21f2f5be8948491fbab8d200c51ca854ee742c70ef735a164b37869d559c8b6731c", + "sha1": "1262e27c352d303b608dbfd587d4231741d9c89f" }, "required_dependencies": [ "8BmcQJ2H" ], - "size": 9916516, - "date_published": "2025-08-12T15:03:58.487235Z" + "size": 9068035, + "date_published": "2025-08-21T12:47:19.839859Z" + }, + { + "type": "curseforge", + "file_name": "wab-1.20.1-1.3.1.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6911/60/wab-1.20.1-1.3.1.jar", + "id": "6911060", + "parent_id": "1108604", + "hashes": { + "sha1": "1262e27c352d303b608dbfd587d4231741d9c89f", + "md5": "f0c1ece64562ca523efb513e1e7c19c9" + }, + "required_dependencies": [ + "388172" + ], + "size": 9068035, + "date_published": "2025-08-21T12:44:33.350Z" } ] }, From 17828ff679b71ff2bf7e118afa9fea575d064a2e Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 22:41:08 +0100 Subject: [PATCH 103/158] fixed broken water tag for making paper, added AA recipe for spring water --- kubejs/server_scripts/tfg/recipes.paper.js | 2 +- kubejs/server_scripts/tfg/recipes.space.js | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/tfg/recipes.paper.js b/kubejs/server_scripts/tfg/recipes.paper.js index b552a6e6b..8eeeb21ae 100644 --- a/kubejs/server_scripts/tfg/recipes.paper.js +++ b/kubejs/server_scripts/tfg/recipes.paper.js @@ -104,7 +104,7 @@ function registerTFGPapermakingRecipes(event) { .outputItem('tfg:soaked_hardwood_strip') .id('tfg:barrel/soak_hardwood_strip') event.recipes.gtceu.chemical_bath('tfg:chemical_bath/soak_hardwood_strips') - .inputFluids("#tfc:clean_water 100") + .inputFluids("#tfg:clean_water 100") .itemInputs('tfg:hardwood_strip') .itemOutputs('tfg:soaked_hardwood_strip') .duration(200) diff --git a/kubejs/server_scripts/tfg/recipes.space.js b/kubejs/server_scripts/tfg/recipes.space.js index d92daedef..494d4dfd4 100644 --- a/kubejs/server_scripts/tfg/recipes.space.js +++ b/kubejs/server_scripts/tfg/recipes.space.js @@ -97,6 +97,14 @@ function registerTFGSpaceRecipes(event) { .addDataString("fluidA", "minecraft:lava") .outputFluids(Fluid.of("minecraft:lava", 1000)) + event.recipes.gtceu.aqueous_accumulator('spring_water') + .circuit(aaCircuit++) + .dimension('minecraft:overworld') + .duration(20) + .EUt(GTValues.VA[GTValues.LV]) + .addDataString("fluidA", "tfc:spring_water") + .outputFluids(Fluid.of("tfc:spring_water", 1000)) + // Plants - Can't use the default builder here because fertiliser is much harder to get on the moon, // and we're using helium-3 as the fertiliser From fea8530ada1cbdd817479089a2551e197b2228aa Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 00:17:27 +0100 Subject: [PATCH 104/158] added higher tier greg machines --- CHANGELOG.md | 2 + .../blockstates/iv_aqueous_accumulator.json | 19 ++++ .../assets/tfg/blockstates/iv_food_oven.json | 19 ++++ .../tfg/blockstates/iv_food_processor.json | 19 ++++ .../tfg/blockstates/iv_food_refrigerator.json | 19 ++++ .../tfg/blockstates/iv_gas_pressurizer.json | 19 ++++ .../blockstates/luv_aqueous_accumulator.json | 19 ++++ .../assets/tfg/blockstates/luv_food_oven.json | 19 ++++ .../tfg/blockstates/luv_food_processor.json | 19 ++++ .../tfg/blockstates/luv_gas_pressurizer.json | 19 ++++ .../blockstates/uv_aqueous_accumulator.json | 19 ++++ .../assets/tfg/blockstates/uv_food_oven.json | 19 ++++ .../tfg/blockstates/uv_food_processor.json | 19 ++++ .../tfg/blockstates/uv_gas_pressurizer.json | 19 ++++ .../blockstates/zpm_aqueous_accumulator.json | 19 ++++ .../assets/tfg/blockstates/zpm_food_oven.json | 19 ++++ .../tfg/blockstates/zpm_food_processor.json | 19 ++++ .../tfg/blockstates/zpm_gas_pressurizer.json | 19 ++++ kubejs/assets/tfg/lang/en_us.json | 24 ++++- .../machines/iv_aqueous_accumulator.json | 51 +++++++++ .../models/block/machines/iv_food_oven.json | 67 ++++++++++++ .../block/machines/iv_food_processor.json | 67 ++++++++++++ .../block/machines/iv_food_refrigerator.json | 67 ++++++++++++ .../block/machines/iv_gas_pressurizer.json | 67 ++++++++++++ .../machines/luv_aqueous_accumulator.json | 51 +++++++++ .../models/block/machines/luv_food_oven.json | 67 ++++++++++++ .../block/machines/luv_food_processor.json | 67 ++++++++++++ .../block/machines/luv_gas_pressurizer.json | 67 ++++++++++++ .../machines/uv_aqueous_accumulator.json | 51 +++++++++ .../models/block/machines/uv_food_oven.json | 67 ++++++++++++ .../block/machines/uv_food_processor.json | 67 ++++++++++++ .../block/machines/uv_gas_pressurizer.json | 67 ++++++++++++ .../machines/zpm_aqueous_accumulator.json | 51 +++++++++ .../models/block/machines/zpm_food_oven.json | 67 ++++++++++++ .../block/machines/zpm_food_processor.json | 67 ++++++++++++ .../block/machines/zpm_gas_pressurizer.json | 67 ++++++++++++ .../models/item/iv_aqueous_accumulator.json | 3 + .../assets/tfg/models/item/iv_food_oven.json | 3 + .../tfg/models/item/iv_food_processor.json | 3 + .../tfg/models/item/iv_food_refrigerator.json | 3 + .../tfg/models/item/iv_gas_pressurizer.json | 3 + .../models/item/luv_aqueous_accumulator.json | 3 + .../assets/tfg/models/item/luv_food_oven.json | 3 + .../tfg/models/item/luv_food_processor.json | 3 + .../tfg/models/item/luv_gas_pressurizer.json | 3 + .../models/item/uv_aqueous_accumulator.json | 3 + .../assets/tfg/models/item/uv_food_oven.json | 3 + .../tfg/models/item/uv_food_processor.json | 3 + .../tfg/models/item/uv_gas_pressurizer.json | 3 + .../models/item/zpm_aqueous_accumulator.json | 3 + .../assets/tfg/models/item/zpm_food_oven.json | 3 + .../tfg/models/item/zpm_food_processor.json | 3 + .../tfg/models/item/zpm_gas_pressurizer.json | 3 + kubejs/server_scripts/greate/recipes.js | 100 +++++++++++++----- kubejs/server_scripts/tfc/recipes.machines.js | 8 ++ kubejs/server_scripts/tfg/recipes.food.js | 33 +++--- .../vintage_improvements/recipes.js | 8 ++ kubejs/startup_scripts/greate/constants.js | 5 - 58 files changed, 1579 insertions(+), 50 deletions(-) create mode 100644 kubejs/assets/tfg/blockstates/iv_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/blockstates/iv_food_oven.json create mode 100644 kubejs/assets/tfg/blockstates/iv_food_processor.json create mode 100644 kubejs/assets/tfg/blockstates/iv_food_refrigerator.json create mode 100644 kubejs/assets/tfg/blockstates/iv_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/blockstates/luv_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/blockstates/luv_food_oven.json create mode 100644 kubejs/assets/tfg/blockstates/luv_food_processor.json create mode 100644 kubejs/assets/tfg/blockstates/luv_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/blockstates/uv_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/blockstates/uv_food_oven.json create mode 100644 kubejs/assets/tfg/blockstates/uv_food_processor.json create mode 100644 kubejs/assets/tfg/blockstates/uv_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/blockstates/zpm_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/blockstates/zpm_food_oven.json create mode 100644 kubejs/assets/tfg/blockstates/zpm_food_processor.json create mode 100644 kubejs/assets/tfg/blockstates/zpm_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/models/block/machines/iv_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/models/block/machines/iv_food_oven.json create mode 100644 kubejs/assets/tfg/models/block/machines/iv_food_processor.json create mode 100644 kubejs/assets/tfg/models/block/machines/iv_food_refrigerator.json create mode 100644 kubejs/assets/tfg/models/block/machines/iv_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/models/block/machines/luv_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/models/block/machines/luv_food_oven.json create mode 100644 kubejs/assets/tfg/models/block/machines/luv_food_processor.json create mode 100644 kubejs/assets/tfg/models/block/machines/luv_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/models/block/machines/uv_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/models/block/machines/uv_food_oven.json create mode 100644 kubejs/assets/tfg/models/block/machines/uv_food_processor.json create mode 100644 kubejs/assets/tfg/models/block/machines/uv_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/models/block/machines/zpm_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/models/block/machines/zpm_food_oven.json create mode 100644 kubejs/assets/tfg/models/block/machines/zpm_food_processor.json create mode 100644 kubejs/assets/tfg/models/block/machines/zpm_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/models/item/iv_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/models/item/iv_food_oven.json create mode 100644 kubejs/assets/tfg/models/item/iv_food_processor.json create mode 100644 kubejs/assets/tfg/models/item/iv_food_refrigerator.json create mode 100644 kubejs/assets/tfg/models/item/iv_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/models/item/luv_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/models/item/luv_food_oven.json create mode 100644 kubejs/assets/tfg/models/item/luv_food_processor.json create mode 100644 kubejs/assets/tfg/models/item/luv_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/models/item/uv_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/models/item/uv_food_oven.json create mode 100644 kubejs/assets/tfg/models/item/uv_food_processor.json create mode 100644 kubejs/assets/tfg/models/item/uv_gas_pressurizer.json create mode 100644 kubejs/assets/tfg/models/item/zpm_aqueous_accumulator.json create mode 100644 kubejs/assets/tfg/models/item/zpm_food_oven.json create mode 100644 kubejs/assets/tfg/models/item/zpm_food_processor.json create mode 100644 kubejs/assets/tfg/models/item/zpm_gas_pressurizer.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 422287bb2..68f7920eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ - Converted custom tooltips to lang strings for translations (#1663) @Redeix - Removed energy P2P (#1661) @TomPlop @BlueBoat29 - Fixed grammar on death messages and added some new ones (#1642) @vdegans +- Added IV fridge, and IV-UV aqueous accumulator, food processor, food oven, and gas compressor machines @Pyritie +- Added machine recipes for the wrought iron grill @Pyritie ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop diff --git a/kubejs/assets/tfg/blockstates/iv_aqueous_accumulator.json b/kubejs/assets/tfg/blockstates/iv_aqueous_accumulator.json new file mode 100644 index 000000000..1a8dadb17 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/iv_aqueous_accumulator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/iv_aqueous_accumulator", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/iv_aqueous_accumulator" + }, + "facing=south": { + "model": "tfg:block/machines/iv_aqueous_accumulator", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/iv_aqueous_accumulator", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/iv_food_oven.json b/kubejs/assets/tfg/blockstates/iv_food_oven.json new file mode 100644 index 000000000..8b41ff867 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/iv_food_oven.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/iv_food_oven", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/iv_food_oven" + }, + "facing=south": { + "model": "tfg:block/machines/iv_food_oven", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/iv_food_oven", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/iv_food_processor.json b/kubejs/assets/tfg/blockstates/iv_food_processor.json new file mode 100644 index 000000000..d47739009 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/iv_food_processor.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/iv_food_processor", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/iv_food_processor" + }, + "facing=south": { + "model": "tfg:block/machines/iv_food_processor", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/iv_food_processor", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/iv_food_refrigerator.json b/kubejs/assets/tfg/blockstates/iv_food_refrigerator.json new file mode 100644 index 000000000..3d07a9c71 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/iv_food_refrigerator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/iv_food_refrigerator", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/iv_food_refrigerator" + }, + "facing=south": { + "model": "tfg:block/machines/iv_food_refrigerator", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/iv_food_refrigerator", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/iv_gas_pressurizer.json b/kubejs/assets/tfg/blockstates/iv_gas_pressurizer.json new file mode 100644 index 000000000..7e2b4b1dd --- /dev/null +++ b/kubejs/assets/tfg/blockstates/iv_gas_pressurizer.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/iv_gas_pressurizer", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/iv_gas_pressurizer" + }, + "facing=south": { + "model": "tfg:block/machines/iv_gas_pressurizer", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/iv_gas_pressurizer", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/luv_aqueous_accumulator.json b/kubejs/assets/tfg/blockstates/luv_aqueous_accumulator.json new file mode 100644 index 000000000..212115d36 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/luv_aqueous_accumulator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/luv_aqueous_accumulator", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/luv_aqueous_accumulator" + }, + "facing=south": { + "model": "tfg:block/machines/luv_aqueous_accumulator", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/luv_aqueous_accumulator", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/luv_food_oven.json b/kubejs/assets/tfg/blockstates/luv_food_oven.json new file mode 100644 index 000000000..8538c43e1 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/luv_food_oven.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/luv_food_oven", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/luv_food_oven" + }, + "facing=south": { + "model": "tfg:block/machines/luv_food_oven", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/luv_food_oven", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/luv_food_processor.json b/kubejs/assets/tfg/blockstates/luv_food_processor.json new file mode 100644 index 000000000..0fea62071 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/luv_food_processor.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/luv_food_processor", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/luv_food_processor" + }, + "facing=south": { + "model": "tfg:block/machines/luv_food_processor", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/luv_food_processor", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/luv_gas_pressurizer.json b/kubejs/assets/tfg/blockstates/luv_gas_pressurizer.json new file mode 100644 index 000000000..8bc16436f --- /dev/null +++ b/kubejs/assets/tfg/blockstates/luv_gas_pressurizer.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/luv_gas_pressurizer", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/luv_gas_pressurizer" + }, + "facing=south": { + "model": "tfg:block/machines/luv_gas_pressurizer", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/luv_gas_pressurizer", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/uv_aqueous_accumulator.json b/kubejs/assets/tfg/blockstates/uv_aqueous_accumulator.json new file mode 100644 index 000000000..bdc914afb --- /dev/null +++ b/kubejs/assets/tfg/blockstates/uv_aqueous_accumulator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/uv_aqueous_accumulator", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/uv_aqueous_accumulator" + }, + "facing=south": { + "model": "tfg:block/machines/uv_aqueous_accumulator", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/uv_aqueous_accumulator", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/uv_food_oven.json b/kubejs/assets/tfg/blockstates/uv_food_oven.json new file mode 100644 index 000000000..0a6271e09 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/uv_food_oven.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/uv_food_oven", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/uv_food_oven" + }, + "facing=south": { + "model": "tfg:block/machines/uv_food_oven", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/uv_food_oven", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/uv_food_processor.json b/kubejs/assets/tfg/blockstates/uv_food_processor.json new file mode 100644 index 000000000..169a81e2d --- /dev/null +++ b/kubejs/assets/tfg/blockstates/uv_food_processor.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/uv_food_processor", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/uv_food_processor" + }, + "facing=south": { + "model": "tfg:block/machines/uv_food_processor", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/uv_food_processor", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/uv_gas_pressurizer.json b/kubejs/assets/tfg/blockstates/uv_gas_pressurizer.json new file mode 100644 index 000000000..66213cd3c --- /dev/null +++ b/kubejs/assets/tfg/blockstates/uv_gas_pressurizer.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/uv_gas_pressurizer", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/uv_gas_pressurizer" + }, + "facing=south": { + "model": "tfg:block/machines/uv_gas_pressurizer", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/uv_gas_pressurizer", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/zpm_aqueous_accumulator.json b/kubejs/assets/tfg/blockstates/zpm_aqueous_accumulator.json new file mode 100644 index 000000000..6b0ae1def --- /dev/null +++ b/kubejs/assets/tfg/blockstates/zpm_aqueous_accumulator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/zpm_aqueous_accumulator", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/zpm_aqueous_accumulator" + }, + "facing=south": { + "model": "tfg:block/machines/zpm_aqueous_accumulator", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/zpm_aqueous_accumulator", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/zpm_food_oven.json b/kubejs/assets/tfg/blockstates/zpm_food_oven.json new file mode 100644 index 000000000..509ec3c6e --- /dev/null +++ b/kubejs/assets/tfg/blockstates/zpm_food_oven.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/zpm_food_oven", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/zpm_food_oven" + }, + "facing=south": { + "model": "tfg:block/machines/zpm_food_oven", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/zpm_food_oven", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/zpm_food_processor.json b/kubejs/assets/tfg/blockstates/zpm_food_processor.json new file mode 100644 index 000000000..7f3d2e2a9 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/zpm_food_processor.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/zpm_food_processor", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/zpm_food_processor" + }, + "facing=south": { + "model": "tfg:block/machines/zpm_food_processor", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/zpm_food_processor", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/zpm_gas_pressurizer.json b/kubejs/assets/tfg/blockstates/zpm_gas_pressurizer.json new file mode 100644 index 000000000..d73796f96 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/zpm_gas_pressurizer.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/zpm_gas_pressurizer", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/zpm_gas_pressurizer" + }, + "facing=south": { + "model": "tfg:block/machines/zpm_gas_pressurizer", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/zpm_gas_pressurizer", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index f88883ad9..cae8874f2 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -199,30 +199,52 @@ "block.tfg.mv_aqueous_accumulator": "§bAdvanced Aqueous Accumulator§r", "block.tfg.hv_aqueous_accumulator": "§6Advanced Aqueous Accumulator II§r", "block.tfg.ev_aqueous_accumulator": "§5Advanced Aqueous Accumulator III§r", + "block.tfg.iv_aqueous_accumulator": "§9Elite Aqueous Accumulator§r", + "block.tfg.luv_aqueous_accumulator": "§dElite Aqueous Accumulator II§r", + "block.tfg.zpm_aqueous_accumulator": "§cElite Aqueous Accumulator III§r", + "block.tfg.uv_aqueous_accumulator": "§3Ultimate Aqueous Accumulator§r", "block.tfg.electric_greenhouse": "Electric Greenhouse", "block.tfg.lv_food_processor": "Basic Food Processor", "block.tfg.mv_food_processor": "§bAdvanced Food Processor§r", "block.tfg.hv_food_processor": "§6Advanced Food Processor II§r", "block.tfg.ev_food_processor": "§5Advanced Food Processor III§r", + "block.tfg.iv_food_processor": "§9Elite Food Processor§r", + "block.tfg.luv_food_processor": "§dElite Food Processor II§r", + "block.tfg.zpm_food_processor": "§cElite Food Processor III§r", + "block.tfg.uv_food_processor": "§3Ultimate Food Processor§r", "block.tfg.lv_food_oven": "Basic Electric Oven", "block.tfg.mv_food_oven": "§bAdvanced Electric Oven§r", "block.tfg.hv_food_oven": "§6Advanced Electric Oven II§r", "block.tfg.ev_food_oven": "§5Advanced Electric Oven III§r", + "block.tfg.iv_food_oven": "§9Elite Electric Oven§r", + "block.tfg.luv_food_oven": "§dElite Electric Oven II§r", + "block.tfg.zpm_food_oven": "§cElite Electric Oven III§r", + "block.tfg.uv_food_oven": "§3Ultimate Electric Oven§r", "block.tfg.lv_food_refrigerator": "Basic Refrigerator", "block.tfg.mv_food_refrigerator": "§bAdvanced Refrigerator", "block.tfg.hv_food_refrigerator": "§6Advanced Refrigerator II§r", "block.tfg.ev_food_refrigerator": "§5Advanced Refrigerator III§r", + "block.tfg.iv_food_refrigerator": "§9Elite Refrigerator§r", "block.tfg.lv_gas_pressurizer": "Basic Gas Pressurizer", "block.tfg.mv_gas_pressurizer": "§bAdvanced Gas Pressurizer§r", "block.tfg.hv_gas_pressurizer": "§6Advanced Gas Pressurizer II§r", "block.tfg.ev_gas_pressurizer": "§5Advanced Gas Pressurizer III§r", + "block.tfg.iv_gas_pressurizer": "§9Elite Gas Pressurizer§r", + "block.tfg.luv_gas_pressurizer": "§dElite Gas Pressurizer II§r", + "block.tfg.zpm_gas_pressurizer": "§cElite Gas Pressurizer III§r", + "block.tfg.uv_gas_pressurizer": "§3Ultimate Gas Pressurizer III§r", "block.tfg.semiheavy_ammoniacal_water": "Semiheavy Ammoniacal Water", "block.tfg.grass.mars_dirt": "Martian Dirt", "block.tfg.grass.mars_farmland": "Martian Farmland", "block.tfg.grass.amber_mycelium": "Amber Mycelium", "block.tfg.grass.rusticus_mycelium": "Rusticus Mycelium", "block.tfg.grass.sangnum_mycelium": "Sangnum Mycelium", - "block.tfg.sapling.glacian": "Glacian Mushroom", + "block.tfg.saplings.crimson": "Crimson Fungus", + "block.tfg.saplings.warped": "Warped Fungus", + "block.tfg.saplings.alphacene": "Alphacene Mushroom", + "block.tfg.saplings.aeronos": "Aeronos Mushroom", + "block.tfg.saplings.strophar": "Strophar Mushroom", + "block.tfg.saplings.glacian": "Glacian Mushroom", "block.tfg.electromagnetic_accelerator": "Electromagnetic Accelerator", "block.tfg.superconductor_coil_large": "Large Superconductor Coil", "block.tfg.superconductor_coil_small": "Small Superconductor Coil", diff --git a/kubejs/assets/tfg/models/block/machines/iv_aqueous_accumulator.json b/kubejs/assets/tfg/models/block/machines/iv_aqueous_accumulator.json new file mode 100644 index 000000000..3681fa2f6 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/iv_aqueous_accumulator.json @@ -0,0 +1,51 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:iv_aqueous_accumulator", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/iv_food_oven.json b/kubejs/assets/tfg/models/block/machines/iv_food_oven.json new file mode 100644 index 000000000..af85a0b4e --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/iv_food_oven.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:iv_food_oven", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/iv_food_processor.json b/kubejs/assets/tfg/models/block/machines/iv_food_processor.json new file mode 100644 index 000000000..a005c0263 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/iv_food_processor.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:iv_food_processor", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/iv_food_refrigerator.json b/kubejs/assets/tfg/models/block/machines/iv_food_refrigerator.json new file mode 100644 index 000000000..07b171bd5 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/iv_food_refrigerator.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:iv_food_refrigerator", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_refrigerator/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_refrigerator/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_refrigerator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_refrigerator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_refrigerator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_refrigerator/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_refrigerator/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_refrigerator/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_refrigerator/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_refrigerator/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_refrigerator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_refrigerator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_refrigerator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_refrigerator/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_refrigerator/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_refrigerator/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_refrigerator/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_refrigerator/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_refrigerator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_refrigerator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_refrigerator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_refrigerator/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_refrigerator/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_refrigerator/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/food_refrigerator/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_refrigerator/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_refrigerator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_refrigerator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_refrigerator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_refrigerator/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_refrigerator/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_refrigerator/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/iv_gas_pressurizer.json b/kubejs/assets/tfg/models/block/machines/iv_gas_pressurizer.json new file mode 100644 index 000000000..6d1075bae --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/iv_gas_pressurizer.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:iv_gas_pressurizer", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/iv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/luv_aqueous_accumulator.json b/kubejs/assets/tfg/models/block/machines/luv_aqueous_accumulator.json new file mode 100644 index 000000000..d4e377c06 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/luv_aqueous_accumulator.json @@ -0,0 +1,51 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:luv_aqueous_accumulator", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/luv_food_oven.json b/kubejs/assets/tfg/models/block/machines/luv_food_oven.json new file mode 100644 index 000000000..9789d0959 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/luv_food_oven.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:luv_food_oven", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/luv_food_processor.json b/kubejs/assets/tfg/models/block/machines/luv_food_processor.json new file mode 100644 index 000000000..7d6bf20eb --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/luv_food_processor.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:luv_food_processor", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/luv_gas_pressurizer.json b/kubejs/assets/tfg/models/block/machines/luv_gas_pressurizer.json new file mode 100644 index 000000000..bafb1a478 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/luv_gas_pressurizer.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:luv_gas_pressurizer", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/luv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/uv_aqueous_accumulator.json b/kubejs/assets/tfg/models/block/machines/uv_aqueous_accumulator.json new file mode 100644 index 000000000..fdcbfef13 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/uv_aqueous_accumulator.json @@ -0,0 +1,51 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:uv_aqueous_accumulator", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/uv_food_oven.json b/kubejs/assets/tfg/models/block/machines/uv_food_oven.json new file mode 100644 index 000000000..d213b4684 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/uv_food_oven.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:uv_food_oven", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/uv_food_processor.json b/kubejs/assets/tfg/models/block/machines/uv_food_processor.json new file mode 100644 index 000000000..1f6ac4517 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/uv_food_processor.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:uv_food_processor", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/uv_gas_pressurizer.json b/kubejs/assets/tfg/models/block/machines/uv_gas_pressurizer.json new file mode 100644 index 000000000..5e040aeeb --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/uv_gas_pressurizer.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:uv_gas_pressurizer", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/uv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/zpm_aqueous_accumulator.json b/kubejs/assets/tfg/models/block/machines/zpm_aqueous_accumulator.json new file mode 100644 index 000000000..ca2000453 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/zpm_aqueous_accumulator.json @@ -0,0 +1,51 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:zpm_aqueous_accumulator", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/zpm_food_oven.json b/kubejs/assets/tfg/models/block/machines/zpm_food_oven.json new file mode 100644 index 000000000..eb110cab3 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/zpm_food_oven.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:zpm_food_oven", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/zpm_food_processor.json b/kubejs/assets/tfg/models/block/machines/zpm_food_processor.json new file mode 100644 index 000000000..11ec6b8f6 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/zpm_food_processor.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:zpm_food_processor", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/zpm_gas_pressurizer.json b/kubejs/assets/tfg/models/block/machines/zpm_gas_pressurizer.json new file mode 100644 index 000000000..b3e4e1e30 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/zpm_gas_pressurizer.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:zpm_gas_pressurizer", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/zpm", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/iv_aqueous_accumulator.json b/kubejs/assets/tfg/models/item/iv_aqueous_accumulator.json new file mode 100644 index 000000000..dbb94dd36 --- /dev/null +++ b/kubejs/assets/tfg/models/item/iv_aqueous_accumulator.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/iv_aqueous_accumulator" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/iv_food_oven.json b/kubejs/assets/tfg/models/item/iv_food_oven.json new file mode 100644 index 000000000..e8209881a --- /dev/null +++ b/kubejs/assets/tfg/models/item/iv_food_oven.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/iv_food_oven" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/iv_food_processor.json b/kubejs/assets/tfg/models/item/iv_food_processor.json new file mode 100644 index 000000000..cc431f368 --- /dev/null +++ b/kubejs/assets/tfg/models/item/iv_food_processor.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/iv_food_processor" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/iv_food_refrigerator.json b/kubejs/assets/tfg/models/item/iv_food_refrigerator.json new file mode 100644 index 000000000..8a5905cbe --- /dev/null +++ b/kubejs/assets/tfg/models/item/iv_food_refrigerator.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/iv_food_refrigerator" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/iv_gas_pressurizer.json b/kubejs/assets/tfg/models/item/iv_gas_pressurizer.json new file mode 100644 index 000000000..27d67efb9 --- /dev/null +++ b/kubejs/assets/tfg/models/item/iv_gas_pressurizer.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/iv_gas_pressurizer" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/luv_aqueous_accumulator.json b/kubejs/assets/tfg/models/item/luv_aqueous_accumulator.json new file mode 100644 index 000000000..8296680df --- /dev/null +++ b/kubejs/assets/tfg/models/item/luv_aqueous_accumulator.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/luv_aqueous_accumulator" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/luv_food_oven.json b/kubejs/assets/tfg/models/item/luv_food_oven.json new file mode 100644 index 000000000..17ce5e51f --- /dev/null +++ b/kubejs/assets/tfg/models/item/luv_food_oven.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/luv_food_oven" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/luv_food_processor.json b/kubejs/assets/tfg/models/item/luv_food_processor.json new file mode 100644 index 000000000..f24b74800 --- /dev/null +++ b/kubejs/assets/tfg/models/item/luv_food_processor.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/luv_food_processor" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/luv_gas_pressurizer.json b/kubejs/assets/tfg/models/item/luv_gas_pressurizer.json new file mode 100644 index 000000000..191817577 --- /dev/null +++ b/kubejs/assets/tfg/models/item/luv_gas_pressurizer.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/luv_gas_pressurizer" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/uv_aqueous_accumulator.json b/kubejs/assets/tfg/models/item/uv_aqueous_accumulator.json new file mode 100644 index 000000000..69628c0ed --- /dev/null +++ b/kubejs/assets/tfg/models/item/uv_aqueous_accumulator.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/uv_aqueous_accumulator" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/uv_food_oven.json b/kubejs/assets/tfg/models/item/uv_food_oven.json new file mode 100644 index 000000000..ab8b6e79b --- /dev/null +++ b/kubejs/assets/tfg/models/item/uv_food_oven.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/uv_food_oven" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/uv_food_processor.json b/kubejs/assets/tfg/models/item/uv_food_processor.json new file mode 100644 index 000000000..91aa6746f --- /dev/null +++ b/kubejs/assets/tfg/models/item/uv_food_processor.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/uv_food_processor" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/uv_gas_pressurizer.json b/kubejs/assets/tfg/models/item/uv_gas_pressurizer.json new file mode 100644 index 000000000..d8db0dce1 --- /dev/null +++ b/kubejs/assets/tfg/models/item/uv_gas_pressurizer.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/uv_gas_pressurizer" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/zpm_aqueous_accumulator.json b/kubejs/assets/tfg/models/item/zpm_aqueous_accumulator.json new file mode 100644 index 000000000..69e0de4c5 --- /dev/null +++ b/kubejs/assets/tfg/models/item/zpm_aqueous_accumulator.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/zpm_aqueous_accumulator" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/zpm_food_oven.json b/kubejs/assets/tfg/models/item/zpm_food_oven.json new file mode 100644 index 000000000..1bc502636 --- /dev/null +++ b/kubejs/assets/tfg/models/item/zpm_food_oven.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/zpm_food_oven" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/zpm_food_processor.json b/kubejs/assets/tfg/models/item/zpm_food_processor.json new file mode 100644 index 000000000..bffcb9187 --- /dev/null +++ b/kubejs/assets/tfg/models/item/zpm_food_processor.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/zpm_food_processor" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/zpm_gas_pressurizer.json b/kubejs/assets/tfg/models/item/zpm_gas_pressurizer.json new file mode 100644 index 000000000..f3ffa362a --- /dev/null +++ b/kubejs/assets/tfg/models/item/zpm_gas_pressurizer.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/zpm_gas_pressurizer" +} \ No newline at end of file diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index f51c85dc5..c82bbbdc5 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -704,13 +704,6 @@ function registerGreateRecipes(event) { D: '#forge:rods/long/steel' }).id('gtceu:shaped/steel_whisk') - event.recipes.gtceu.assembler('gtceu:steel_whisk') - .itemInputs('#forge:rings/steel', '4x #forge:rods/long/steel') - .itemOutputs('gtceu:steel_whisk') - .circuit(2) - .duration(50) - .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.extruder('gtceu:steel_whisk') .itemInputs('4x #forge:ingots/steel') .notConsumable('tfg:whisk_extruder_mold') @@ -729,13 +722,6 @@ function registerGreateRecipes(event) { D: '#forge:rods/long/aluminium' }).id('gtceu:shaped/aluminium_whisk') - event.recipes.gtceu.assembler('gtceu:aluminium_whisk') - .itemInputs('#forge:rings/aluminium', '4x #forge:rods/long/aluminium') - .itemOutputs('gtceu:aluminium_whisk') - .circuit(2) - .duration(50) - .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.extruder('gtceu:aluminium_whisk') .itemInputs('4x #forge:ingots/aluminium') .notConsumable('tfg:whisk_extruder_mold') @@ -754,13 +740,6 @@ function registerGreateRecipes(event) { D: '#forge:rods/long/stainless_steel' }).id('gtceu:shaped/stainless_steel_whisk') - event.recipes.gtceu.assembler('gtceu:stainless_steel_whisk') - .itemInputs('#forge:rings/stainless_steel', '4x #forge:rods/long/stainless_steel') - .itemOutputs('gtceu:stainless_steel_whisk') - .circuit(2) - .duration(50) - .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.extruder('gtceu:stainless_steel_whisk') .itemInputs('4x #forge:ingots/stainless_steel') .notConsumable('tfg:whisk_extruder_mold') @@ -779,13 +758,6 @@ function registerGreateRecipes(event) { D: '#forge:rods/long/titanium' }).id('gtceu:shaped/titanium_whisk') - event.recipes.gtceu.assembler('gtceu:titanium_whisk') - .itemInputs('#forge:rings/titanium', '4x #forge:rods/long/titanium') - .itemOutputs('gtceu:titanium_whisk') - .circuit(2) - .duration(50) - .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.extruder('gtceu:titanium_whisk') .itemInputs('4x #forge:ingots/titanium') .notConsumable('tfg:whisk_extruder_mold') @@ -793,6 +765,78 @@ function registerGreateRecipes(event) { .duration(GTMaterials.Titanium.getMass() * 3) .EUt(GTValues.VA[GTValues.MV]) + event.shaped('gtceu:tungsten_steel_whisk', [ + 'ABC', + 'D D', + 'D D' + ], { + A: '#forge:tools/hammers', + B: '#forge:rings/tungsten_steel', + C: '#forge:tools/wrenches', + D: '#forge:rods/long/tungsten_steel' + }).id('gtceu:shaped/tungsten_steel_whisk') + + event.recipes.gtceu.extruder('gtceu:tungsten_steel_whisk') + .itemInputs('4x #forge:ingots/tungsten_steel') + .notConsumable('tfg:whisk_extruder_mold') + .itemOutputs('gtceu:tungsten_steel_whisk') + .duration(GTMaterials.TungstenSteel.getMass() * 3) + .EUt(GTValues.VA[GTValues.MV]) + + event.shaped('gtceu:rhodium_plated_palladium_whisk', [ + 'ABC', + 'D D', + 'D D' + ], { + A: '#forge:tools/hammers', + B: '#forge:rings/rhodium_plated_palladium', + C: '#forge:tools/wrenches', + D: '#forge:rods/long/rhodium_plated_palladium' + }).id('gtceu:shaped/rhodium_plated_palladium_whisk') + + event.recipes.gtceu.extruder('gtceu:rhodium_plated_palladium_whisk') + .itemInputs('4x #forge:ingots/rhodium_plated_palladium') + .notConsumable('tfg:whisk_extruder_mold') + .itemOutputs('gtceu:rhodium_plated_palladium_whisk') + .duration(GTMaterials.RhodiumPlatedPalladium.getMass() * 3) + .EUt(GTValues.VA[GTValues.MV]) + + event.shaped('gtceu:naquadah_alloy_whisk', [ + 'ABC', + 'D D', + 'D D' + ], { + A: '#forge:tools/hammers', + B: '#forge:rings/naquadah_alloy', + C: '#forge:tools/wrenches', + D: '#forge:rods/long/naquadah_alloy' + }).id('gtceu:shaped/naquadah_alloy_whisk') + + event.recipes.gtceu.extruder('gtceu:naquadah_alloy_whisk') + .itemInputs('4x #forge:ingots/naquadah_alloy') + .notConsumable('tfg:whisk_extruder_mold') + .itemOutputs('gtceu:naquadah_alloy_whisk') + .duration(GTMaterials.NaquadahAlloy.getMass() * 3) + .EUt(GTValues.VA[GTValues.MV]) + + event.shaped('gtceu:darmstadtium_whisk', [ + 'ABC', + 'D D', + 'D D' + ], { + A: '#forge:tools/hammers', + B: '#forge:rings/darmstadtium', + C: '#forge:tools/wrenches', + D: '#forge:rods/long/darmstadtium' + }).id('gtceu:shaped/darmstadtium_whisk') + + event.recipes.gtceu.extruder('gtceu:darmstadtium_whisk') + .itemInputs('4x #forge:ingots/darmstadtium') + .notConsumable('tfg:whisk_extruder_mold') + .itemOutputs('gtceu:darmstadtium_whisk') + .duration(GTMaterials.Darmstadtium.getMass() * 3) + .EUt(GTValues.VA[GTValues.MV]) + // #endregion // #region Presses diff --git a/kubejs/server_scripts/tfc/recipes.machines.js b/kubejs/server_scripts/tfc/recipes.machines.js index c9e5cd79b..7402f708c 100644 --- a/kubejs/server_scripts/tfc/recipes.machines.js +++ b/kubejs/server_scripts/tfc/recipes.machines.js @@ -419,4 +419,12 @@ function registerTFCMachineRecipes(event) { processingTime: 50 }).id(`tfg:vi/lathe/stripping_${wood}_wood`) }) + + + event.recipes.gtceu.extruder('tfg:wrought_iron_grill_electric_only') + .itemInputs('2x #forge:plates/wrought_iron') + .notConsumable('tfg:large_casing_extruder_mold') + .itemOutputs('tfc:wrought_iron_grill') + .duration(60) + .EUt(8) } diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index a99006432..b57371354 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -1088,6 +1088,7 @@ function registerTFGFoodRecipes(event) { event.remove({id: 'gtceu:shaped/mv_food_refrigerator'}) event.remove({id: 'gtceu:shaped/hv_food_refrigerator'}) event.remove({id: 'gtceu:shaped/ev_food_refrigerator'}) + event.remove({id: 'gtceu:shaped/iv_food_refrigerator'}) event.recipes.gtceu.assembler('tfg:assembler/mv_food_refrigerator') .itemInputs( @@ -1128,12 +1129,27 @@ function registerTFGFoodRecipes(event) { 'gtceu:ev_hermetic_casing', '#gtceu:circuits/ev' ) - .inputFluids(Fluid.of('tfg:isobutane', 6000)) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 6000)) .itemOutputs('1x tfg:ev_food_refrigerator') .duration(200) .circuit(7) .EUt(GTValues.VA[GTValues.LV]) + event.recipes.gtceu.assembler('tfg:assembler/iv_food_refrigerator') + .itemInputs( + ChemicalHelper.get(TagPrefix.cableGtSingle, GTMaterials.Platinum, 2), + ChemicalHelper.get(TagPrefix.plate, GTMaterials.Polyethylene, 2), + ChemicalHelper.get(TagPrefix.rotor, GTMaterials.Titanium, 1), + '2x gtceu:iv_electric_pump', + 'gtceu:iv_hermetic_casing', + '#gtceu:circuits/iv' + ) + .inputFluids(Fluid.of('tfg:solar_coolant_tier2', 6000)) + .itemOutputs('1x tfg:iv_food_refrigerator') + .duration(200) + .circuit(7) + .EUt(GTValues.VA[GTValues.LV]) + event.shaped('tfg:electric_greenhouse', [ 'ABA', 'CDC', @@ -1144,19 +1160,4 @@ function registerTFGFoodRecipes(event) { C: 'tfc:compost', D: 'gtceu:steel_machine_casing' }).id('tfg:shaped/electric_greenhouse') - - // Tweaks to the machine crafts that are more annoying to do in java - event.replaceInput({id: 'gtceu:shaped/lv_food_processor'}, 'gtceu:lv_electric_piston', 'gtceu:steel_whisk') - event.replaceInput({id: 'gtceu:shaped/mv_food_processor'}, 'gtceu:mv_electric_piston', 'gtceu:aluminium_whisk') - event.replaceInput({id: 'gtceu:shaped/hv_food_processor'}, 'gtceu:hv_electric_piston', 'gtceu:stainless_steel_whisk') - event.replaceInput({id: 'gtceu:shaped/ev_food_processor'}, 'gtceu:ev_electric_piston', 'gtceu:titanium_whisk') - - event.replaceInput({id: 'gtceu:shaped/lv_food_oven'}, 'gtceu:lv_electric_piston', '#tfg:metal_bars') - event.replaceInput({id: 'gtceu:shaped/mv_food_oven'}, 'gtceu:mv_electric_piston', '#tfg:metal_bars') - event.replaceInput({id: 'gtceu:shaped/hv_food_oven'}, 'gtceu:hv_electric_piston', '#tfg:metal_bars') - event.replaceInput({id: 'gtceu:shaped/ev_food_oven'}, 'gtceu:ev_electric_piston', '#tfg:metal_bars') - - event.replaceInput({id: 'gtceu:shaped/mv_food_refrigerator'}, 'gtceu:mv_machine_hull', 'gtceu:mv_hermetic_casing') - event.replaceInput({id: 'gtceu:shaped/hv_food_refrigerator'}, 'gtceu:hv_machine_hull', 'gtceu:hv_hermetic_casing') - event.replaceInput({id: 'gtceu:shaped/ev_food_refrigerator'}, 'gtceu:ev_machine_hull', 'gtceu:ev_hermetic_casing') } diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index f92a66ae4..10bd2cfb2 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -717,6 +717,14 @@ function registerVintageImprovementsRecipes(event) { processingTime: 50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER }).id(`tfg:vi/curving/sprinkler`) + event.custom({ + type: 'vintageimprovements:curving', + ingredients: [{ tag: 'forge:double_plates/wrought_iron' }], + itemAsHead: 'tfg:large_casing_extruder_mold', + results: [{ item: 'tfc:wrought_iron_grill' }], + processingTime: 50 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER + }).id(`tfg:vi/curving/wrought_iron_grill`) + // #endregion } diff --git a/kubejs/startup_scripts/greate/constants.js b/kubejs/startup_scripts/greate/constants.js index 28550ff3f..9d6c668e9 100644 --- a/kubejs/startup_scripts/greate/constants.js +++ b/kubejs/startup_scripts/greate/constants.js @@ -14,12 +14,7 @@ global.GREATE_DISABLED_ITEMS = [ 'gtceu:darmstadtium_alloy', 'gtceu:neutronium_alloy', - 'gtceu:tungsten_steel_whisk', - 'gtceu:rhodium_plated_palladium_whisk', - 'gtceu:naquadah_alloy_whisk', - 'gtceu:darmstadtium_whisk', 'gtceu:neutronium_whisk', - 'greate:polybenzimidazole_belt_connector', 'greate:polytetrafluoroethylene_belt_connector', From dec69df3b99d6d895404bd81a741a2d3406da949 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 00:23:51 +0100 Subject: [PATCH 105/158] mods can't even name themselves properly smh --- kubejs/startup_scripts/main_startup_script.js | 1 + 1 file changed, 1 insertion(+) diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index 9a90f4b81..49568b2de 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -80,3 +80,4 @@ GTCEuStartupEvents.registry("gtceu:element", event => { Platform.mods.primitive_creatures.name = "Primitive Creatures"; Platform.mods.tfg.name = "TerraFirmaGreg"; Platform.mods.kubejs.name = "TerraFirmaGreg"; +Platform.mods.wan_ancient_beasts.name = "Wan's Ancient Beasts"; From 37ef72ee0152eb15b8bc84656892cbfe250138b1 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 00:32:42 +0100 Subject: [PATCH 106/158] shipping container dye/bleach recipes --- CHANGELOG.md | 1 + kubejs/server_scripts/createdeco/recipes.js | 32 +++++++++++++++++++++ kubejs/server_scripts/createdeco/tags.js | 8 +++--- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68f7920eb..89aec2d1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Fixed grammar on death messages and added some new ones (#1642) @vdegans - Added IV fridge, and IV-UV aqueous accumulator, food processor, food oven, and gas compressor machines @Pyritie - Added machine recipes for the wrought iron grill @Pyritie +- Added recipes for redyeing/bleaching shipping containers (#1631) @Pyritie ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index 7694e779e..f51252196 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -466,4 +466,36 @@ const registerCreatedecoRecipes = (event) => { }).id('tfg:createdeco/shaped/industrial_iron_ladder') // #endregion + + // #region Shipping Containers + + global.MINECRAFT_DYE_NAMES.forEach(color => { + event.remove({ id: `createdeco:${color}_shipping_container_from_dyeing_vaults` }) + + event.recipes.gtceu.chemical_bath(`createdeco:${color}_shipping_container`) + .itemInputs('create:item_vault') + .inputFluids(Fluid.of(`tfc:${color}_dye`, 144)) + .itemOutputs(`createdeco:${color}_shipping_container`) + .duration(100) + .EUt(16) + .category(GTRecipeCategories.CHEM_DYES); + + event.recipes.gtceu.chemical_bath(`createdeco:${color}_shipping_container_recolor`) + .itemInputs('#createdeco:shipping_containers') + .inputFluids(Fluid.of(`tfc:${color}_dye`, 144)) + .itemOutputs(`createdeco:${color}_shipping_container`) + .duration(100) + .EUt(16) + .category(GTRecipeCategories.CHEM_DYES); + }) + + event.recipes.gtceu.chemical_bath(`createdeco:bleach_shipping_container`) + .itemInputs('#createdeco:shipping_containers') + .inputFluids(Fluid.of('gtceu:chlorine', 144)) + .itemOutputs('create:item_vault') + .duration(100) + .EUt(16) + .category(GTRecipeCategories.CHEM_DYES); + + // #endregion }; diff --git a/kubejs/server_scripts/createdeco/tags.js b/kubejs/server_scripts/createdeco/tags.js index 1ebab2044..9ab63b54e 100644 --- a/kubejs/server_scripts/createdeco/tags.js +++ b/kubejs/server_scripts/createdeco/tags.js @@ -4,17 +4,14 @@ const metalBars = ['andesite', 'brass', 'iron', 'copper', 'industrial_iron', 'zi const registerCreateDecoItemTags = (event) => { - //#region Hidden Items global.CREATEDECO_DISABLED_ITEMS.forEach(item => { event.removeAllTagsFrom(item) event.add('c:hidden_from_recipe_viewers', item) }); - //#endregion event.remove('createdeco:internal/blocks/iron_blocks', 'minecraft:iron_block') event.remove('createdeco:internal/blocks/industrial_iron_blocks', 'create:industrial_iron_block') - //#region Apply Tags metalBars.forEach(metalBars => { event.add('tfg:metal_bars', `createdeco:${metalBars}_bars`) event.add('tfg:metal_bars', `createdeco:${metalBars}_bars_overlay`) @@ -53,7 +50,10 @@ const registerCreateDecoItemTags = (event) => { event.add("createdeco:internal/blocks/industrial_iron_blocks", "#forge:storage_blocks/steel") event.add("createdeco:internal/blocks/zinc_blocks", "#forge:storage_blocks/zinc") event.add("createdeco:internal/blocks/andesite_blocks", "#forge:storage_blocks/tin_alloy") - //#endregion + + global.MINECRAFT_DYE_NAMES.forEach(color => { + event.add('createdeco:shipping_containers', `createdeco:${color}_shipping_container`) + }) }; const registerCreateDecoBlockTags = (event) => { From 09336e5e6c1f042a1b99cfa8624858cb3f9ce6b0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 00:33:13 +0100 Subject: [PATCH 107/158] cl again --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89aec2d1a..c3243a510 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ - Fixed food processor outputs not stacking @gustovafing - Fixed using the grappling hook on a ladder killing you (#106) @Zippity - Added more missing food processor recipes (#1632, #1638) @Pyritie +- Fixed a few stuck quests (#1667, #1666) @Wicpar ## [0.10.9] - 10-08-2025 ### Changes From 5f5c39ea29e6a154bc08843a2e361e707a411f5b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 00:35:27 +0100 Subject: [PATCH 108/158] added armor stand shift swap #1645 --- pakku-lock.json | 165 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 118 insertions(+), 47 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index 5a2807488..8af7380b2 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -1184,6 +1184,76 @@ } ] }, + { + "pakku_id": "RrbGnesL6XuNDCb1", + "pakku_links": [ + "x1EwQZ6H2kVKR3U3" + ], + "type": "MOD", + "side": "BOTH", + "slug": { + "curseforge": "armor-stand-shift-swap", + "modrinth": "armor-stand-shift-swap" + }, + "name": { + "curseforge": "Armor Stand Shift Swap", + "modrinth": "Armor Stand Shift Swap" + }, + "id": { + "curseforge": "905132", + "modrinth": "vFDTNKLA" + }, + "files": [ + { + "type": "curseforge", + "file_name": "armorstandshiftswap-forge-1.20.1-1.0.0.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/5877/380/armorstandshiftswap-forge-1.20.1-1.0.0.jar", + "id": "5877380", + "parent_id": "905132", + "hashes": { + "sha1": "4dc1875a4f6ca118f17a86531d314e095f7c2f1f", + "md5": "30648633cdc4a0fc652d951c5299bf6d" + }, + "required_dependencies": [ + "419699" + ], + "size": 83802, + "date_published": "2024-11-05T15:01:52.897Z" + }, + { + "type": "modrinth", + "file_name": "armorstandshiftswap-forge-1.20.1-1.0.0.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge", + "neoforge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/vFDTNKLA/versions/o416kPwV/armorstandshiftswap-forge-1.20.1-1.0.0.jar", + "id": "o416kPwV", + "parent_id": "vFDTNKLA", + "hashes": { + "sha512": "9be8e668569ce2b070fcb36d4dea4c34a2a50fbff2dadcd38cf2a9b75b3f598d9ad156380a9d74d87c67736dde3a04382271174a5ff57ed02c6da1785f3298d1", + "sha1": "4dc1875a4f6ca118f17a86531d314e095f7c2f1f" + }, + "required_dependencies": [ + "lhGA9TYQ" + ], + "size": 83802, + "date_published": "2024-11-05T15:34:55.705362Z" + } + ] + }, { "pakku_id": "Wg44U8f1K4nbIsj1", "pakku_links": [ @@ -1385,7 +1455,7 @@ ] }, { - "pakku_id": "i6VxVERP0ZuJlfnt", + "pakku_id": "tcGlxrXYONei6sfG", "type": "MOD", "side": "SERVER", "slug": { @@ -1401,6 +1471,27 @@ "modrinth": "OfKzpbRU" }, "files": [ + { + "type": "curseforge", + "file_name": "baguettelib-1.20.1-Forge-1.1.0.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6909/482/baguettelib-1.20.1-Forge-1.1.0.jar", + "id": "6909482", + "parent_id": "1264423", + "hashes": { + "sha1": "140ea51f71e5f316e473354cdeeb0dbba5422632", + "md5": "74448bf96f648170cc03ab7bee6a6e3d" + }, + "required_dependencies": [], + "size": 30314, + "date_published": "2025-08-20T23:30:04.997Z" + }, { "type": "modrinth", "file_name": "baguettelib-1.20.1-Forge-1.0.0.jar", @@ -1422,27 +1513,6 @@ "required_dependencies": [], "size": 26550, "date_published": "2025-06-25T13:03:42.486510Z" - }, - { - "type": "curseforge", - "file_name": "baguettelib-1.20.1-Forge-1.1.0.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6909/482/baguettelib-1.20.1-Forge-1.1.0.jar", - "id": "6909482", - "parent_id": "1264423", - "hashes": { - "sha1": "140ea51f71e5f316e473354cdeeb0dbba5422632", - "md5": "74448bf96f648170cc03ab7bee6a6e3d" - }, - "required_dependencies": [], - "size": 30314, - "date_published": "2025-08-20T23:30:04.997Z" } ] }, @@ -3133,7 +3203,8 @@ { "pakku_id": "tIc0aOMFiuJNztfY", "pakku_links": [ - "0DMPJ1AWW6qfYubI" + "0DMPJ1AWW6qfYubI", + "tcGlxrXYONei6sfG" ], "type": "MOD", "side": "SERVER", @@ -12722,7 +12793,7 @@ ] }, { - "pakku_id": "ZGt3prWXJVURPwKE", + "pakku_id": "kR8s4t9LptntMSpg", "pakku_links": [ "64uacGcEw697jVGs" ], @@ -12741,29 +12812,6 @@ "modrinth": "ONgsGaM9" }, "files": [ - { - "type": "modrinth", - "file_name": "waterflasks-3.0.8.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/ONgsGaM9/versions/VIl9hEx7/waterflasks-3.0.8.jar", - "id": "VIl9hEx7", - "parent_id": "ONgsGaM9", - "hashes": { - "sha512": "7cc5e39ac45223a4b28387a60e0b361d777f44f34b9baa5d24a1541a0a21c0decf86146c19dbe4fcc4892048c0ca4f5a5737d09210c42f61d0e34448b3390c47", - "sha1": "6fc568609f6a182d18f8f4fac286c9bf122a486b" - }, - "required_dependencies": [ - "JaCEZUhg" - ], - "size": 939203, - "date_published": "2025-07-29T01:27:09.745095Z" - }, { "type": "curseforge", "file_name": "waterflasks-3.0.9.jar", @@ -12787,6 +12835,29 @@ ], "size": 943232, "date_published": "2025-08-12T03:42:03.923Z" + }, + { + "type": "modrinth", + "file_name": "waterflasks-3.0.8.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/ONgsGaM9/versions/VIl9hEx7/waterflasks-3.0.8.jar", + "id": "VIl9hEx7", + "parent_id": "ONgsGaM9", + "hashes": { + "sha512": "7cc5e39ac45223a4b28387a60e0b361d777f44f34b9baa5d24a1541a0a21c0decf86146c19dbe4fcc4892048c0ca4f5a5737d09210c42f61d0e34448b3390c47", + "sha1": "6fc568609f6a182d18f8f4fac286c9bf122a486b" + }, + "required_dependencies": [ + "JaCEZUhg" + ], + "size": 939203, + "date_published": "2025-07-29T01:27:09.745095Z" } ] }, From 33e99aedccf00de50d9e22ad5e7e7cb3f7ae2ffa Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 01:21:58 +0100 Subject: [PATCH 109/158] cl tidying --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3243a510..227b659c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,11 @@ # Changelog ## [Unreleased] -### Changes +### Major changes - Complete rework of prospector's picks. (#1594) @Redeix +- Removed the mod that was causing placed entities to sometimes not spawn +- Removed energy P2P (#1661) @TomPlop @BlueBoat29 +### Changes - Rebalance Large Solar Array to make Mk2 circuit 2 viable, and buffed to LSA Mk3 circuit 2 (#1591) @TomPlop - Added mechanical press recipes to weld weak steels @Pyritie - Added backpacks, lunchboxes, and vessels to the toolbelt's blacklist @Pyritie @@ -14,7 +17,6 @@ - Refactored locometal recipes to use stonecutters, metal plated locometal is now also much cheaper (#1624) @Pyritie - Increased the air capacity of space suits by 250% @Pyritie - Converted custom tooltips to lang strings for translations (#1663) @Redeix -- Removed energy P2P (#1661) @TomPlop @BlueBoat29 - Fixed grammar on death messages and added some new ones (#1642) @vdegans - Added IV fridge, and IV-UV aqueous accumulator, food processor, food oven, and gas compressor machines @Pyritie - Added machine recipes for the wrought iron grill @Pyritie From ba1889bf8d854f5ada0588f975c6d88e13f98da6 Mon Sep 17 00:00:00 2001 From: Zippity Date: Fri, 22 Aug 2025 03:35:50 -0700 Subject: [PATCH 110/158] fix semiheavy concurrent with tfg core (#1671) --- .../configured_feature/mars/semiheavy_ammoniacal_water.json | 2 +- kubejs/data/tfg/worldgen/noise_settings/mars_noise.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/semiheavy_ammoniacal_water.json b/kubejs/data/tfg/worldgen/configured_feature/mars/semiheavy_ammoniacal_water.json index c601fed97..832a00279 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/semiheavy_ammoniacal_water.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/semiheavy_ammoniacal_water.json @@ -1,7 +1,7 @@ { "type": "tfc:flood_fill_lake", "config": { - "state": "tfg:semiheavy_ammoniacal_water", + "state": "tfg:fluid/semiheavy_ammoniacal_water", "replace_fluids": [], "overfill": true } diff --git a/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json b/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json index 9b093369b..fa4e04717 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/mars_noise.json @@ -8,7 +8,7 @@ "Name": "ad_astra:mars_stone" }, "default_fluid": { - "Name": "tfg:semiheavy_ammoniacal_water" + "Name": "tfg:fluid/semiheavy_ammoniacal_water" }, "noise": { "min_y": -32, From 98e873cba53b3f3108143b92e2083fda5e6fab98 Mon Sep 17 00:00:00 2001 From: Gustavo Date: Fri, 22 Aug 2025 20:54:59 +1000 Subject: [PATCH 111/158] add Alabaster rock crushing --- kubejs/server_scripts/tfg/recipes.rocks.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/kubejs/server_scripts/tfg/recipes.rocks.js b/kubejs/server_scripts/tfg/recipes.rocks.js index c831d572a..6118e4eb9 100644 --- a/kubejs/server_scripts/tfg/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/recipes.rocks.js @@ -794,4 +794,20 @@ function registerTFGRockRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) }) //#endregion + + //#region Alabaster + + event.recipes.gtceu.rock_breaker("tfg:alabaster") + .notConsumable("tfc:alabaster/raw") + .itemOutputs("tfc:alabaster/raw") + .duration(16) + .EUt(7) + + event.recipes.gtceu.cutter("tfg:raw_alabaster_to_bricks") + .inputItems("tfc:alabaster/raw") + .outputItems("tfc:alabaster_brick", 4) + .duration(40) + .EUt(2) + + //#endregion } \ No newline at end of file From 6eb2de022096068e4edf8f8f7b823bfcc595afc5 Mon Sep 17 00:00:00 2001 From: TomPlop Date: Fri, 22 Aug 2025 07:41:27 -0400 Subject: [PATCH 112/158] Mars ressources (#1569) * stupid git again * First entry for the mars ore line * Adding the Ostrum Harvester in its first version * Adding new casings * Adding the complete Mars Ore Line * Bugs again * Add ores and textures * More changes * Changes to heavy and semi water and more fluid veins * Adding more crafting recipes * More recipes * weird * nerf ores * fix thorium * Adding dusty ores * More circuits change to gate IV at the end of Mars * Fix multiblocks * Changes to AE2 * Unified Pattern Provider and Interface * Removing Bedrock * Fully remove Bedrock Miner * Disable many stuffs until Mars * More fixes until Mars is out * Requested changes * Cleaning kubejs files * Adding Moon Ore Line * Change Mars water to Centrifuge * Fix duplicate --- .../material_sets/bright/dusty_raw_ore.json | 8 + .../material_sets/certus/dusty_raw_ore.json | 8 + .../material_sets/diamond/dusty_raw_ore.json | 8 + .../material_sets/dull/dusty_raw_ore.json | 8 + .../material_sets/fine/dusty_raw_ore.json | 8 + .../material_sets/metallic/dusty_raw_ore.json | 8 + .../material_sets/quartz/dusty_raw_ore.json | 8 + .../material_sets/ruby/dusty_raw_ore.json | 8 + .../material_sets/shiny/dusty_raw_ore.json | 8 + .../material_sets/tfc_gold/dusty_raw_ore.json | 8 + .../tfc_realgar/dusty_raw_ore.json | 8 + .../block/fluids/fluid.dense_ostrum_vapor.png | Bin 0 -> 27412 bytes .../fluid.dense_ostrum_vapor.png.mcmeta | 87 +++++++ .../fluids/fluid.lightweight_ostrum_vapor.png | Bin 0 -> 25572 bytes .../fluid.lightweight_ostrum_vapor.png.mcmeta | 87 +++++++ .../block/fluids/fluid.ostrum_vapor.png | Bin 0 -> 26828 bytes .../fluids/fluid.ostrum_vapor.png.mcmeta | 87 +++++++ .../block/fluids/fluid.regolith_vapor.png | Bin 0 -> 15957 bytes .../fluids/fluid.regolith_vapor.png.mcmeta | 5 + .../fluid.residual_radioactive_concoction.png | Bin 0 -> 14452 bytes ...residual_radioactive_concoction.png.mcmeta | 67 +++++ .../item/material_sets/dull/dusty_raw_ore.png | Bin 0 -> 5934 bytes .../dull/dusty_raw_ore_overlay.png | Bin 0 -> 3119 bytes .../dull/dusty_raw_ore_overlay.png.mcmeta | 67 +++++ .../dull/dusty_raw_ore_secondary.png | Bin 0 -> 358 bytes .../machine_casing_vacuum_engine_intake.png | Bin 0 -> 548 bytes ...ine_casing_vacuum_engine_intake.png.mcmeta | 5 + ...ine_casing_vacuum_engine_intake_active.png | Bin 0 -> 1083 bytes ...ing_vacuum_engine_intake_active.png.mcmeta | 5 + .../assets/tfg/textures/block/sand_spice.png | Bin 0 -> 1763 bytes kubejs/server_scripts/ae2/recipes.js | 136 +++++----- kubejs/server_scripts/extended_ae2/recipes.js | 246 ++++++++++++------ kubejs/server_scripts/gregtech/data.js | 152 ++++++++++- kubejs/server_scripts/gregtech/recipes.js | 30 ++- .../gregtech/recipes.machines.js | 244 +++++++++++------ kubejs/server_scripts/tfg/recipes.js | 2 + kubejs/server_scripts/tfg/recipes.mars.js | 72 +++++ .../tfg/recipes.miscellaneous.js | 2 +- .../server_scripts/tfg/recipes.moon_ores.js | 131 ++++++++++ kubejs/server_scripts/tfg/recipes.nuclear.js | 43 ++- kubejs/server_scripts/tfg/recipes.space.js | 2 +- .../server_scripts/tfg/recipes.terrariums.js | 9 +- kubejs/startup_scripts/ad_astra/materials.js | 1 - kubejs/startup_scripts/gtceu/constants.js | 7 +- kubejs/startup_scripts/gtceu/machines.js | 132 +++++++++- kubejs/startup_scripts/gtceu/materials.js | 13 + kubejs/startup_scripts/gtceu/recipe_types.js | 24 ++ kubejs/startup_scripts/tfg/blocks.js | 25 ++ kubejs/startup_scripts/tfg/fluids.js | 8 + kubejs/startup_scripts/tfg/items.js | 4 +- kubejs/startup_scripts/tfg/items.nuclear.js | 6 - kubejs/startup_scripts/tfg/materials.js | 66 +++++ .../startup_scripts/tfg/materials.nuclear.js | 8 - 53 files changed, 1610 insertions(+), 251 deletions(-) create mode 100644 kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/dull/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json create mode 100644 kubejs/assets/gtceu/textures/block/fluids/fluid.dense_ostrum_vapor.png create mode 100644 kubejs/assets/gtceu/textures/block/fluids/fluid.dense_ostrum_vapor.png.mcmeta create mode 100644 kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png create mode 100644 kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png.mcmeta create mode 100644 kubejs/assets/gtceu/textures/block/fluids/fluid.ostrum_vapor.png create mode 100644 kubejs/assets/gtceu/textures/block/fluids/fluid.ostrum_vapor.png.mcmeta create mode 100644 kubejs/assets/gtceu/textures/block/fluids/fluid.regolith_vapor.png create mode 100644 kubejs/assets/gtceu/textures/block/fluids/fluid.regolith_vapor.png.mcmeta create mode 100644 kubejs/assets/gtceu/textures/block/fluids/fluid.residual_radioactive_concoction.png create mode 100644 kubejs/assets/gtceu/textures/block/fluids/fluid.residual_radioactive_concoction.png.mcmeta create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_overlay.png create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_overlay.png.mcmeta create mode 100644 kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_secondary.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake_active.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake_active.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/sand_spice.png create mode 100644 kubejs/server_scripts/tfg/recipes.mars.js create mode 100644 kubejs/server_scripts/tfg/recipes.moon_ores.js delete mode 100644 kubejs/startup_scripts/tfg/items.nuclear.js diff --git a/kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/dull/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/dull/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/dull/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json new file mode 100644 index 000000000..686c28056 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", + "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", + "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" + } +} diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_ostrum_vapor.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_ostrum_vapor.png new file mode 100644 index 0000000000000000000000000000000000000000..d73ae13b2508828e7ea26d98266c19d1a6afb419 GIT binary patch literal 27412 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

}j`iJ3)LK=_UXi#+ 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 X000000Mb*F00000NkvXXu0mjf|4rB4 literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_ostrum_vapor.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_ostrum_vapor.png.mcmeta new file mode 100644 index 000000000..744a3d54c --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.dense_ostrum_vapor.png.mcmeta @@ -0,0 +1,87 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 39, + 38, + 37, + 36, + 35, + 34, + 33, + 32, + 31, + 30, + 29, + 28, + 27, + 26, + 25, + 24, + 23, + 22, + 21, + 20, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png new file mode 100644 index 0000000000000000000000000000000000000000..79398a2326e36cfa65bfec494d652db6fc5ac9df GIT binary patch literal 25572 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 D3v94T literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png.mcmeta new file mode 100644 index 000000000..744a3d54c --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.lightweight_ostrum_vapor.png.mcmeta @@ -0,0 +1,87 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 39, + 38, + 37, + 36, + 35, + 34, + 33, + 32, + 31, + 30, + 29, + 28, + 27, + 26, + 25, + 24, + 23, + 22, + 21, + 20, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.ostrum_vapor.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.ostrum_vapor.png new file mode 100644 index 0000000000000000000000000000000000000000..c2602b5a607583b8845801b16ba0e9f7c613df8f GIT binary patch literal 26828 zcmV)~KzhH4P)({SKrBbO(l_{E{X%2_x^mN)ioxWa0(P_1g*YFOE#b9nOYYYa1zzBlH zBFF_nFj(Y*AUFhzMXdy2!)FWx!>jWdKAl!lI-N$Nr_tfIIShxUX_`aR z6it_@Qn^$rJ-@y`s;vnDK|ljle5`uE@9+El{=P5w@{gN0H#Updj*IJpHikm}BnP)X zr#~Sb{O+^9}&FfAI^d)w8^H<%oI>)>f8STV2E$jgZ11 zr2wFH=z)PCNSOu($5WW}5j^j4k_3vy9C-)w-aW3q{*Q#S88S{lpaBpFdR>c^Rl{tS z@b;C2N;$%4%`|+1wPk1?-bE^jL9n_4a&@`FWTGJfg8?HL^;|l=l++}2+H-0(kInN( zq$wovoD0hXDt^d*tB%;)84$<%;Vu*+`#F~FAeBR!YAnkJo#4t_Tsl8OYt4RZ8IXu- z#c=C-53Rw^pTP6-IPM7wg)>yjXK?Zb5R(197B{vXl$6}sc2Sl^f9xZrUEzQGOB-du zWDKsILkM{DKYhyY{lTL=S9qL3|A=9?f=Nc~?B%gkM1NSI(~HOrx<@y|8<%Yg9x^g$U;N81|u93`x@W$QM8x81(M*>Pw#> zCAjtz2tZnfXTEce{xCoajjaq~(2pq=YXD5fHU=;n-g&c4I2-fQU*5x#Af#Y6HoW}T z@9~2lZgOGW;o`-UEd0jh-+a+MeZ-kFK4%{-uwu+Z`nNgkouN{*x%z*9gcL$B=tm6uF`E}H3Qo4)rG#?H5PPSHHT>k&FF4p~BbB0% zcW5@j7=wVUoQnk;OKBW+l3aWT9sCS{>FiSqMX0ZwWc_@FBu!8%hg2XiNP$2~fslf6 z|1?7X)A93I24+0{oJX+)|MK6!m-oKGAN>Ku=@9}jCPhdokrJjO8^`;MAS@6@d2DZn z?Z+S>)$rgRES!MVO&cXsq)ai!AWd4L-wkN2&I!T-o|A&m#EAj}Pm~fkwaEQ1vVBpj zmC&JJ<3bLheg$ES#kN~IK#_l~I5Ks5J< z2x;ILva&}5!8}FTHokuvTb*M%eL#Nz>#Kq|mFQrbH(&h#X^bI`G@YiTvho#>2?TK1 zoUy+RMr+bE<>IBUktPw^fB}S*h(;q%92=5Y(`}u3h=m3?*i&?R3Eggh?-$VN5lIrW zRzJX)3_Il7n#W*}((BK0EI2&$D0&$RDNA64!jgtodqNUw5CSPBTRV9yTV(rSrQx7c zm?g)HHvkgLl34C(l6lJZR+nj2aemWgYsW=O=ng%kqjo9Ozs;|G`!ru_m`rmx)@izJ zFak24_uAy9Z~`nxV_Q#AE<+N-JcKyP>S8ka1?9@) zMDzQ+@#>IHbB3i9BENOk;Q->~JrMT^!|Xx!d-oXjA5g15&S>;8QV4$dVwLBf zZ{X!6Ybz2N%x%KBfaQz1x)Z!w#F z%EB|h@xqIx@)2rLA;l@qJ-&!iDgJ52Y-SV9Lq6=^BmbDk&)!=gXEg2BknMk5;=_@H zkV4Sw&KdMVTt__I1fAwRmg|aY)x)-2MtxXYh3oHhn9oxz%SBly5eR`mP&`JGaGsJ( zdNgW1lv={|JbwFk9-&YKWy9L}5>Xr@mCBlJspuh&+wQmnqrQs}g5hKZso>e?PjadR zD{D}#!ZXkLgmH`|H9z?N@xBp4uze%Sc!JUNM$1T{QQ`sf`8`;GM+!%1lXb84^#b2} zUbC_SVmxp-*w#3X0xKmIA+{F~h6*VSe&Iy+Tyi;#fvay$Ilt-CSaa}v5Uu72Az*D& z5=IHLnWjGgttO1863d3WpJw+s+`WtK6mT4mf;S|Yf1IK6#zl3!{A}k5A%T=aC17_) zp_HWGPSM7&wjwdcW86PLN|_ZC7}C@{EaPLo!DtwB<@G+U>)^T$%Z)rbjWWDA?&7l1 z$OBXK@eMLO$>6DbXd!JIX*oy)ufDR+%37V(WzAl*nt@8CYKUeIu4`qh5XZ@fiD--Y>c2?vv`&098%htO&tA<*pH8gS!!3)gng+8`Gn zdyIQ`?=l*NJo(LYoIM4%Z$q(^wfXS~2E+GRU4Ih6B5CX*Sfzb1$w2kJf4IwhCh$Cu zyLaz$?+fr8aP!$KdF##h>9%d6`E3e$SY0`bi4&fCewnAAE+f0mDM{)Q=_$Q#$fc)$ z9Sn@e@cOHF*xlaeKmYl&tTrA61BbgGu(Bd3lwA7V6zMMu5)y>4+1T{({V!0Qq~OEg zyrP`nKuW=1{|(p{#B&?hDe$+ig$SV#{a(nhA0dRmvBks9)H=9Nt!k*&JjVTml{$R; z+n}UF6l$chL0FmK0B~Ik+ffX95hbU`az)S?E>kXP);G@KcyPjpXTE)kKl;Oe;Nmm? zBgTL%mGamQOh+-JPK@K05$+TNoWHP05})Id$Fq&~{y)MzyvOQFp5^KtYK_yG;288H z6eYqi#IiNrVFSkkzjEAg@81V0v77~b0gVO-VW`zUL5zoP#)<3+)#VgpMPMKd72`?P zK_0p5817wqoL+1nW)rQ~}rJVmebfNtv2s0ySx z1`(5j*2lEXKyyFiG}}949M{EC7M4=%?tV@fIn>H<&{_NC3bX;Of5{CXV{XcF5Ym3Q z!YG=tvpr$nuruKq%^YgW8p~3Q#tFiL=Dx#nMIeR5FO*5rlr&8dLSXcaG}YX=6`-U< zRx3~~SMZAq)awNX!$r&*REjX@A94P|X_DkV=oJnRCdAR4G)<90V~i%3%w{*2&YXFO z2U0<=52XT}%EQkNq1C#_rKba$dnID^$uL`yGXlZM>p|=hP?^mxyBM_p%$LNd(4c9zZmOZs!v&o}ZB~O0Hki z$jWlUY?e_yDFa+>VT_BqwPE%UV zKBa0E;rVdom4MmI5J!S=Cg}|7^oJ{q2lt6)u;`qD2T-X&oI-s$YqY|$5IXUZQgY+% zh-l_A3o@NBn4Cb0B?@I=30Q>P-7onsfA$elS*%^CWX<)k)nenKg_MTzBqWR@b`KTh zA~=5bjop8EK(`t37k{;ll#=Ja`vk=TY+X;j>f{1rpwdX_wzI#iZDbqjaQ{Ak^dH|w zDTNdUB@C~5O1})s55CP_7xeL&^5meWK|Shs_YBY@`%O49c>Iqr2?v8VnMN z5EwEbNmGL{1|`H-o(w`r95;{F8k2?y3~?NgBnfGnAf=G_zKuYjl;p;{5kkt$j38rh zw(SuoF~NKc!a+nc;v``{pCO9{n`+HL*%@sqmCiApWiV%3U|FZxxOkfV{rkLiWrS1? zVK_l+&G`)<*=Up~SC?2g0bkw&ir{*1_K9Pt(=eJI@jJgaV|n!%hCPdSuij$gyw3|i zC?RLT2qPS9E8*-DPw>%4AMwN!+0~zX2toKU_4+wxlM(8C zv%r9~nNQA8E8QiZKZR_!0*rxL!@;q^c5L)g zClaF;DOcc>3;)+&zmN0_XX$nBvcIiq?v8ox*#`N1M1N#utt<^GRl#rqI}bqsySqU8 z0A+hDtgrmL7eD*_GseGoz@l8hI=RSra-Z?1kMQf47I^9@o7y+w?Kki8(MOv9^+*3N zUfv*7f&b?nL+;g=S~rb0fZ=ct);0>bj*DMCNxOBQY7w??1YCV*8z}`!DUu{%^Wwil zNHRPyA~OU85QQn>d`i3jHFmZGHdeB>rz{641eVHFUL4&4#6zz&GkJv|iB0y3tYfZV zvMO~P@7Onrkx~+c0ov$e)p)EOF@`wSB+0REkP>4ukg;qR%XW#Agd~ZH<0;DxGMXoh zpj4=F;rA{4eD2|4#N6f7sZ;Ra0RZo{ zM)=;>2qQQ=`~o3uq|8Bj2PsS@z5z_CSUd@*PMvzF6YqwLl#5?uZ~p_XU;miKvcj@* zjE3;akGs@rk07d*ClSgf4B@~3^nE_Ro%QGU+k)}vON;@nzm855UjA{1$>4}y>r*`2 zV%URRyA|I|qVO1n4aI^@dR)$vv4s>N+GsFfSptzhPLkXw(VB}JA!0T)3=d(V-ba#C=4kUlZTGgSDzq= zFu-I6X)0+Rx(L_PSWdQuqflr3;P@vPW61joVU-b98IIX(lECW5$;=J}!#qgov;tgL zVi}v>+|F>(PU!a~m8zuRpGL=z5GP+SnJMCQkt?rtk>lY>ZoQq^-C8HCtXLEZ*$u{h zk5+rmpZw`*!Z~bjea8M?kMI59*GSSMx&wg>f)CMJA3u3RyEDUf9fEmCXP|ldnMdfh zA8>dOvA5U7ab42%9?gS3u3JKCow9yWaIgbL3tZR5Qi6+@&(fG?EWY27h{Ehm?CpNS{_e-Dt)IoRU2Hqg)6Xtv+98}}h}7B>tgn|SRUw$z*ltXc zlzFE12x*$B835by0Kv6ut;|6+Q)FuwEDLJOiski$I9MQ!ZI&C^s?ro(Cv*FM*Ifl* z>z2jt_JGavKDnzu32xd-QmUNdo2zi&+-EkMkp@1+>JsB2hy?6B>>eB)7gvG+hJz6z zPDaG(nCbKrj(~2r%ei8audOOhI7evn9$G#i3Lj9&=P){E&^y7auN=?Xiv9|DKToGK zU_63q@hR@i767;x=4e!_3`bqG$=nRfmUKGzGgoK1MD8#Dym!-eGK961q_OPLSbmb} z_zNuiB$M%7JkMb|%kiV%|F1|X+1xx&nx+KfF}cHo`OPE+NrG)lj83tfObt#(A&%qW zI8%()blU~;-dO~9@QbH$oDUF_iAEr>ZHclBARgkuSD(zPg4*&~QhkJwr;!4-Zdk~2 z#YPB;tpqwvDHLMDc}Srsm`)VNKrk2x%nmnTY3VCBytY#VG_GY>LQ>-SQA zxjzNUwsG^>6flkzQdwX5_O#m|4Tf-TIBbn6`Ziu(GM!o|C6Q7ynWRjn36-)%-hTvZ z{QX1?b^>-IJ)<{FIp$=liW|ZpQPOW$m16u9r1{tLw~uzqmMaMYYTkxq09X^ z$0wgm$sHYW>t@2YeidY#gzWD)B#A}|u&o(Ml3?)II9~vBg1`C8J5-8Oq!f6*A@94y z(U4c(Y9Z4&BoPMNl3?J{Gey!wGag4s2|sz`h_A*4XxQBe5F%vzRtF_OT)Zqub!G$Q z^F9Z=G5fnAQrL744MODbyi>TIkDK?A!eaYYA6wbjwvE`^N|8bw&yZnvyU+Gkk0dfA zi6QT1x?y=`fy09_`}NNJ_hSHDb&lEO0m@#)6(539By-Vr!>^r7W5|ciFsTk=wd4x+$dv0`e|cN?=(YX_~UPJwQpx`OOTL z_nLWZ?=0cu9y%Vee(6bMFpKev7OtbPtQ4u>tQYe4`%{V)k9j3u)uHAqjn38JE{vik<4UUs1nrFDv z-d7JV5<+0R4$8Kf&lQe$oAq@_4Xmz}SY12j%0ZCQ>qHdt8i~bpYN2&DhYY3((|}`9 zYU3B6nHW6ZP^vE=_qL}bTGDDdh%{n##iA$#7=dL=l%-f*wVBR9iiBYDC0c9VeWy>g z;Uhau7)~M_2ZTx4ZI1D}iq%cS`Q;)2`}+|>z;pnc7c(|zG`#lm0n)MrX&Mp72G5pU zezuHl32wYQqE=G`^D*sK6>SVfZ_eIMK)VxUK@OcF!_c60f^E6@ev$p{X~w_}>~2jm zw^J@+()$Pm8iSM;dpo1d&5M!*r6fXT)8BmF#~6r{F;SRVfLQQvpI;)09z_6->(Fk6 z=p;bKaZIUDVr`>>=W2RwO?~AwX_}{A%OM3+>Y!5?4vy$|N0>N4Sq{N;h;;KsEF}?Q zjt~xwRf*Pj(WJ~Hi&9ZCpD&>eR4QZgg~u5UU^KbIydlYL-#WV4-20Gf&1Yrh)I&TF z={bVgU6hj4OA%U1(j-9$!FYBS+kwNwBjjQ0L!x9rx1({~F&8dZ8FUp|KOjy=RI1-3 zP6I~mHcshZ0Y}V651582gV7LKE*NIQCI}4G>Nl7SVKRJxUlQc~2F>Qr$a^bjRlv95 zwU-lm-5#}7hf?{QNY9IpY0Hco*Fx6TH;JNzpq--8nA9Ula%^3Xa6N}kH)U_P&GwGq zKmBeL2pcwYW!juC6|~6(C$DSe1uYp=}aM9S0Pn|?@M$F)r#Qr z`5epX;S~+aF$_mb3`TI+%6O7Cnyp(M!r0CR6rS%9MOhLi2yHAmV>-1E0?JjFe0rC6 z-adtAXB$du!}$v}oWhCB3Y*UjT5HCGkYd3)w!#ev!*m)G%mqd(ECtVhcZoQDl56k0 zk7eIQc3N|c$gFRjWV%=>3k)br5QPzb!D3})i8#1}QcJX2cX<7kHb3|s8_{nobegcc zm9ljsWHODI%_3$&OcbS*%9-EXY~DqXrDe1>Bx%A+f3u6QEy4D!h$P9T)vi;ZQq6)) zrHV}uMBKWj9!>!J9k_a>n+X)7kMSUlNz;_?e5Zjx^5z?JY$=&fG;xwyf>J=Wnhmwn zB;n$P8m+@AQYuB>%af)lH?9qF9S3FEfFO=DJD^@)Ak_=}#&hs~8#dM*);H?BbwwfP zQOw@%fdBA&Pa}oEwigMb`$&;F{RLlAEJHNU7-t&(H!fdD*=yRQIz?(DkwWqEk9WBI zbe$J|_&A8Ahb;BUr{K#kz$Bl6R@7EkGgU)@!`30WYi}Rj?6f{WAXr;36GaJY7eajB z=iN6G@_9+Qa+0$53DUNi%uW-84=9%xiDD4l{s%;HAC0En-e-B`6u$2>>?$mGM5Siq z7vb%9U3P9|3A)Kd)9=HZZ~ha)R%u3E4fy#w2pD#k7>^9aVx7ZQli>io;z`PllXTng z`@j1x*RQ=#q3}&)xd1EmH72tG#w1LK4%@e4me&-nuSnt&TU&Ry_D)ExS|*Gm;%LsR zFCFm8YfonU06;1$8=og3<;ppx<1ZQZC*(a3tqp@=%yd@Z+KnC;E>@6whL=w=;pydV zibXpEkjTcfK4-t501$=|w(a2fXSu$0AII@IJdB9OUE(y&230~tAY9_m@b#kLli`rf zHO2m+%U}qtRu9`>VSRIn{k`lJuUx8HkBg8W~3kv#DVoK|Y^gY0YG6p;SgP=Fx;Wa#&woqTRkvKEFhv z2;X_3n)Q$AIN{pWki&h+WD+q83_)NBLqV^XU|9;wk~EulFh(NS_`7}gpLu1)T2$+pE zh|GAgES2RnfY}(*=yO(c7Aq0b7l#K=u8HlC=DFpxa`6c{(W)rNg z)e%T!6eq+{%*JMg`AicA7E0RqRn2hV;aHMd&ENz}tSrNH1m!}TC`mx(k#UkBEh~$f z3PWQh(~(L^Y7JQ1h?!4L^IYXP;3+>NjQ=Hm`T=q;Mj$K@7NbGTc$gxOl?#9pg5IH% z`3C_E2k_NMWg1m^?)hb8eI<{jEOb0$d9_TTu)vc~!TbOHmzsAxfj6%l(Wr(z`|U@v zmDmgHA84fOo*|AuBuP_t_ipk1>c8gwpB*tCYlILasYdIR{bqtOdCWV2IYN0MgJFo& z`e#^{APNjhmO0q_lyb$RR9-{~*x5Z~HnDmB`7%PJwAz`^di9+f{P4F{GC-*oDi{N< zJEL57aU4MuWMj|S)Il4=8?O(z^2U%j6|Af+k;Eb8k|KBg-R@1PYy?><*mY9MmCO^~ zzZKv*4zB0Y?;FD8B-`7cQL9;8dgdg>2f(R??1$NKy4wvhOFR{5qi`G#A#+q~ z3gP<&=0S=;Fd3et(<+e$0qstn<<%nVn|YK{Tz^$(`iI7&titD zi0Jm_tZh`VEa>;{pmmDTno2oGwG4w!h}6L5+vJ`8p64C3!SF!6#&7xAZ9%?3l&fyd(z*3T80d}_^AOw{B7SCLc5yO#S z=T=IoC5?DgNfKV%lx+9Gk|Q~)C^ng0(b5Pe0}*8{r4e#aF5SFh5C~x`0%5jB0RT_t7050Ax%?WeyNFV z3tTV9+RCqBwC2j|U9P;|B}pRUC?wH}M1wXdxvd+6n_6oSig2D%E;jKmSxVgO6d*zmth?FYjdXuA)HOBneEqDG2Bfq1T(@IWCUtp*6hpVtUgwQ6!b+cMXBkRG@A*g}+1&+g6qe(&yplr{{9=X&LNK3) z3`Z6^2xxbGF!1d2PoSivxj*7?e?*c(A>`%b001BWNklLJ%LZdH!)qB^NiJk_sr~Pf@FUiBby)*U_X&%;jetykbNu=Ax}90(3rLmu2-+YJB#9vm6^+^)t)Wt{BSf2pfA#DC$BTx9;$wo(K1*>N z#c9vM^K6v#I9oi;y?X+CX@TAC4@r)y ztJ%P!SUgEEhA=F1{@ENxKZ@@_w{<(i14l^4 zLY&Tc{(FzJT!$by!nSg_E<`cB`PwH$NsLf}*I#|WF4Q=}b}qzN+C=fbrpuACy^MaH!`A?_cPmGYnwC`Ou8wfp<-`4n>*&+tlhgV>}-SKK0=5H zDFm*U;kjcaH_=^jcLWWT2|>6~%D#B?&FS{3NHh7bw;0nDbFr=R&2+8j|T z!*DRCScbfJf`a!x(y>!!Q3_&+Uxv}p#tO65jK&%e7;%Tzeh9)wDM7&pogT5XEfJoZ zkk4D04pxGEIi}eha(Fl*mmZ<9>}0;O?@J6W#Zu;6 zT)#F(2!SO9hs`0K<}?!@0y@nAWjpBOxR4M+AcUe?^RR7;UMD0?V$w9q>=3C)lN6&3 z*WVsvghQv74Qw6%`Qt#7lt^hY9L(^GHk;?GD5Y>68^>`mTC=w^B#tyYTYY9pjX3d0 zq6itsf`aGM>xBkMwjU%rryXN=&%pDVJE#=$j|8xQ(Wg9!926OBpIdYc0Q%moFk-!R3oIIJ1X(q z^C!r=50H6pk)?c|ReK?ua42Xtzo1l>_{Al(&NG{Z)M_5VXhJF^>+2e~2)4b5?Dg*8 zP920eBABK8Iu|N`>n}t3?*EoXsY9o~Co-m1VXpDXCQ< z4ng=JmCAE?FlJ??z;qmuYDLkB>5bPg@r3b2vc6Hu;xtk+9wsC@n|?`2h6j6F2{1)R zKE(peMI9kCJm~c%eCLIFR$S@?%d4kJG?eR5@^2%OBqUA}cDG^%{fO~M(d`@N^V5vR znhTe*ExdIt$aF*hHd<$6q}gah?&_7^%`{CI_AJs^62}SSASIvo*}i@Nfaf?!Dfst) zu!=UCUguHjl`kk3KzgpmAgR?IJm)OK{vBR=xkaobm!EF1z192WphiLzD4MPNr21sG zrOPGFcxvM~0wM1*9tn~(qFO6aEmx6JVM)R6&VXxIhsSScnZwo>=qSl-pjy2^oTSWV zDSLY(E?!(_b6`5`j z4<$etCM1bL2xu&4krElsqvPfwhytIr)$C&5JDvURYwxsi90%q8I+fb-aSe?^ zN~l%N5CwNpN)g3|PWu6Gyt0d9+pKL=iQ||kN%+m*T4sG6wr@efdqA$aliVzpmY7U` z!AjjB2p^%f{|TE}8cC&Y1#HgAxS`|b3D(&X!9_7CZ*zFcZ$(as)LN8 z6p%z=hP1X7WVNmXAfFYE{z?R9X8;R+A&VLeKSGYj24fNmz90-TJZO|O-F^cnA7G3@ z$3>)+tZ$|ii-LONG{XU0+OQC5Do9g7yEP#Q4AIP@)yZQ_%E5up+gD~(>x!qpeG1=) zLh%ul$^hlotpaj?*N`MB^H~H$T-vN7m1G_p+TAg$>t#Cam@rJq`+1at-Q7uh{ux;K*BAff#m_!Ff+L6A zVvcWo<1~u`KKacFFU^#{-zHamJ;By{vAHjc2lDqYGbTbGCtgikF zQfD!9sj`ES!TgA;Z%oIH^8jFg}YM4nLq)FX6h9e9@rAjGwn2#qvHQjvb!;UIit>WAi1Ubg)XLlE?Kj zqgIs59zqC|ee9vehHun9Ck{1Qhxoqr%aRrnB_z%LIdK&6&CM?n%FYON5=qhoEIH%$ zc#NfHnaJ>Mv^Ecw90)8WK?pwRrO07FqFl{`5JW*tF!oqo37E_*EIYHrmRIuxv+Ros z&pF57a+0DC(rB_1G-E?Bv?vu*4%;45O5#)i39f6XHEh}k$D~4K((os5fIQsKX6wd4 zIGYf~4vv+bus`f;>dPLLvS!drv8`+lQz)E98`y8&Cbzpay7|Vd5eD<{m`$}@z_KhR z0o0d0bP`f530%jaxffHdJM8avDc1f4vfqpN{tv4Zi%WFc54d`@N3rPRI5z!pm!0hq z-}z1zAq0o}F)M3D_I6rWmdXmu&nt=r0ps&8OY_|5OHG8jhWrQqV_0z%GFO0m7w2Ps)u z%~n)Q9zhx{2&SL_rQbuTr`X=^;O6tJu2(tSpJbX*N-kcm0Z^$+1Oh*Wg_S4%mls`I z6Ww*lEj|I}2qRDP>zDHMS`WxAK44J@9xK}*?sMba0ZZ}}tKaf?^bwJzg@+?SqO+9r z)>eS)oWfB{B;kPhXiRHwMz52dbN|i@Rc_qq@YWlBgaTQtSU8SE+Napv%@SZMt66DZ z@@iba+Co{9gS{TJS%Q>;Bu&Vd4dW@ueEtm9@kVm;DfML!CBNicO#l{3t&>DC-9MY5 zR2ILQ&F3U(!eDSevq@Ub+nL3y9wYBUrLw?LlI1erdSf4>3y9+btryN$=#K^El1siI zklp@!l&UT(s|Aet0&QX@fr|OvgwU)Ys&$vyGz0`Xl{j|7U^qO+1DMTX z3Pp#!Zdki2@NKgnbMwl4ri-5(Yk&rI=1Z zCnbc|nTVQ9Q-UC&T06^hW+S9zJ{L@9F-E6&d5gyK;}20uS#ayx7`eBd;@FCIJM&2@ z#ZO2QSY8#(=LyIZtrLua$@qSD>_Q5Z$_(nP(l7oJYQ6Kb^TFxw%)_CB)RQ(!<$kG3Wbxzvm+{v9Nj+r;dmakMvnE(0#fGaweR!Fk9QD4&{(N(u-ivA_X93p z@~G5cHrUTzWxvkWR-2WL03rEpsrgy*tAF&XaVzMU?Gh z$q<90;FYNsBz`$dQLb$&e)R9Rk99-?DJ2WF$A0)?z5W=bb0?UL=bW$?x&I)cSY2l2 z8;eXv1I8asm`^|B@h2YRo8LOi?%)4{{)aOLgBiJ7@93KVlTpC9A5$!sIcSdA*z~yk z>?w-*&*>c=vUlJy89UtC%8t2*QOqCy@n)7DZMU+su726VE5W5_3v8aZC=_AA^Z3Sv z3n(Q}*6}P_NY>VUiUoscHv5?-((u+Bedec~pEqOv&%bDA+VPkxNu~JV zZ&%sh8Irs9&h%!rlAR#&OAcvbFsa3Ck}?`ghNGC#C=2`*y)c`@bjGZ$$}A;1orDM@ z@qLGQ4vuw_B>5+LT}iE8LTiavIDrIOdjXE)VmU4`0wXMh)+w`D{8cp*#qT44Vj04C z1mgcE>WyRMIL|ZB-+cU7EEbE!VzJd~H`~otYdmgG#*^8}gyu0kE>FwT5?ZYw2s)i% z7=~c@_HsrL1jZr=f*=SEhefb34nbf9KErG13_&Xhf}j<2Ixd$>@)+*yWOh6mPsWq> zq|LS&hX>sDC5QINzA;4%p_#$jgOy(JipVzxFWluGgbyFKCvu3a4AxB}6rxo8dN zo^7zT-eYSgrB(l`p#}(Zfp*)*u>&q&93Z7&Yh%dTY7ZebqFRAk%|Vr#m8AwRoPPo- z@1e^!@x&ubYHV$Q?@Lxz+5~}V-k>2*6*CXZhgWY!(A@^#c}SL}NaqNugw2f)v0azu ztht-X*g|W~&gPhv(?0P;B5tSf`cHnz>p%IgSQdQkl;*bLfFJ+mb=Ge5+1boV(}H~qbAR^g>p%G!U#K7EN&f+pk)U}3zR+~IbrbHD9$&0k zZ2a|yG@kN#B6yNRp2Oe#mtQgHMeNJs|M^uO+~wnsQ=WXX%F$zjPbUr^_CM!#Y4g>u z+Wh=)e#O^*`%|LN4)F1>hJ>Fe!cTLG`wIEeD-9?dO0C$u5rVE!ZyaK_1EmCM&rm9( zyp`n^h{|JB=lPeLk5pwwmZcS}oUP$kOui6D(3ykzIXxF= zJ5`oeTEt0CI&IE6);)&1@Y;_ChWsyKG`85@j(FjfHh=za)|gqpF}{k{G+Hiss<1r^ z2_zGX(Fpd21$(K^CL8)EZ2Z%hco0<9JGnh!$Ip7VI-LY)uZ+oLE_q!e7gw#U0~?wM?*Gj{-K zNs6L0Vi?`P_r@S?f*?R8Utm1E!^>Z9F&SA5_7d~Vi~wtjCpP!-!ix)RZVnJCLZu$s zIf~Gbr603&vd+dvPG|lQjub>;oioog@B8aBt_`yeAdLi* ziC{Q};UGiEfYr4T?MjRgg4K;Z%2FAtuSw_-g^;G^nAhcyVLznVH1OZ^FCIh487yg2 z6q+;VYkc$71*8zjDArV~E_p7f)m>CEz`^twNBxK>%z&qP>1D92C#d>H2Wwyvff!E` zwzh^uVMbX%vsN=;t2F(D-d@7y+D(Lj-~S${QX5{P5ZIPw3{@uM1T>7g%5al)6{k|L zx8?Hf-(5C(KF_4Vr7~oP_un3J?wQW7i9eGtr?g6+Cm4e?vy$9k z#@hHOj(bpXlgAQfG3BsHA$a%AJ~P)Y?q03e6`t>tCJs!!E)4Lb8I5yXuYy*ZNw}Y) zct~%14c~Ry?oLc=cM>|JnT?c?CK;}i5|3<9(R5b|7MAuSEm&I*dFDcs)8}g@9!QLJ zftrG`tvQD*j)6K-NGLU%>pisg=qx~&*Cdx~S0#fe%C zm_bTO5}VSdyInFn2aN_(&4-Bzvfl71$`Z832?~C;Q-E|R3m6PE3(FE!p1^WHM=L{i zRZ8>j+kJBfLI|og2WeTvu_j4{;VYM)u(3Vj;>7{WC!y0h$e<71-CLBZf9pd0f?e{u@Pv5^Rvo%87L zrJyyFaY|7*jD{f#^9^44MhnN@$L<#7dCbY>I<{RW8jU%1wvBkif}UTfqO?J8qcEdZ zby=8q84nbm3;*;5_|A8hP%3A6!A49M+swwb;;QQ@!gzvZxg>Fp7g&hWC`(Q*h8*@h zZs*6?+BE#cK|kb$7j2H#>&PI0&CLiYZ6rC9iA}rX5%@;eqLl(EdH1bfV7V={DzSuV zkNkYysE%3eOjw!^(Hdskf;1}W?j~4Lk(FQK-@TTwc(O^Q0^6Ho78Y9!_Nwe`hKOif zG760lT1>Cp?Z!+d3at;JC3w{nB-vs9;`^JdZ;Tj?EiPXQ>Ft4R&4%oD>x{!if*@x+ zk~of}EK7QWhe&sZN(J72)2u$F6>q(@fj|()1#&d@u^q+RZ>3O1v^y?kY13J7@G3Jj zny_{qYQaNx%95fekoAXb@U=LQWf$u=z#8X@3!fbg< za_PM>Go!t|tEEzuRM1M0M$A*z13Y5U_Hp3CwWm(tT`uKf7!H)pUlLejHn3 z+fZ-%R4O@IDXNuw?CwmE(lX?h;&aZO+t0aYAj?bgLLVHrHVbN?Ir&g~s*n7zA zf@Wi5A3~Zfy?nBT7!3=uTp?&M8Ny)Kr_c+OS`sBQEG)zJ<_Iq+nT!>^Jt)ijyz$dr zu3y zGmOX3-+Mqb-pBgde(c~0^w@~#Y{$qDL>8I;(V3GO%PUV(Yd%eu&oCLoyKj7g=j}sl zsQM46ct#{!s1nP9=U!?e2fYbe`edm~vkl$d&lvVI?5W0od-EZdJ;S*(`{-_e#*Ig& z8v-t093q2efpi2E5u>m|dp>1uzC;LxkQER)TE}RhbEd|raFKTVi)am-*Z&4ltri4< zk>gh?C5?vRAQrKWW0yo>&epm`8oQ`6=ap|XkQQug7>^_Ykf+AxY&3{*tejTM)B;7~ zvbXEe-I-uplG)iKEX>bv`m||Y7P&GKO=BdQp|t`m0>=_Ip^EofS3|Z1g zuCGPd5+GtQfX;jaB?ZEMlGlFnIT}rwmo%D3>F?YpsA#_R>OrcN2lTf~Bi#pu5Kyff zkKrUzY;TQ_mPe6gOad79hg1WPG!h8kltoLY>WKENF_f#;jF+tE$82p3IeWg&`R8i< ztKa`BAbI9Y#`Dh`sg^2plrqbH%1;!8CH%wuzxb*&jwJQ;}1bU;HxHZ``EUi;Yft zFfal*vm%VlqFRIJUaYaQe2n2RV-g<2woE?x{eSZd9M@%jzJU~yeNUhG(^sPp?{L&T zhVLC@^kK|XwK1cQ4%0qykQ4JqnEQ?W+`c3D+s&MxZO7R15dZ%F{#zD*^O#9==H`5a zFifX~&e%8^3L}tjwGL9P!Rqx1djpF~b(R~~_Rv~$>HX0(CJK{*Dh=as0oy%9rFMrx zLBD&KI68z@f}r|EEDMs!4jOGNqEDSXO1pj+AthfuWARaMhW_p?uq?_Hy4`|GqM_~2c|{G3m}r%0mDrlxDKywW5Zj=?IY)vH2C&CJ@h z{?(vj6NVX4q^Q?@V{xYn(o_&stN4K+O%k-$y!N9E$FZ^f78QTSygaQT2s{>-D)_#Q zQsq>`Crq<45mP>qv53y|1V5O;k|5^hY%CFz#2MizqvGex%}SDq#GBem8k-eKt!m6A zp1sguWdUXz50PnRfmH?4$N%NgCmso!ohPRW_CZ4(5Q0ijK?8I1Gdxamq;#oNJi6VS z(ZEM*m|s3YuWMFjt8GrKPUis4#tce9cl$nacPFR2Eg1AdR+bx7n=L9eg>>q?_QQ`z zO37sG@W1`u5k4J)G*|-*001BWNkl zGu0afmUQ^*%b(HkcPYve;hv<(@8blvi3dVR>UHBrw!JxKXKT#a0Y@mf*Jm44>zZo4 zq|ADBw?~hkjg(N78Qr}JGpjeEtG!;1)ESgbEKl*l`+Z!?2tQu=W`|bGBbsE!>aR?( zZ5!>{32v}X7OTv*12%6Yj3y_rZI83heHo`3FdQ1GhUgD+ z5atT2*Cy2KE|m(r`0{ZU<{^th&OKLWG=9Kve2CZI{Ci3;@jyy*2Li$Ny19`oN{Pk- z&-#e7rxH$|Hyo@NUJ&$qAM@rL16Hr6{NVdrrf%F^H$EV)G#>jwaD<|GfL4mu>@20+ zN4>F+i|^e+P!I$y`aOwKig(`Z8ySierXpWiZkhZ-3WiZ&)D-z$lK2o>3reM_)Mlv$ z`-vyJ#(T07RPeoklP70+?xh3l?R?6@+z1eay7cW1=*`dtvhVC|!l?#|HE4ob7Qbky*&yoA7sP+C)#B{P@a8(gi{ZH9vstre9( zA}w>oN0Xc=E|~2!@dG1KRa*1Y*ZMsB%py^=4_U2990vj)f{L-iFAHIM4HD)$zIi*T zF&AmI4l+OQQRE4owvVV(aw@)A2T7bk8B(b#Jm1FiHEB{lUc&9!g9rhq&Q#676Cn_e z=OLt|-t-A79+S}Km@{>8)PgX~@qCz_J&4f8Gizb)Fj81ZIfERJG+towsDT!^O@6s2 z(50kOcS!S;N^lt4Hec2nqzk*-BkHZMAa&-^A1SuGB~lj%Q7}7Sr&5z#`5h@#(tYHWD+ys{ljkKmpB|WwM|ZDeYom`P1$i2C{gRO_ zH$N&Eja(*CpQV*WL~Fi4O2@b^pz(u%(V$?i6Y$b2i@fypB}S7R*K^q28S(lXhO^jg z%u<#GqTX~^T+R^E@Cm;4o#P+`fA+`M`O`nV#P;TZcH80Iw}%YIHBO$HWjq!P2e8+h z7=vc5HCk!TU1%^G!ZXi4K@!zzH*Ho7p^a^7`eQ6xl&`w_=_- zlM#qr8jZue@Jf{;dcgYiTY#k5b{X~)*MZwj{}y`KK3LZbhJ# zO|KtgNyWtvO0HZUK|VI|0HyIfAIXF=&*;o~EG!&H+IRS6SCc1q2`3Jgv{5R@3z|6g zL89RZp|rvejslv^%@NPN)Si-hq1nudCk77C+Qf6M1%Vq=_3s#WU)S{!!0L@5f+-6` z2)f-nlxfP&R^MP}C0uynAR2=&R=k)}mCU^HlijP$wnu+2VfkbQ#{peDNpE-)p$p=u zpwX@o1cKqfn6mZz7VU;&&`%I^vo5o3kIsCRG|m_gQ>1f?X47zP+8qN0B#Frv+MUA` zdBRRNMOqdjsJIkmNwp>jDjxM(iE9_r2dl{wMYARFd`+{h@m-j0``A+pPwD#wNJ*9& zd48#@K#4{h<)wrq(NwDzf|A27G@BAfO2X_IVl>obNkTZzN#dNrPEItg;Bo2F_hb;wzUO|>+Xj{Y3CC!Ft4c%@8dX{7~gwCAcKYoyK=9$B+Z~P2Z zwvpH&gPzebd7jVm$yq-5V2caSH?XCoD01F;yUX^@2+L~Y`yOcuc`oVqBV@hl(Cu1A z@S_Al1-u|&YeQj?bM9G>Kl;!hFX@a+`ktA$eKSX!!XE{t~TH0`r4SY=VmE{X7SWf!uTQaSRsYRw&BYA8Yv)8`Uu-` z5fX0P_!y1iJHNk(5R&=M0i&|oxPz_x=qUkC2uZE}G=AkNin3te{`>#()hIqhdH+5K zW^QBccldBLgFtfP3p4ok2A=Pu_Z{Z=Qyz{zL$7xiDemx(|JXw=Emi4{r&$Vujr9T2 zY9oYXcY6R-nacy?_ze_5%}dE-Mp2f?3$GZ8jFf_vQ*+psCJk*?*A%&I(cc{)U4dOa zK$bwI3VzKZ+Ozq?KRCtA=GyqGDveK;>uLr&IddyEMJ_0mkt9Z8iRV8_rvuUCK0@#3 z^83GJeKSYcmY`Y}R89AsmE{80HLtEnGaN_a2ZBxqP$ngmn6zICZF&%{QIml#a!)LHWyeg6>O{oa?& zgPJxkJkO&NRIntBM)z^-{nQ#Rjh1ilM6EQtI}Z_J28vIq)t}&dfApJ-M7$acy|jwk>pN%<2Ua&-IBzMVt$ywI8AGQLP=|#2nlWf$}5X zc-_boq-{Bmvv92yt`lQ93Of)qtCFGs&pnFg!DmA_dIIi#g!!@%2+w)@YZV)LI_@Y(WA^^ZT8B5ar8Nb&52 z63`S%^TtnN7Uu(ITY?}^IF3cNViEXN!d}R}X8jwl-o105o1fn0tH1pPo_qFFD;T~AEAM7y?WxY z3=ITIgC86K@e%#e2x&PqTZgGNJ@!3y{F|@-{omf?)Y%69(IXr@1oK~k+82*k*3! zk`gGBbyR$V!CrzNG)&j`(OS?bX6IpRRkN|)C(LFkN`)l^meWAx1G;++D%C2M6nOqo z6OoFtoW=yhJ9t#Z3M@9(CV-&P7MwiSX0FphYt3llG8uh_Jh|MMj!O`@LBQILkMXBA zd28zvq-Cs*M&pdhL{JGV#uJ}@Kcnhr%&cA;UG4Xbr+TgG(wX-_z}~h?w>u#%n&f%T z@|@u0X^Td~Bo=@9{T+PIo7PNdPMxmf*pOukp(-pc3+Coeu(@@IJUh%Y&q1C(Fh8y+ zSU%Zd&on;%X`vHDZ=cWkk<6CqWZ633Dvw{;4F&>o+M?*%#n61qb zX?mAx6*_YdSzNJ6^C>TFebX^93xo7Wv7)yZ5l&Kslw7(rrakL%{=y-W@H5JCgK7=t z7koswug(0*K^1|S4ApKsG+HjLw#(+KKnhb1XbrQilzKG>4ND6S0yKL)MSq|XqK-RV zMH)yVpJ$(MBBd~H&(l5AZZ?t9=G3`4#5cbF6?S(cf|^Zl&?AlllK3c&{RI;Zgy8&z zCZ2bYDEXAt^@#q!#j+e4t;2{x?-r*{&jK3Psz0t9YBgxI4uO#P{t=`F-EB>~)j?W< zW_^U`gWTO2;&?5#)(w?pk}EvNqv{Bay-{XN{w7!AEC6On97lb zTe7r#g4cig3$)g>mln8maWL%w`SkV#p07|^5QTwp`qml>W%T_*7-IkvXh4XWsnT?g zg=H7Vw%AxJnQUnsCwtU3HuHuS7b+|*1Qgj_&}PE$#`-OoY8$~^bbirPdLWqDSc|WA zcP7j)7%0$j1V!vqpa@5B<;sY&=bz^Mc~AuiZeeN7aPkCy`X^VBLMo~?muf?y3VVvx zYl1+~Z0)Bt_cXgZ5GEg!hdz1Y;0Fg$8XVh3>e2+&G`4YF!54j?q4{Jaa9ubWm;reG zUX?OaSe8X83{kpYkmQx zrcIi_cgTwb-xs)U$vE@K3q{Mh&82q=c6USKEXT4OdfOBJ^&g+2$Ua9~u(Vh~+KwVG zG>y7Oh@2>Ph+;vKBsf8V5Rzw~YjOQr#H-&qNwumF4YT1Uqw-OIsi4&usY_we3v)Iwe5}3(=fC z$c-z;(#o=JY{xcc&Avm$Z*cB>10e*@y*SI>?oG5-Xg$wf-(_iK9+AbjkWw%jxkPbH z6r1tffq#g4;~-KB&OKYF)t+IeyUo^aA1Nf36#UM4fmBK`*OpZ4E=B60N=1%CyJg^n zYU3a+*Ra8+_m5>6km}RH06E)^7>{9nbwUyeilSt0`72zx434khIv{1Tpj6F-xvTvOyBCr`qA?>yxB3;Wr)4*%z0en?T2EOg9Wy|&$@ zGw0*D9&&s0S7hlJztW*73tZRZowtn>)epY^cT@73j}VHb6$9K>Ds^7}Q5V0Wkz3mZ zd8XLjy^bR-q_l7<3Z*pdsyQd5usD6Dj@Dy?scR?;h0-9eT-!E1G$}cGrp?MpAKR-@ zq%$Prn*iL{vRGK0Ax+F;t5yz~137SzfBqNeNTLY~OH~|48b6e{q}n>b>NT5p-`U|0 zzV|!K%>w#3j$^FgYONDw8SyHWe)EXL9n5C<<#&zJ?=Z`QP8o2@XZKOIvf6tgw z+Afr-#mwefbagyQ9vdh$0>RADqujp>`wzjxd&Z&V&{6o$|KTo0S<-ADB~RdkcmC1D z1FbZB-5B5Uk?oKQ(A#sE?Hpjg3zsk7=GvtZ?M978!$y=)t-#WPG%Av^ED@!J<-%}W zBh$vs^QS-lgz-p`76q#}22`GPNu4p`#h~3L5oa_fmwA%+4z_AXOOmqW|OHK5KjrCVh5$ z4p(mY)43GJyNA)lB8nZnicO{FkR+NZ>M}JE5DW&f8MTEWML%;oMYQH-h$2O`YLuh^ zMPaeHr+#^d5#j;$<`J~G$J*N9F$>PNC2=CT zb^~Ny3VOREEX%^R4FtAu@(YwD%y*2nSr{I`_vXnlhW(BsdE=+M1eIB2y|Rn%7Hsbr zMMP&V01dwXfDhgo6HmU#U;X%Fq=1DvNnR*+H%FAE#+D1%yV{C{lwK^-Od@M(^y8|oBH7wg^e%_(cfg2xa8s-H9S z{yWiC^W_r9F%-kHfLiSdy4{;ZagNrS&U_6^95TZ^ZhTH&9^}*+khWdYY`HjILHTQy zBDM`n%TIFS`fZffRBMXeEl9=>SUGu+THT~VvQ~AFLX$)i$I-ZUiCu9Y9RVz_n88MH z8>R1a_SyX$a^UZ`Asl>)jN=@QLvJr8s6ex>@m-fRgED`BEWZzle^|-5t@YD=byRwmp*g0qg4pqk$oOXL-rmYM-U~Gwg1M6nW1GAjW-{ z`K4Q&IV&0Uj6KDm8?m_~7*D{p1nW2Yq^08JZ_Y8A!0b}M+KsjuW>RZq*tVgRubhTj z+YG_8ZPR;sl%Y#$nB-eK8;nMp_4Sw{Po|`$T|_-VBc)yf=MZoGH%EJR9+ z8<$7MwLoi4)gI$pnwneC>zlaPYQvka!`h|4HviLU7-^R8qT8-{w zI>vBthj9BatE-<(p+SSFeEr+Up_uZvyVKX}yAHyV?DcD?QsFvg7Q^a|PmM9RG;M=d zzkPyA9Yks9CPksJq+s9X`ftD5ZrAu^{5hXSnq$Wu@*>Ceo@CHZaICv5{KhdZyja0K z1g<^9AqPhNlJPiW=B=N0ui8$4kb>D+uq+e2wK8({(a`WRgNj6}FH)}=;4+UMV*4{D zo3*Wy`2`=Wgfh2qT?UDdV9A4GynQn-7FJXeryInMp1?;1><2tnj~0SGalaK(z_pGTStxDM8c1M z5Hsk*g9QHJZ(uk%Zth^xcc@l!;)!I?h11XYpbsFO27mOupW)iZou@?b-1G1kfBp$` zbBa;~)Aj)12p6;|_XoQn(y|D{fNHIQBMcL8<#fQMi@zdhI_z|z(Mrr6%r9w_j8R&1 zYPmq`oV-}Xw)V5R5o0NXC)$32B_&E3Q?k*-`88`C1eLm`(rAD)Z>SQM2`r#_{*@N; zkvERgl&a*$+8(l2_YszbBo6E2p71_#(a|$nyb(Qh3%ZZ@=C(rLgTF zf{H*|ia3sl;;l zF+o79lTxeukMpOOzhOKOJl{eFJ|vMspEm~DB;a0I7TB5)(3&|`TiXEJH_5Bz`XL{QpErAji-}%mQI&%-uTCuwgG6*VIw#8sPhvyfp zZe|R+6CT+WC}leSQVL%E&X-tR1g(s*NS+LlgRx@{2qDUnW@A zlo>5dm;Uj-gK zKnf|SRa|4dr(J|DjYQ7@rah>lFkc2x>LIRYCT-r0_8BZKoTR7%k}$)zVx-7W1*CC~ z=UMoH#bhLS_YH`mk~n< z&2p-)iz`9vnBC1Wo;Mv=Y&%mpsNkiS7s<+kot+W&z-Mh^gzPMql**ho04J9V(yU+- z)~Ho2`XkTOhh>bA(A_dhvUlDx3r|#P9@VM`8fvYBBxREmi;IAu**?Vb$wOF{L$#sl z?v5YHu*?J*r4W7q<8eZ3p{m%OP1Y03mtz?Ga^BlII0t zcRQvv>k=msc_EpEiZFzqZ#^VUA2K%wr_b)EUiU%6`|pgA(&qVB+6JIg(>dRP`z53W zqx_CZE-Gd=(|aG>!}rbJ@SGMeygY@)N<&khdF_YWSL3n8snbn_kZ5I6TPXy#tC_?{ z8He`~WsFjatdz{pKS?~kYs$qNS29D?Qx?rymzBkg?#__*T*UVJgvsDz#(lW*{+NsJ z4hSbUz6YmHTg=T`$WklXErILqGc*C8!7Zh1hVf9*Kw)y(?obION+NFXhvKjVn|2o1Hf;{$EUj^T9O;0-GjxMAy zPNyrU#Z+!FZBn2)wNkROTs&sS*tTa5)v24;#(IH}rXwQj^#D&+aJ&MqdW2RJW=hRN zt!cD8Y)4XQno7?1eS{QPGUvvX9u?n0233hJOR{_n`Uo1>-Vywh)5mC8@a1Lr&zJ5P za<_2!^FLc9D+SV$M)zLiC3!JIqY2}CWEl)cioe}>NRq%Ww(g^eh~kLv|LF}R@bWj> zNNF3TDS##G2vy>F2Ob4yg6a%fL$AAm<29*Pj`QNz4WXgHm^!a4)sekjm(BG7N|jjl z6AX6m5RE2C{RETIXVj~0EGIBC;H5M?-igDRb8|fRtcB3ZXxW#Snp6VF3dt+q@VWHv z-(l-5EVaesM(q_NHXqGWN&!UFakf8u|7^}xYHct`i~+07IlmK-_Ir`=L0 zrI?wS;p3af_=kbZmpez8`|5rQWf=3<{@)J~p6erpqy3v~)zP9LOTcBw^oJHzt6!1AdF2vO2mPWa&u zDr{{`uvCcr#&yLbPF#KDD^RE;<9`i2E8hEf5OtYzDT7~ zMS!4I^UM$zHI8y@*JWu1-hD4L>tHfTsZ}ZnMLKkQ1*mUvYkkuP~RgcC`T8W)hhT zMxj5QYp#q_o3IV0u(HxZNWrNyRpytDP;VVEp$f?JSt{NMe6Kz=+c13w*L7K69T=Od z`9+Ur%R$JDyfhlF`Q;;|`ETNt;CisO)dlHOt)Jlf2l-T1Vh}D7M>$0~K~JsH*H-V6 zrVs@1WCITQaOT_`D=R0seht=d^r_a(5XfiFFPMYHu^L$N2s>LJQ>$0$^&V0yK*$-2 z>=t1d(r$l+l@+M@t*K3*#oF2snM5!ir6`rKzB=If7wY73NTX3@GQ5Qpg1MH(VE8%J ziiFZ*YrWuif6w#^gwjxyiYu3Q$cuusm|=FY%KL9^638w)>k~$MdsxMFb~j>F?y#^t zJ)x1vy>86f>cBAN(WJ>|Y_6u9JClL1&;r&stJrRhg{3DE;sKM;oDDzu(GYq4+8&l= zF*WI7uFnoE7ytkWRY^oaRAY1Ul+AeL((8_}<*)0f5=cYi9kaV5Q5wYQ({p%!71yiq zy+1t7voFSs#|3E3*=J{wP7~=gm|Hr|czmCQQz^q9Y-~)>2;_yAJ(k8W+YSh(6A=E# z3rD$Ez}l4u)Y~}-m!i0h>uQc4KhEOmhg`gtPKResQ`{ghwm!$}$N5$NQ}PTti%_e% zhC-;})LFsp+qV(G?|%0SOVT$7wy!PXe!1K8Len6=-H?Hp?P4CP+=^}B- zi^C*wfuYIM6vn( zv$MW2pOe#=J#FwyrOIhq2i@J6xz^!nX{UJf@jXaOv-_ZAb1efAB7}vMQnI|#;LMq) zNRrQK&OsJd7^P-vRJG<|*%tjxYsv&PAjI_>2CNsBWpUxTr^xb8@cn~C5jepTb=z~);1`1TP3@vpwS%wX^<`g?ksg_zD}7@7)ZG&0?;c3aY_!*l0- zR!(^+ZCWQHPX%*xPoYc2?)FWTHc=?g1%dznH+2S~ZKP)ye*EY6WSA(E$wX1KiV%ux zRAIcTF~XQ^aKkn%OUR{52}>y<__VY=l-}BNPd${LOIemBls)WWTS_oXiL)kkO{%&= z>va{OdL7kPCyJtKCt^IF{QcF#uev?X42Y42(f5Au_kQnd?4qTxxH5B*OF3vY4-mjR zxAO=onQA;9uYdfTFWGp|BIP*DEnG!u&7Du1&-|;)LQE4ZAEY7r3@k!P1(It-%SG&}=)b-pvvO z5kjVD)?w;LtIc&V%w4@P;Cpwoym=Gue-blOH2iX>rLf$yAdYdJg!!eAk3PK2*5(VQ z9;|iOI|m`ToJX-}8Kds>c>vn2F+mXG`R5P<{G7?VUHe_a&h`jDJ2&x96v71FVuCwb ztwXZu%jhI#dn>?8YtsICl)g-({tp_p5pTYo=keB%|6__Z!+yw2&L;{@(nF?jo?ExS z&aZ#@1yc5iH;l3QY{}+lKixpujwvimHfc11K@{P*E_?eiz5WvhL#R~JwAw?$eu!;3 ze0;BkB_-i#U=WH{3Z(>K(LFGeEMZy*d=D}yuxy`7DnlyeGCOMlg7@FwG54=jLa!Gx z9GYDXF_9A#a*BLTVS6#9if82+jcpS@y1N5WIGl8} z0#TmJkj+Xo#&IE)%3?X1D7LU2LCU>ItNjey9pJk#Qy4Q>5-e78#@%b>#wA9h7woli zCmKDGoM)1ONe~>;4-)b@XEH7_KW=$eqsSwa8Z%eE04mLcwGL>52@?&$!7*V!BxNgd z*-O0s2H0wi>eT|@S$&;%zB|LIZ+-J8cU!wJ_`Lp{DI_nR1H$Eu2PsFA%U&dtzJU80 zeDUWoujOFy+-1y|(a|*W!w*6R-ED*rL{Y?BHx~#aXw*UK7Zh@egS|dCu1D1TC}s@?rBFUk5WFH^9~4ofRpkR!TXhpQ_+YL9GcTYE@ZVCupBgLMrkEhrRiGHHn|&ytKL zh-8TI22f+NMdRS}a1Ay#45KB3z*J|?PvN=}rC>OG#b}_(=1%jdc8nHKuXR{lHVX5U zYa@|HPQnClfgl>i2;HNQ&*OUMIO~C*k*wWsld>J|{i?;v+dlU`*aU6<22V6uph3Av zG0ULarQbQ`N$n-^=zw%uGe7TRS(=aTwRrdLJeD*zU?=neX!?C)c`K!Z=Z0Wu5~Y}# z5mc|8p;&%{jYm&G7&A601X5|m?v_P)aYT|xY|DH%&l5P-faOKSAkKq+g=QLQnb=YT zwk2ZoVKni;()4;GdcEj>{6p+9jAqGX&oLO9bKN~b(2*=IWK2DY6UFNH=ZKRot!Dq^ zb&Fz2HfP~^rzan%>2+Q)S5hYb)fY(1N36cLK(p0A2q=|(inA`gzR_+AOVVurllsn6 z;?ZfYu1q7O#o~O^jEzbHDP*5gsY0(iBuNyRTugD+#q%usebdP$BM(;|v)9%qOjmU= zKs!rJjmP8l&(>ejX+}n?s!VcXv3P;r@EN@z;KucD;MmaFU8hhg(e9*iY(+MI26_Ay z%$KM6L#_qkhDxa^VMe`-3waJblT{ zZ_l#-0J}S|xzQ#JN2Dx=N<~nZJ8L}0oya)bZr8fRQHau-jfZWjSAA~W3JJp_ z@`WRouNm?c+s00(>2@JMb4arho5^<+hiI+2d288d@@$8VPZbbSuZ>u!rYOxXnQEmq z3rmM|+Lzg`eTI~h{{Xisvj0I!+>HPL01jnXNoGw=04e|g00;m8000000Mb*F00000 LNkvXXu0mjfP4u7T literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.ostrum_vapor.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.ostrum_vapor.png.mcmeta new file mode 100644 index 000000000..744a3d54c --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.ostrum_vapor.png.mcmeta @@ -0,0 +1,87 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 39, + 38, + 37, + 36, + 35, + 34, + 33, + 32, + 31, + 30, + 29, + 28, + 27, + 26, + 25, + 24, + 23, + 22, + 21, + 20, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.regolith_vapor.png b/kubejs/assets/gtceu/textures/block/fluids/fluid.regolith_vapor.png new file mode 100644 index 0000000000000000000000000000000000000000..915dedcc40ff08763d9317f69f1100f73d31dd05 GIT binary patch literal 15957 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 literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/block/fluids/fluid.residual_radioactive_concoction.png.mcmeta b/kubejs/assets/gtceu/textures/block/fluids/fluid.residual_radioactive_concoction.png.mcmeta new file mode 100644 index 000000000..6439dab8e --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/fluids/fluid.residual_radioactive_concoction.png.mcmeta @@ -0,0 +1,67 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 29, + 28, + 27, + 26, + 25, + 24, + 23, + 22, + 21, + 20, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore.png b/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..19fa4c874ea918554159c7047577082e440e5cbd GIT binary patch literal 5934 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 literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_overlay.png b/kubejs/assets/gtceu/textures/item/material_sets/dull/dusty_raw_ore_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..d516c7ec4f87eed757567b5f0890ca0b281a6df8 GIT binary patch literal 3119 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 BjKlx{ literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake.png new file mode 100644 index 0000000000000000000000000000000000000000..cda7194b0e8e069ea24fcf5d0a63f4ea3942f1a5 GIT binary patch literal 548 zcmV+<0^9wGP)ljygtwzuDm`o-BJfBar)&O6CD2gbG zg3ION=mGo=hX71xGql#6&u1qiO;Z+&1wVkJZJU3GLxd1iuNT$pMHEF$r_)wVS(XSP z_^~EsSw@m1tk-L**UPa`N|EO|`~BWA%CgLXb!}l?*G`vG3V`{14nPnD01mjWYr-)6 z{zA*?&xief@0yfSNGV;;%Ddg~?(P^g!!}sA|7K)80QhOT-b7YP5d;BMRdG6BSUo}r-tRYgo};y<-|IQh=KKSMVTdv23lPV#qYJRx?fyH;%jFU&B>TF0000C literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake.png.mcmeta new file mode 100644 index 000000000..f96626000 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":1 + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake_active.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_vacuum_engine_intake_active.png new file mode 100644 index 0000000000000000000000000000000000000000..8072b8fb4fe52a0ad53fd40c918ffbc745127478 GIT binary patch literal 1083 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 QDgzbQp00i_>zopr08#2_ApigX literal 0 HcmV?d00001 diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index 2e7b72e49..60a4f168d 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -1154,7 +1154,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { 'ae2:logic_processor', 'ae2:engineering_processor', 'ae2:calculation_processor', - '#gtceu:circuits/iv', + '#gtceu:circuits/ev', '6x #forge:plates/stainless_steel') .inputFluids(Fluid.of('tfg:fluix', 144*5)) .itemOutputs('ae2:crafting_unit') @@ -1167,7 +1167,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { 'ae2:logic_processor', 'ae2:engineering_processor', 'ae2:calculation_processor', - '#gtceu:circuits/iv', + '#gtceu:circuits/ev', '6x #forge:plates/stainless_steel') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*5)) .itemOutputs('2x ae2:crafting_unit') @@ -1255,57 +1255,57 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { event.recipes.gtceu.assembler('ae2:interface_mv') .itemInputs( 'gtceu:mv_conveyor_module', - '8x #forge:plates/glass', + '2x #tfc:workbenches', '4x #forge:plates/aluminium', '4x ae2:annihilation_core', '4x ae2:formation_core') .inputFluids(Fluid.of('tfg:fluix', 144)) .itemOutputs('ae2:interface') - .duration(200) + .duration(20*20) .EUt(GTValues.VA[GTValues.MV]) .cleanroom(CleanroomType.CLEANROOM) - // HV Moon Only - event.recipes.gtceu.assembler('ae2:interface_hv_moon') + // MV Moon Only + event.recipes.gtceu.assembler('ae2:interface_mv_moon') .itemInputs( - 'gtceu:hv_conveyor_module', - '8x #forge:plates/glass', - '4x #forge:plates/stainless_steel', + 'gtceu:mv_conveyor_module', + '2x #tfc:workbenches', + '4x #forge:plates/aluminium', '4x ae2:annihilation_core', '4x ae2:formation_core') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144)) .itemOutputs('4x ae2:interface') - .duration(200) - .EUt(GTValues.VA[GTValues.HV]) + .duration(20*10) + .EUt(GTValues.VA[GTValues.MV]) .dimension('ad_astra:moon') - // EV - event.recipes.gtceu.assembler('ae2:interface_ev') + // IV + event.recipes.gtceu.assembler('ae2:interface_iv') .itemInputs( - 'gtceu:ev_conveyor_module', - '8x #forge:plates/glass', - '4x #forge:plates/titanium', + 'gtceu:iv_conveyor_module', + '2x #tfc:workbenches', + '4x #forge:plates/tungsten_steel', '16x ae2:annihilation_core', '16x ae2:formation_core') - .inputFluids(Fluid.of('tfg:fluix', 1152)) - .itemOutputs('8x ae2:interface') - .duration(200) - .EUt(GTValues.VA[GTValues.EV]) + .inputFluids(Fluid.of('tfg:fluix', 144*8)) + .itemOutputs('16x ae2:interface') + .duration(20*20) + .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) - // LuV - event.recipes.gtceu.assembler('ae2:interface_luv') + // IV Moon Only + event.recipes.gtceu.assembler('ae2:interface_iv_moon') .itemInputs( - 'gtceu:luv_conveyor_module', - '8x #forge:plates/glass', - '4x #forge:plates/rhodium_plated_palladium', - '32x ae2:annihilation_core', - '32x ae2:formation_core') - .inputFluids(Fluid.of('tfg:fluix', 4608)) + 'gtceu:iv_conveyor_module', + '2x #tfc:workbenches', + '4x #forge:plates/tungsten_steel', + '16x ae2:annihilation_core', + '16x ae2:formation_core') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) .itemOutputs('32x ae2:interface') - .duration(200) - .EUt(GTValues.VA[GTValues.LuV]) - .cleanroom(CleanroomType.CLEANROOM) + .duration(20*10) + .EUt(GTValues.VA[GTValues.IV]) + .dimension('ad_astra:moon') //#endregion @@ -1322,51 +1322,51 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '4x ae2:formation_core') .inputFluids(Fluid.of('tfg:fluix', 144)) .itemOutputs('ae2:pattern_provider') - .duration(800) + .duration(20*20) .EUt(GTValues.VA[GTValues.MV]) .cleanroom(CleanroomType.CLEANROOM) - // HV Moon Only + // MV Moon Only event.recipes.gtceu.assembler('ae2:pattern_provider_hv_moon') .itemInputs( - 'gtceu:hv_robot_arm', + 'gtceu:mv_robot_arm', '2x #tfc:workbenches', - '4x #forge:plates/stainless_steel', + '4x #forge:plates/aluminium', '4x ae2:annihilation_core', '4x ae2:formation_core') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144)) .itemOutputs('4x ae2:pattern_provider') - .duration(200) - .EUt(GTValues.VA[GTValues.HV]) + .duration(20*10) + .EUt(GTValues.VA[GTValues.MV]) .dimension('ad_astra:moon') - // EV + // IV event.recipes.gtceu.assembler('ae2:pattern_provider_ev') .itemInputs( - 'gtceu:ev_robot_arm', + 'gtceu:iv_robot_arm', '2x #tfc:workbenches', - '4x #forge:plates/titanium', + '4x #forge:plates/tungsten_steel', '16x ae2:annihilation_core', '16x ae2:formation_core') - .inputFluids(Fluid.of('tfg:fluix', 1152)) - .itemOutputs('8x ae2:pattern_provider') - .duration(800) - .EUt(GTValues.VA[GTValues.EV]) + .inputFluids(Fluid.of('tfg:fluix', 144*8)) + .itemOutputs('16x ae2:pattern_provider') + .duration(20*20) + .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) - // LuV + // IV Moon Only event.recipes.gtceu.assembler('ae2:pattern_provider_luv') .itemInputs( - 'gtceu:luv_robot_arm', + 'gtceu:iv_robot_arm', '2x #tfc:workbenches', - '4x #forge:plates/rhodium_plated_palladium', - '32x ae2:annihilation_core', - '32x ae2:formation_core') - .inputFluids(Fluid.of('tfg:fluix', 4608)) + '4x #forge:plates/tungsten_steel', + '16x ae2:annihilation_core', + '16x ae2:formation_core') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) .itemOutputs('32x ae2:pattern_provider') - .duration(800) - .EUt(GTValues.VA[GTValues.LuV]) - .cleanroom(CleanroomType.CLEANROOM) + .duration(20*10) + .EUt(GTValues.VA[GTValues.IV]) + .dimension('ad_astra:moon') //#endregion @@ -2152,24 +2152,38 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '8x ae2:engineering_processor', '14x gtceu:iv_sensor', 'ae2:logic_processor') - .inputFluids(Fluid.of('gtceu:titanium', 1440)) + .inputFluids(Fluid.of('tfg:fluix', 144*200)) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*150)) .itemOutputs('ae2:quantum_ring') .duration(900) - .EUt(8300) + .EUt(GTValues.VA[GTValues.ZPM]) .cleanroom(CleanroomType.CLEANROOM) // Quantum Link Chamber event.recipes.gtceu.assembly_line('ae2:quantum_link') .itemInputs( '8x ae2:fluix_pearl', - '6x ae2:quartz_vibrant_glass', - '8x ae2:engineering_processor', - '14x gtceu:iv_sensor', - '2x gtceu:hv_lithium_battery') - .inputFluids(Fluid.of('gtceu:titanium', 1088)) + 'gtceu:fusion_glass', + '32x megacells:accumulation_processor', + '32x megacells:accumulation_processor', + '32x ae2:engineering_processor', + '32x ae2:engineering_processor', + '32x ae2:logic_processor', + '32x ae2:logic_processor', + '32x ae2:calculation_processor', + '32x ae2:calculation_processor', + 'gtceu:ruthenium_trinium_americium_neutronate_hex_wire', + '32x gtceu:uv_sensor', + '32x gtceu:uv_emitter', + '8x gtceu:uv_field_generator', + 'gtceu:max_battery') + .inputFluids(Fluid.of('tfg:fluix', 144*2000)) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*1500)) + .stationResearch(b => b.researchStack(Item.of('minecraft:glass')).EUt(GTValues.VA[GTValues.UV]).CWUt(256)) + .dimension('ad_astra:moon') .itemOutputs('ae2:quantum_link') .duration(700) - .EUt(8300) + .EUt(GTValues.VA[GTValues.UHV]) .cleanroom(CleanroomType.CLEANROOM) // Chemical Reactor diff --git a/kubejs/server_scripts/extended_ae2/recipes.js b/kubejs/server_scripts/extended_ae2/recipes.js index 2b7119994..6c6842bac 100644 --- a/kubejs/server_scripts/extended_ae2/recipes.js +++ b/kubejs/server_scripts/extended_ae2/recipes.js @@ -14,58 +14,79 @@ const registerExtendedAE2Recipes = (event) => { //#region Ext Interface - // IV + // IV - event.recipes.gtceu.assembler('expatternprovider:ex_interface_iv') + event.recipes.gtceu.assembler('tfg:ex_interface_iv') .itemInputs( 'gtceu:iv_conveyor_module', '8x gtceu:laminated_glass', - '4x gtceu:tungsten_steel_plate', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor', + '2x megacells:accumulation_processor', '2x #ae2:interface') .inputFluids(Fluid.of('tfg:fluix', 144*8)) .itemOutputs('expatternprovider:ex_interface') .duration(300) .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(1) - // LuV Moon Only + // IV Moon Only - event.recipes.gtceu.assembler('expatternprovider:ex_interface_luv_moon') + event.recipes.gtceu.assembler('tfg:ex_interface_iv_moon') .itemInputs( - 'gtceu:luv_conveyor_module', + 'gtceu:iv_conveyor_module', '8x gtceu:laminated_glass', - '4x #forge:plates/rhodium_plated_palladium', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor', + '2x megacells:accumulation_processor', '2x #ae2:interface') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) .itemOutputs('2x expatternprovider:ex_interface') .duration(300) - .EUt(GTValues.VA[GTValues.LuV]) + .EUt(GTValues.VA[GTValues.IV]) .dimension('ad_astra:moon') + .circuit(1) // ZPM - event.recipes.gtceu.assembler('expatternprovider:ex_interface_zpm') + event.recipes.gtceu.assembler('tfg:ex_interface_zpm') .itemInputs( 'gtceu:zpm_conveyor_module', '8x gtceu:laminated_glass', '4x #forge:plates/naquadah_alloy', - '32x ae2:annihilation_core', - '32x ae2:formation_core', - 'megacells:accumulation_processor', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', '16x #ae2:interface') - .inputFluids(Fluid.of('tfg:fluix', 144*16)) - .itemOutputs('8x expatternprovider:ex_interface') + .inputFluids(Fluid.of('tfg:fluix', 144*32)) + .itemOutputs('16x expatternprovider:ex_interface') .duration(300) .EUt(GTValues.VA[GTValues.ZPM]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(1) - // Extended Interface Upgrade + // ZPM Moon Only + + event.recipes.gtceu.assembler('tfg:ex_interface_zpm_moon') + .itemInputs( + 'gtceu:zpm_conveyor_module', + '8x gtceu:laminated_glass', + '4x #forge:plates/naquadah_alloy', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', + '16x #ae2:interface') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*32)) + .itemOutputs('32x expatternprovider:ex_interface') + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .dimension('ad_astra:moon') + .circuit(1) + + // Interface Upgrade // IV @@ -73,34 +94,34 @@ const registerExtendedAE2Recipes = (event) => { .itemInputs( 'gtceu:iv_conveyor_module', '8x gtceu:laminated_glass', - '4x gtceu:tungsten_steel_plate', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor', - '#ae2:interface') + '2x megacells:accumulation_processor', + '1x #ae2:interface') .inputFluids(Fluid.of('tfg:fluix', 144*8)) .itemOutputs('expatternprovider:interface_upgrade') .duration(300) - .circuit(4) .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(2) - // LuV Moon Only + // IV Moon Only - event.recipes.gtceu.assembler('expatternprovider:interface_upgrade_luv_moon') + event.recipes.gtceu.assembler('expatternprovider:interface_upgrade_iv_moon') .itemInputs( - 'gtceu:luv_conveyor_module', + 'gtceu:iv_conveyor_module', '8x gtceu:laminated_glass', - '4x #forge:plates/rhodium_plated_palladium', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor') + '2x megacells:accumulation_processor') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) .itemOutputs('2x expatternprovider:interface_upgrade') .duration(300) - .circuit(4) - .EUt(GTValues.VA[GTValues.LuV]) + .EUt(GTValues.VA[GTValues.IV]) .dimension('ad_astra:moon') + .circuit(2) // ZPM @@ -109,16 +130,33 @@ const registerExtendedAE2Recipes = (event) => { 'gtceu:zpm_conveyor_module', '8x gtceu:laminated_glass', '4x #forge:plates/naquadah_alloy', - '32x ae2:annihilation_core', - '32x ae2:formation_core', - 'megacells:accumulation_processor', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', '8x #ae2:interface') - .inputFluids(Fluid.of('tfg:fluix', 144*16)) - .itemOutputs('8x expatternprovider:interface_upgrade') + .inputFluids(Fluid.of('tfg:fluix', 144*32)) + .itemOutputs('16x expatternprovider:interface_upgrade') .duration(300) - .circuit(4) .EUt(GTValues.VA[GTValues.ZPM]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(2) + + // ZPM Moon Only + + event.recipes.gtceu.assembler('expatternprovider:interface_upgrade_zpm_moon') + .itemInputs( + 'gtceu:zpm_conveyor_module', + '8x gtceu:laminated_glass', + '4x #forge:plates/naquadah_alloy', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*32)) + .itemOutputs('32x expatternprovider:interface_upgrade') + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .dimension('ad_astra:moon') + .circuit(2) //#endregion @@ -126,106 +164,143 @@ const registerExtendedAE2Recipes = (event) => { // IV - event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_luv') + event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_iv') .itemInputs( '4x #expatternprovider:extended_interface', '4x megacells:accumulation_processor', 'gtceu:iv_robot_arm', 'gtceu:iv_fluid_regulator', '4x #forge:dense_plates/tungsten_steel', - '#gtceu:circuits/iv') + '#gtceu:circuits/luv') .inputFluids(Fluid.of('tfg:fluix', 144*9)) .itemOutputs("expatternprovider:oversize_interface") .duration(300) .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) - // LuV + // IV Moon - event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_zpm') + event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_iv_moon') .itemInputs( '4x #expatternprovider:extended_interface', '4x megacells:accumulation_processor', - 'gtceu:luv_robot_arm', - 'gtceu:luv_fluid_regulator', - '4x #forge:dense_plates/rhodium_plated_palladium', + 'gtceu:iv_robot_arm', + 'gtceu:iv_fluid_regulator', + '4x #forge:dense_plates/tungsten_steel', '#gtceu:circuits/luv') - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*4)) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*9)) .itemOutputs("4x expatternprovider:oversize_interface") .duration(300) - .EUt(GTValues.VA[GTValues.LuV]) + .EUt(GTValues.VA[GTValues.IV]) .dimension('ad_astra:moon') // ZPM - event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_uv') + event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_zpm') .itemInputs( '8x #expatternprovider:extended_interface', '4x megacells:accumulation_processor', 'gtceu:zpm_robot_arm', 'gtceu:zpm_fluid_regulator', '4x #forge:dense_plates/naquadah_alloy', - '#gtceu:circuits/zpm') + '#gtceu:circuits/uv') .inputFluids(Fluid.of('tfg:fluix', 144*18)) .itemOutputs("8x expatternprovider:oversize_interface") .duration(300) .EUt(GTValues.VA[GTValues.ZPM]) .cleanroom(CleanroomType.CLEANROOM) + // ZPM Moon + + event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_zpm_moon') + .itemInputs( + '8x #expatternprovider:extended_interface', + '4x megacells:accumulation_processor', + 'gtceu:zpm_robot_arm', + 'gtceu:zpm_fluid_regulator', + '4x #forge:dense_plates/naquadah_alloy', + '#gtceu:circuits/uv') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*18)) + .itemOutputs("16x expatternprovider:oversize_interface") + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .dimension('ad_astra:moon') + //#endregion //#region Ext Pattern Provider // IV - event.recipes.gtceu.assembler('expatternprovider:ex_pattern_provider_iv') + event.recipes.gtceu.assembler('tfg:ex_pattern_provider_iv') .itemInputs( 'gtceu:iv_robot_arm', '8x gtceu:laminated_glass', - '4x gtceu:tungsten_steel_plate', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor', + '2x megacells:accumulation_processor', '2x #ae2:pattern_provider') .inputFluids(Fluid.of('tfg:fluix', 144*8)) .itemOutputs('expatternprovider:ex_pattern_provider') .duration(300) .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(1) - // LuV Moon Only + // IV Moon Only - event.recipes.gtceu.assembler('expatternprovider:ex_pattern_provider_moon') + event.recipes.gtceu.assembler('tfg:ex_pattern_provider_iv_moon') .itemInputs( - 'gtceu:luv_robot_arm', + 'gtceu:iv_robot_arm', '8x gtceu:laminated_glass', - '4x #forge:plates/rhodium_plated_palladium', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor', + '2x megacells:accumulation_processor', '2x #ae2:pattern_provider') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) .itemOutputs('2x expatternprovider:ex_pattern_provider') .duration(300) - .EUt(GTValues.VA[GTValues.LuV]) + .EUt(GTValues.VA[GTValues.IV]) .dimension('ad_astra:moon') + .circuit(1) // ZPM - event.recipes.gtceu.assembler('expatternprovider:ex_pattern_provider_zpm') + event.recipes.gtceu.assembler('tfg:ex_pattern_provider_zpm') .itemInputs( 'gtceu:zpm_robot_arm', '8x gtceu:laminated_glass', '4x #forge:plates/naquadah_alloy', - '32x ae2:annihilation_core', - '32x ae2:formation_core', - 'megacells:accumulation_processor', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', '16x #ae2:pattern_provider') - .inputFluids(Fluid.of('tfg:fluix', 144*16)) - .itemOutputs('8x expatternprovider:ex_pattern_provider') + .inputFluids(Fluid.of('tfg:fluix', 144*32)) + .itemOutputs('16x expatternprovider:ex_pattern_provider') .duration(300) .EUt(GTValues.VA[GTValues.ZPM]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(1) + + // ZPM Moon Only + + event.recipes.gtceu.assembler('tfg:ex_pattern_provider_zpm_moon') + .itemInputs( + 'gtceu:zpm_robot_arm', + '8x gtceu:laminated_glass', + '4x #forge:plates/naquadah_alloy', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', + '16x #ae2:pattern_provider') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*32)) + .itemOutputs('32x expatternprovider:ex_pattern_provider') + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .dimension('ad_astra:moon') + .circuit(1) // Pattern Provider Upgrade @@ -235,34 +310,34 @@ const registerExtendedAE2Recipes = (event) => { .itemInputs( 'gtceu:iv_robot_arm', '8x gtceu:laminated_glass', - '4x gtceu:tungsten_steel_plate', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor', - '#ae2:pattern_provider') + '2x megacells:accumulation_processor', + '1x #ae2:pattern_provider') .inputFluids(Fluid.of('tfg:fluix', 144*8)) .itemOutputs('expatternprovider:pattern_provider_upgrade') .duration(300) - .circuit(4) .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(2) - // LuV Moon Only + // IV Moon Only - event.recipes.gtceu.assembler('expatternprovider:pattern_provider_upgrade_luv_moon') + event.recipes.gtceu.assembler('expatternprovider:pattern_provider_upgrade_iv_moon') .itemInputs( - 'gtceu:luv_robot_arm', + 'gtceu:iv_robot_arm', '8x gtceu:laminated_glass', - '4x #forge:plates/rhodium_plated_palladium', + '4x #forge:plates/tungsten_steel', '4x ae2:annihilation_core', '4x ae2:formation_core', - 'megacells:accumulation_processor') + '2x megacells:accumulation_processor') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) .itemOutputs('2x expatternprovider:pattern_provider_upgrade') .duration(300) - .circuit(4) - .EUt(GTValues.VA[GTValues.LuV]) + .EUt(GTValues.VA[GTValues.IV]) .dimension('ad_astra:moon') + .circuit(2) // ZPM @@ -271,16 +346,33 @@ const registerExtendedAE2Recipes = (event) => { 'gtceu:zpm_robot_arm', '8x gtceu:laminated_glass', '4x #forge:plates/naquadah_alloy', - '32x ae2:annihilation_core', - '32x ae2:formation_core', - 'megacells:accumulation_processor', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', '8x #ae2:pattern_provider') - .inputFluids(Fluid.of('tfg:fluix', 144*16)) - .itemOutputs('8x expatternprovider:pattern_provider_upgrade') + .inputFluids(Fluid.of('tfg:fluix', 144*32)) + .itemOutputs('16x expatternprovider:pattern_provider_upgrade') .duration(300) - .circuit(4) .EUt(GTValues.VA[GTValues.ZPM]) .cleanroom(CleanroomType.CLEANROOM) + .circuit(2) + + // ZPM Moon Only + + event.recipes.gtceu.assembler('expatternprovider:pattern_provider_upgrade_zpm_moon') + .itemInputs( + 'gtceu:zpm_robot_arm', + '8x gtceu:laminated_glass', + '4x #forge:plates/naquadah_alloy', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*32)) + .itemOutputs('32x expatternprovider:pattern_provider_upgrade') + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .dimension('ad_astra:moon') + .circuit(2) //#endregion diff --git a/kubejs/server_scripts/gregtech/data.js b/kubejs/server_scripts/gregtech/data.js index 115b7fada..db04fc032 100644 --- a/kubejs/server_scripts/gregtech/data.js +++ b/kubejs/server_scripts/gregtech/data.js @@ -124,7 +124,7 @@ const registerGTCEUMetals = (event) => { const registerGTCEUBedrockOreVeins = (event) => { - +/* // Tin, Magnesium event.add('tfg:moon_tin', vein => { vein.weight(75) @@ -155,7 +155,6 @@ const registerGTCEUBedrockOreVeins = (event) => { .material(GTMaterials.Chalcopyrite, 10) .material(GTMaterials.Zeolite, 4) .material(GTMaterials.Cassiterite, 3) - .material(GTMaterials.Realgar, 2) .dimensions('ad_astra:moon') }) @@ -191,6 +190,7 @@ const registerGTCEUBedrockOreVeins = (event) => { .material(GTMaterials.Pollucite, 1) .dimensions('ad_astra:moon') }) + */ } function registerGTCEUBedrockFluidVeins(event) { @@ -227,4 +227,152 @@ function registerGTCEUBedrockFluidVeins(event) { vein.depletionChance(1) vein.depletedYield(10) }) + + // Mars Fluid Vein - Credit to Monifactory + + const Registries = Java.loadClass("net.minecraft.core.registries.Registries") + const ResourceKey = Java.loadClass("net.minecraft.resources.ResourceKey") + const martianOasisResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/martian_oasis") + const martianAmberHillsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/amber_hills") + const martianAmberPlainsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/amber_plains") + const martianMountainsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/martian_mountains") + const martianRusticusHillsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/rusticus_hills") + const martianRusticusPlainsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/rusticus_plains") + const martianSangnumHillsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/sangnum_hills") + const martianSangnumPlainsResourceKey = ResourceKey.create(Registries.BIOME, "tfg:mars/sangnum_plains") + + event.add('tfg:semiheavy_ammoniacal_water', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:semiheavy_ammoniacal_water').fluid) + vein.weight(100) + vein.minimumYield(200) + vein.maximumYield(400) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(15) + }) + + event.add('tfg:liquid_carbon_dioxide', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('gtceu:liquid_carbon_dioxide').fluid) + vein.weight(15) + vein.minimumYield(20) + vein.maximumYield(350) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + // Heavy Ammonical Water in Specific Biome Credit to Monifactory from https://github.com/ThePansmith/Monifactory/blob/main/kubejs/server_scripts/worldgen/fluidVeins.js + + event.add('tfg:heavy_ammoniacal_water_oasis', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(350, martianOasisResourceKey) + vein.weight(0) + vein.minimumYield(300) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(20) + }) + + event.add('tfg:heavy_ammoniacal_water_amber_hills', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianAmberHillsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + event.add('tfg:heavy_ammoniacal_water_amber_plains', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianAmberPlainsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + event.add('tfg:heavy_ammoniacal_water_mountains', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianMountainsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + event.add('tfg:heavy_ammoniacal_water_rusticus_hills', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianRusticusHillsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + event.add('tfg:heavy_ammoniacal_water_rusticus_plains', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianRusticusPlainsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + event.add('tfg:heavy_ammoniacal_water_sangnum_hills', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianSangnumHillsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + event.add('tfg:heavy_ammoniacal_water_sangnum_plains', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('tfg:heavy_ammoniacal_water').fluid) + vein.biomes(20, martianSangnumPlainsResourceKey) + vein.weight(0) + vein.minimumYield(100) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(5) + }) + + // Ammonia + + event.add('tfg:ammonia_mars_oasis', vein => { + vein.dimensions('ad_astra:mars') + vein.fluid(() => Fluid.of('gtceu:ammonia').fluid) + vein.biomes(400, martianOasisResourceKey) + vein.weight(0) + vein.minimumYield(300) + vein.maximumYield(650) + vein.depletionAmount(1) + vein.depletionChance(20) + vein.depletedYield(20) + }) + } \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 4d7fc9cf0..03055afe0 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1362,7 +1362,7 @@ const registerGTCEURecipes = (event) => { 'ADA', 'BCB' ], { - A: '#gtceu:circuits/iv', + A: '#gtceu:circuits/ev', B: 'gtceu:ev_electric_motor', C: 'gtceu:aluminium_single_cable', D: 'gtceu:ev_centrifuge', @@ -1399,4 +1399,32 @@ const registerGTCEURecipes = (event) => { event.replaceOutput({ id: 'gtceu:cutter/treated_button' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button') event.replaceOutput({ id: 'gtceu:cutter/treated_button_water' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button') event.replaceOutput({ id: 'gtceu:cutter/treated_button_distilled_water' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button') + + //#region Replace Recipe + + event.remove({ id : 'gtceu:assembly_line/me_pattern_buffer_proxy'}) + event.recipes.gtceu.assembly_line('tfg:me_pattern_buffer_proxy') + .itemInputs( + 'gtceu:luv_machine_hull', + '2x gtceu:luv_sensor', + '#gtceu:circuits/luv', + 'gtceu:fusion_glass', + '2x ae2:quantum_ring', + '32x gtceu:fine_europium_wire', + '32x gtceu:fine_europium_wire', + '16x megacells:accumulation_processor') + .inputFluids(Fluid.of('gtceu:lubricant', 500)) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*4)) + .stationResearch(b => b.researchStack(Item.of('gtceu:me_pattern_buffer')).EUt(GTValues.VA[GTValues.LuV]).CWUt(32)) + .itemOutputs('gtceu:me_pattern_buffer_proxy') + .duration(30*20) + .EUt(GTValues.VA[GTValues.ZPM]) + + event.replaceInput({ id: 'gtceu:assembly_line/me_pattern_buffer' }, 'ae2:pattern_provider', '3x expatternprovider:ex_pattern_provider') + event.replaceInput({ id: 'gtceu:assembly_line/me_pattern_buffer' }, 'ae2:interface', '3x expatternprovider:oversize_interface') + + event.replaceInput({ id: 'gtceu:shaped/large_combustion_engine' }, '#gtceu:circuits/iv', '#gtceu:circuits/ev') + event.replaceInput({ id: 'gtceu:shaped/nano_chestplate_advanced' }, '#gtceu:circuits/iv', '#gtceu:circuits/ev') + event.replaceInput({ id: 'gtceu:assembler/ev_large_miner' }, '#gtceu:circuits/iv', '#gtceu:circuits/ev') + } diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 4103eed3f..0131d3b0e 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -690,38 +690,6 @@ function registerGTCEuMachineRecipes(event) { ["scannerResearch(java.util.function.UnaryOperator)"](b => b.researchStack(Item.of('gtceu:computer_monitor_cover')).EUt(GTValues.VA[GTValues.IV]).duration(120 * 20)) - event.remove({ id: 'gtceu:assembly_line/me_pattern_buffer' }) - event.recipes.gtceu.assembly_line('me_pattern_buffer') - .itemInputs('gtceu:luv_dual_input_hatch', - 'gtceu:luv_emitter', - '4x #gtceu:circuits/luv', - '3x ae2:pattern_provider', - '3x ae2:interface', - '4x ae2:speed_card', - '2x ae2:capacity_card', - '64x #forge:fine_wires/europium', - '32x #forge:fine_wires/europium') - .inputFluids(Fluid.of('gtceu:soldering_alloy', 576), Fluid.of('gtceu:lubricant', 500)) - .itemOutputs('gtceu:me_pattern_buffer') - .duration(30 * 20) - .EUt(GTValues.VA[GTValues.LuV]) - ["scannerResearch(java.util.function.UnaryOperator)"](b => - b.researchStack(Item.of('gtceu:luv_dual_input_hatch')).EUt(GTValues.VA[GTValues.LuV]).duration(60 * 20)) - - event.remove({ id: 'gtceu:assembly_line/me_pattern_buffer_proxy' }) - event.recipes.gtceu.assembly_line('me_pattern_buffer_proxy') - .itemInputs('gtceu:luv_machine_hull', - '2x gtceu:luv_sensor', - '#gtceu:circuits/luv', - 'ae2:quantum_link', - '2x ae2:quantum_ring', - '64x #forge:fine_wires/europium') - .inputFluids(Fluid.of('gtceu:soldering_alloy', 576), Fluid.of('gtceu:lubricant', 500)) - .itemOutputs('gtceu:me_pattern_buffer_proxy') - .duration(30 * 20) - .EUt(GTValues.VA[GTValues.ZPM]) - .stationResearch(b => b.researchStack(Item.of('gtceu:me_pattern_buffer')).EUt(GTValues.VA[GTValues.LuV]).CWUt(32)) - event.remove({ id: 'gtceu:assembly_line/ultimate_battery' }) event.recipes.gtceu.assembly_line('ultimate_battery') .itemInputs('16x #forge:double_plates/darmstadtium', @@ -896,48 +864,7 @@ function registerGTCEuMachineRecipes(event) { event.replaceOutput({ id: 'gtceu:macerator/macerate_steam_input_hatch' }, 'gtceu:steel_dust', '6x gtceu:steel_dust') event.replaceOutput({ id: 'gtceu:arc_furnace/arc_steam_input_hatch' }, 'gtceu:steel_block', '6x gtceu:steel_ingot') - // #region Bedrock Miner - - event.recipes.gtceu.assembler('gtceu:mv_bedrock_miner') - .itemInputs('1x gtceu:hv_machine_hull', - '4x #forge:frames/steel', - '4x #gtceu:circuits/iv', - '4x gtceu:hv_electric_motor', - '4x gtceu:hv_robot_arm', - '4x gtceu:hv_conveyor_module', - '4x #forge:gears/blue_steel') - .itemOutputs('gtceu:mv_bedrock_ore_miner') - .duration(400) - .EUt(GTValues.VA[GTValues.HV]) - .circuit(2) - - event.recipes.gtceu.assembler('gtceu:hv_bedrock_miner') - .itemInputs('1x gtceu:ev_machine_hull', - '4x #forge:frames/titanium', - '4x #gtceu:circuits/luv', - '4x gtceu:luv_electric_motor', - '4x gtceu:luv_robot_arm', - '4x gtceu:luv_conveyor_module', - '4x #forge:gears/ruridit') - .itemOutputs('gtceu:hv_bedrock_ore_miner') - .duration(400) - .EUt(GTValues.VA[GTValues.IV]) - .circuit(2) - - event.recipes.gtceu.assembler('gtceu:ev_bedrock_miner') - .itemInputs('1x gtceu:iv_machine_hull', - '4x #forge:frames/tungsten_steel', - '4x #gtceu:circuits/zpm', - '4x gtceu:zpm_electric_motor', - '4x gtceu:zpm_robot_arm', - '4x gtceu:zpm_conveyor_module', - '4x #forge:gears/osmiridium') - .itemOutputs('gtceu:ev_bedrock_ore_miner') - .duration(400) - .EUt(GTValues.VA[GTValues.ZPM]) - .circuit(2) - - //#endregion + //#region Chipboard Composite event.recipes.gtceu.mixer('gtceu:chipboard_composite_wax') .itemInputs('2x #tfg:wood_dusts', @@ -1027,6 +954,30 @@ function registerGTCEuMachineRecipes(event) { .duration(2.5 * 20) .EUt(16) + event.recipes.gtceu.assembler('tfg:casings/machine_casing_stainless_evaporation') + .itemInputs('gtceu:clean_machine_casing', '4x gtceu:annealed_copper_double_wire') + .inputFluids(Fluid.of('gtceu:polyvinyl_chloride', 288)) + .itemOutputs('tfg:casings/machine_casing_stainless_evaporation') + .circuit(4) + .duration(2.5 * 20) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.assembler('tfg:casings/machine_casing_mars') + .itemInputs('gtceu:clean_machine_casing', '4x #forge:double_wires/kanthal') + .inputFluids(Fluid.of('gtceu:polybenzimidazole', 288)) + .itemOutputs('tfg:casings/machine_casing_mars') + .circuit(4) + .duration(2.5 * 20) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.assembler('gtceu:atomic_casing') + .itemInputs('4x #forge:dense_plates/lead', '2x #forge:plates/rtm_alloy', '#forge:frames/titanium') + .inputFluids(Fluid.of('gtceu:polyvinyl_butyral', 288)) + .itemOutputs('2x gtceu:atomic_casing') + .circuit(4) + .duration(2.5 * 20) + .EUt(GTValues.VA[GTValues.HV]) + //#endregion //#region Large Solar Panel @@ -1151,4 +1102,149 @@ function registerGTCEuMachineRecipes(event) { .EUt(-(GTValues.V[GTValues.LuV]), 2) .circuit(2) + //#endregion + + //#region Mars Ore Line + + // Multiblock + + /* LOCKED UNTIL VENUS + + event.shaped( + 'gtceu:extraterrestrial_ore_fabricator', + [ 'USU', + 'WZW', + 'PTP'], + { + S: 'tfg:casings/machine_casing_vacuum_engine_intake', + Z: 'gtceu:iv_machine_hull', + W: '#gtceu:circuits/iv', + U: '#forge:double_plates/stellite_100', + T: '#forge:single_cables/platinum', + P: 'gtceu:iv_electric_pump' + } + ).id('gtceu:shaped/extraterrestrial_ore_fabricator') + + */ + + event.recipes.gtceu.assembler('tfg:ostrum_harvester') + .itemInputs( + '1x gtceu:ev_machine_hull', + '4x #gtceu:circuits/ev', + '4x gtceu:ev_electric_motor', + '4x #forge:rotors/black_steel', + '4x gtceu:ev_electric_pump', + '4x #forge:gears/desh') + .itemOutputs('gtceu:ostrum_harvester') + .duration(400) + .EUt(GTValues.VA[GTValues.EV]) + .circuit(2) + + event.recipes.gtceu.assembler('tfg:moon_dust_harvester') + .itemInputs( + '1x gtceu:hv_machine_hull', + '4x #gtceu:circuits/hv', + '4x gtceu:hv_electric_motor', + '4x #forge:rotors/titanium', + '4x gtceu:hv_electric_pump', + '4x #forge:gears/rocket_alloy_t1') + .itemOutputs('gtceu:moon_dust_harvester') + .duration(400) + .EUt(GTValues.VA[GTValues.HV]) + .circuit(2) + + // Vacuum Intake + + event.shaped( + 'tfg:casings/machine_casing_vacuum_engine_intake', + [ 'USU', + 'WZW', + 'UTU'], + { + S: '#forge:tools/hammers', + T: '#forge:tools/wrenches', + W: '#forge:rotors/ultimet', + U: 'gtceu:ultimet_normal_item_pipe', + Z: 'gtceu:inert_machine_casing' + } + ).id('tfg:shaped/casing_machine_casing_vacuum_engine_intake') + + event.recipes.gtceu.assembler('tfg:casings/machine_casing_vacuum_engine_intake') + .itemInputs( + '2x #forge:rotors/ultimet', + '4x gtceu:ultimet_normal_item_pipe', + '1x gtceu:inert_machine_casing') + .itemOutputs('tfg:casings/machine_casing_vacuum_engine_intake') + .duration(50) + .EUt(GTValues.VH[GTValues.LV]) + .circuit(2) + + // Stainless Evaporation Tower - LOCKED UNTIL VENUS + + /* + + event.shaped( + 'gtceu:evaporation_tower', + [ 'TUT', + 'WZW', + 'TUT'], + { + T: '#gtceu:circuits/ev', + W: 'gtceu:hv_electric_pump', + U: '#forge:double_wires/kanthal', + Z: 'gtceu:hv_machine_hull' + } + ).id('tfg:shaped/evaporation_tower') + + */ + + //#endregion + + //#region Nuclear Controler - LOCKED UNTIL MARS + + /* + + event.shaped( + 'gtceu:fission_reactor', + [ 'TUT', + 'WZW', + 'TUT'], + { + T: 'gtceu:atomic_casing', + W: '#gtceu:circuits/ev', + U: 'gtceu:hv_field_generator', + Z: 'gtceu:ev_machine_hull' + } + ).id('tfg:shaped/fission_reactor') + + event.shaped( + 'gtceu:nuclear_fuel_factory', + [ 'TUT', + 'WZW', + 'TBT'], + { + T: 'gtceu:atomic_casing', + W: '#gtceu:circuits/ev', + U: 'gtceu:ev_emitter', + Z: 'gtceu:ev_machine_hull', + B: 'gtceu:ev_robot_arm' + } + ).id('tfg:shaped/nuclear_fuel_factory') + + event.shaped( + 'gtceu:heat_exchanger', + [ 'TUT', + 'WZW', + 'TBT'], + { + T: 'gtceu:high_temperature_smelting_casing', + W: '#gtceu:circuits/ev', + U: 'gtceu:ev_sensor', + Z: 'gtceu:ev_machine_hull', + B: 'gtceu:ev_fluid_regulator' + } + ).id('tfg:shaped/heat_exchanger') + + */ + } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.js b/kubejs/server_scripts/tfg/recipes.js index 855d8b072..17bde7c41 100644 --- a/kubejs/server_scripts/tfg/recipes.js +++ b/kubejs/server_scripts/tfg/recipes.js @@ -21,5 +21,7 @@ const registerTFGRecipes = (event) => { registerTFGStoneDustRecipes(event) registerTFGRecyclingRecipes(event) registerTFGNuclearRecipes(event) + registerTFGMarsRecipes(event) + registerTFGMoonOres(event) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.mars.js b/kubejs/server_scripts/tfg/recipes.mars.js new file mode 100644 index 000000000..1d1cbebd9 --- /dev/null +++ b/kubejs/server_scripts/tfg/recipes.mars.js @@ -0,0 +1,72 @@ + function registerTFGMarsRecipes(event) { + +const $ChanceLogic = Java.loadClass('com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic') + + // Ostrum Harvester + + event.recipes.gtceu.ostrum_harvester(`ostrum_harvesting`) + .perTick(true) + .inputFluids('gtceu:drilling_fluid 4') + .perTick(false) + .dimension('ad_astra:mars') + .itemOutputsRanged('gtceu:ostrum_dust',1,5) + .duration(20*5) + .EUt(GTValues.VA[GTValues.LV]); + + // Large Centrifuge Ostrum dust - SCRAP FROM MARS GOING TO VENUS + + /* + + event.recipes.gtceu.centrifuge(`ostrum_harvesting`) + .inputFluids('gtceu:bromine 100') + .itemInputs('#forge:dusts/ostrum') + .dimension('ad_astra:mars') + .chancedFluidOutputLogic($ChanceLogic.XOR) + .chancedFluidOutput('gtceu:lightweight_ostrum_vapor',6000,0) + .chancedFluidOutput('gtceu:ostrum_vapor',3000,0) + .chancedFluidOutput('gtceu:dense_ostrum_vapor',1000,0) + .duration(20*58) + .EUt(GTValues.VA[GTValues.EV], 4); + +event.recipes.gtceu.extraterrestrial_ore_fabricator('lightweight_ostrum') + .inputFluids('gtceu:lightweight_ostrum_vapor 1000') + .inputFluids(Fluid.of('gtceu:radon', 1000)) + .itemOutputsRanged('#forge:crushed_ores/tantalite',1,10) + .itemOutputsRanged('#forge:crushed_ores/bauxite',1,10) + //.itemOutputsRanged('#forge:crushed_ores/pyrope',1,10) + //.itemOutputsRanged('#forge:crushed_ores/rose_quartz',1,10) + .itemOutputsRanged('#forge:crushed_ores/thorium',1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_ruby_ore'),1,10) + .dimension('ad_astra:venus') + .duration(20*5) + .EUt(GTValues.VA[GTValues.IV]); + +event.recipes.gtceu.extraterrestrial_ore_fabricator('ostrum') + .inputFluids('gtceu:ostrum_vapor 1000') + .inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1000)) + .itemOutputsRanged(Item.of('gtceu:crushed_chromite_ore'),1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_malachite_ore'),1,10) + .itemOutputsRanged(Item.of('gtceu:crushed_quartzite_ore'),1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_gypsum_ore'),1,10) + .itemOutputsRanged(Item.of('gtceu:crushed_electrotine_ore'),1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_barite_ore'),1,10) + .dimension('ad_astra:venus') + .duration(20*5) + .EUt(GTValues.VA[GTValues.IV]); + +event.recipes.gtceu.extraterrestrial_ore_fabricator('dense_ostrum') + .inputFluids('gtceu:dense_ostrum_vapor 1000') + .inputFluids(Fluid.of('gtceu:tritiated_water', 500)) + .itemOutputsRanged('#forge:crushed_ores/uraninite',1,10) + .itemOutputsRanged(Item.of('gtceu:crushed_certus_quartz_ore'),1,10) + .itemOutputsRanged(Item.of('gtceu:crushed_beryllium_ore'),1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_bastnasite_ore'),1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_spessartine_ore'),1,10) + //.itemOutputsRanged(Item.of('gtceu:crushed_silver_ore'),1,10) + .dimension('ad_astra:venus') + .duration(20*5) + .EUt(GTValues.VA[GTValues.IV]); + + */ + + } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index d12eb97b4..21692b19b 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -825,7 +825,7 @@ function registerTFGMiscellaneousRecipes(event) { event.recipes.gtceu.assembler('sensor_iv') .itemInputs('gtceu:quantum_eye', '#forge:rods/iridium', '#gtceu:circuits/iv', '4x #forge:plates/tungsten_steel') - .itemOutputs('gtceu:ev_sensor') + .itemOutputs('gtceu:iv_sensor') .duration(100) .EUt(30) diff --git a/kubejs/server_scripts/tfg/recipes.moon_ores.js b/kubejs/server_scripts/tfg/recipes.moon_ores.js new file mode 100644 index 000000000..a110ed7c6 --- /dev/null +++ b/kubejs/server_scripts/tfg/recipes.moon_ores.js @@ -0,0 +1,131 @@ +// priority: 0 + +function registerTFGMoonOres(event) { + +//#region Moon Harvester + + event.recipes.gtceu.moon_dust_harvester('tfg:lunar_assurine_harvester') + .biome('tfg:moon/lunar_asurine_dense') + .itemOutputsRanged('#forge:dusts/certus_regolith',1,5) + .duration(20*80) + .EUt(GTValues.VA[GTValues.LV]) + .circuit(1) + + event.recipes.gtceu.moon_dust_harvester('tfg:lunar_chorus_dense') + .biome('tfg:moon/lunar_chorus_dense') + .itemOutputsRanged('#forge:dusts/goethe_regolith',1,5) + .duration(20*80) + .EUt(GTValues.VA[GTValues.LV]) + .circuit(2) + + event.recipes.gtceu.moon_dust_harvester('tfg:lunar_corals_dense') + .biome('tfg:moon/lunar_corals_dense') + .itemOutputsRanged('#forge:dusts/bright_regolith',1,5) + .duration(20*80) + .EUt(GTValues.VA[GTValues.LV]) + .circuit(3) + + event.recipes.gtceu.moon_dust_harvester('tfg:lunar_lights_dense') + .biome('tfg:moon/lunar_lights_dense') + .itemOutputsRanged('#forge:dusts/cassiterite_regolith',1,5) + .duration(20*80) + .EUt(GTValues.VA[GTValues.LV]) + .circuit(4) + + //#endregion + + //#region Regolith Vapor Processing + + event.recipes.gtceu.mixer('tfg:regolith_slurry_suspension') + .itemInputs('ad_astra:moon_sand', 'tfg:dry_ice') + .itemOutputs('#forge:dusts/regolith_mush') + .dimension('ad_astra:moon') + .duration(20*60) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.chemical_bath('tfg:regolith_vapor') + .itemInputs('#forge:dusts/regolith_mush') + .inputFluids('gtceu:nitrogen 1000') + .itemOutputs('#forge:dusts/silicon_dioxide') + .outputFluids('gtceu:regolith_vapor 1000') + .dimension('ad_astra:moon') + .duration(20*28) + .EUt(GTValues.VHA[GTValues.LV]) + + //#endregion + + //#region Making Dusty Ores + +const $ChanceLogic = Java.loadClass('com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic') + + event.recipes.gtceu.chemical_reactor('tfg:dusty_certus_reactor') + .itemInputs('#forge:dusts/certus_regolith') + .inputFluids('gtceu:regolith_vapor 100') + .itemOutputs('gtceu:dusty_raw_certus_quartz') + .dimension('ad_astra:moon') + .duration(20*68) + .EUt(GTValues.VHA[GTValues.ULV]) + + event.recipes.gtceu.chemical_reactor('tfg:dusty_goethite_reactor') + .itemInputs('#forge:dusts/goethe_regolith') + .inputFluids('gtceu:regolith_vapor 100') + .itemOutputs('gtceu:dusty_raw_goethite') + .dimension('ad_astra:moon') + .duration(20*68) + .EUt(GTValues.VHA[GTValues.ULV]) + + event.recipes.gtceu.chemical_reactor('tfg:dusty_shiny_reactor') + .itemInputs('#forge:dusts/bright_regolith') + .inputFluids('gtceu:regolith_vapor 100') + .chancedItemOutputLogic($ChanceLogic.XOR) + .chancedOutput('gtceu:dusty_raw_diamond',2000,0) + .chancedOutput('gtceu:dusty_raw_gold',8000,0) + .dimension('ad_astra:moon') + .duration(20*68) + .EUt(GTValues.VHA[GTValues.ULV]) + + event.recipes.gtceu.chemical_reactor('tfg:dusty_cassiterite_reactor') + .itemInputs('#forge:dusts/cassiterite_regolith') + .inputFluids('gtceu:regolith_vapor 100') + .itemOutputs('gtceu:dusty_raw_cassiterite') + .dimension('ad_astra:moon') + .duration(20*68) + .EUt(GTValues.VHA[GTValues.ULV]) + + //#endregion + + //#region Dusty to Dust through centrifuge + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_certus_quartz') + .itemInputs('gtceu:dusty_raw_certus_quartz') + .itemOutputs('ae2:certus_quartz_dust') + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_goethite') + .itemInputs('gtceu:dusty_raw_goethite') + .chancedItemOutputLogic($ChanceLogic.XOR) + .chancedOutput('gtceu:iron_dust',5000,0) + .chancedOutput('gtceu:copper_dust',5000,0) + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_diamond') + .itemInputs('gtceu:dusty_raw_diamond') + .itemOutputs('gtceu:diamond_dust') + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_gold') + .itemInputs('gtceu:dusty_raw_gold') + .itemOutputs('gtceu:gold_dust') + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.centrifuge('tfg:dusty_to_dust_tin') + .itemInputs('gtceu:dusty_raw_cassiterite') + .itemOutputs('gtceu:tin_dust') + .duration(20*45) + .EUt(GTValues.VA[GTValues.MV]) + +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.nuclear.js b/kubejs/server_scripts/tfg/recipes.nuclear.js index 9d4aa903d..376743188 100644 --- a/kubejs/server_scripts/tfg/recipes.nuclear.js +++ b/kubejs/server_scripts/tfg/recipes.nuclear.js @@ -47,13 +47,20 @@ function registerTFGNuclearRecipes(event) { //#region Mars Water - event.recipes.gtceu.electrolyzer('mars_water') - .inputFluids(Fluid.of('tfg:semiheavy_ammoniacal_water', 1000)) + event.recipes.gtceu.centrifuge('mars_heavy_water') + .inputFluids(Fluid.of('tfg:heavy_ammoniacal_water', 1000)) .outputFluids(Fluid.of('gtceu:heavy_water', 500)) .itemOutputs('#forge:dusts/ammonium_chloride', '2x #forge:small_dusts/ammonium_chloride') .duration(20*9) .EUt(GTValues.VA[GTValues.LV]) + event.recipes.gtceu.centrifuge('mars_semiheavy_water') + .inputFluids(Fluid.of('tfg:semiheavy_ammoniacal_water', 1000)) + .outputFluids(Fluid.of('minecraft:water', 500)) + .itemOutputs('2x #forge:tiny_dusts/ammonium_chloride') + .duration(20*9) + .EUt(GTValues.VA[GTValues.MV]) + // Martian Sludge event.recipes.gtceu.chemical_bath('dirty_hexafluorosilicic_acid') @@ -77,7 +84,7 @@ function registerTFGNuclearRecipes(event) { .inputFluids(Fluid.of('gtceu:martian_sludge', 1000)) .inputFluids(Fluid.of('gtceu:formamide', 1000)) .inputFluids(Fluid.of('gtceu:radioactive_waste', 1000)) - .outputFluids(Fluid.of('gtceu:radon', 100)) + .outputFluids(Fluid.of('gtceu:radon', 1000)) .itemOutputs('#forge:dusts/nuclear_residue') .duration(20*30) .EUt(GTValues.VA[GTValues.EV]) @@ -85,7 +92,7 @@ function registerTFGNuclearRecipes(event) { event.recipes.gtceu.vacuum_freezer('oxidized_nuclear_residue') .itemInputs('#forge:dusts/nuclear_residue') .inputFluids(Fluid.of('gtceu:dioxygen_difluoride', 1000)) - .outputFluids(Fluid.of('minecraft:water', 10)) + .outputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1000)) .itemOutputs('#forge:dusts/oxidized_nuclear_residue') .duration(20*5) .EUt(GTValues.VA[GTValues.IV]) @@ -201,19 +208,27 @@ function registerTFGNuclearRecipes(event) { event.recipes.gtceu.gas_turbine('dense_steam') .inputFluids(Fluid.of('gtceu:dense_steam', 1)) - .EUt(-(32*4)) + .EUt(-(32)) .duration(20*2) //#endregion - //#region FLiBe Line + //#region FLiBe Line - SCRAP FROM MARS TO VENUS - event.recipes.gtceu.evaporation_tower('raw_rich_brine') + /* + + event.recipes.gtceu.evaporation_tower('raw_rich_brine_earth') .inputFluids(Fluid.of('tfc:spring_water', 20000)) .outputFluids(Fluid.of('gtceu:raw_rich_brine', 1000)) .duration(20*50) .EUt(GTValues.VA[GTValues.EV]) + event.recipes.gtceu.evaporation_tower('raw_rich_brine_mars') + .inputFluids(Fluid.of('tfg:heavy_ammoniacal_water', 20000)) + .outputFluids(Fluid.of('gtceu:raw_rich_brine', 1000)) + .duration(20*50) + .EUt(GTValues.VA[GTValues.EV]) + event.recipes.gtceu.chemical_reactor('hydrogen_iodide_to_hot_iodine_brine') .inputFluids(Fluid.of('gtceu:hydrogen_iodide', 1000)) .inputFluids(Fluid.of('gtceu:raw_rich_brine', 1000)) @@ -283,9 +298,13 @@ function registerTFGNuclearRecipes(event) { .duration(20*36) .EUt(GTValues.VA[GTValues.IV]) + */ + //#endregion - //#region Bromine Line + //#region Bromine Line - SCRAP FROM MARS TO VENUS + + /* event.recipes.gtceu.evaporation_tower('evaporation_brine') .inputFluids(Fluid.of('tfc:salt_water', 20000)) @@ -293,6 +312,12 @@ function registerTFGNuclearRecipes(event) { .duration(20*50) .EUt(GTValues.VA[GTValues.HV]) + event.recipes.gtceu.evaporation_tower('evaporation_brine_mars') + .inputFluids(Fluid.of('tfg:semiheavy_ammoniacal_water', 20000)) + .outputFluids(Fluid.of('gtceu:raw_brine', 1000)) + .duration(20*50) + .EUt(GTValues.VA[GTValues.HV]) + event.recipes.gtceu.fluid_heater('heat_brine') .inputFluids(Fluid.of("gtceu:raw_brine", 1000)) .outputFluids(Fluid.of("gtceu:hot_brine", 1000)) @@ -398,4 +423,6 @@ function registerTFGNuclearRecipes(event) { .duration(20*25) .EUt(GTValues.VA[GTValues.HV]) + */ + } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.space.js b/kubejs/server_scripts/tfg/recipes.space.js index 494d4dfd4..186d1ffb8 100644 --- a/kubejs/server_scripts/tfg/recipes.space.js +++ b/kubejs/server_scripts/tfg/recipes.space.js @@ -287,7 +287,7 @@ function registerTFGSpaceRecipes(event) { 'CHC', 'NEN' ], { - C: '#gtceu:circuits/iv', + C: '#gtceu:circuits/ev', S: 'gtceu:hv_sensor', E: 'gtceu:hv_emitter', H: 'gtceu:ev_machine_hull', diff --git a/kubejs/server_scripts/tfg/recipes.terrariums.js b/kubejs/server_scripts/tfg/recipes.terrariums.js index 68c5e64fe..2bc2b6a0e 100644 --- a/kubejs/server_scripts/tfg/recipes.terrariums.js +++ b/kubejs/server_scripts/tfg/recipes.terrariums.js @@ -150,14 +150,7 @@ function registerTFGTerrariumRecipes(event) { }).id('tfg:shaped/end_crystal') // chorus fruit - - event.recipes.gtceu.large_chemical_reactor('tfg:kovarex') - .itemInputs('40x gtceu:uranium_235_dust', '5x gtceu:uranium_dust') - .itemOutputs('41x gtceu:uranium_235_dust', '2x gtceu:uranium_dust') - .duration(600) - .EUt(GTValues.VA[GTValues.LuV]) - .circuit(2) - + // end stone diff --git a/kubejs/startup_scripts/ad_astra/materials.js b/kubejs/startup_scripts/ad_astra/materials.js index f9282a9fd..37ac4831b 100644 --- a/kubejs/startup_scripts/ad_astra/materials.js +++ b/kubejs/startup_scripts/ad_astra/materials.js @@ -41,7 +41,6 @@ const registerAdAstraMaterials = (event) => { .color(0xbd7980) .secondaryColor(0xA66C8D) .iconSet(GTMaterialIconSet.getByName('tfc_cassiterite')) - .dust() .ingot() .liquid() .blastTemp(2900, 'mid', GTValues.VA[GTValues.HV]) diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index fcc65cafb..161d0b996 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -183,7 +183,12 @@ global.GTCEU_DISABLED_ITEMS = [ 'gtceu:mossy_marble_cobblestone', 'gtceu:marble_bricks', 'gtceu:cracked_marble_bricks', - 'gtceu:mossy_marble_bricks' + 'gtceu:mossy_marble_bricks', + + // Machine Bedrock Miner + 'gtceu:mv_bedrock_ore_miner', + 'gtceu:hv_bedrock_ore_miner', + 'gtceu:ev_bedrock_ore_miner' ]; //#endregion diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 6ed68ad78..66cf74285 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -4,6 +4,7 @@ const registerGTCEuMachines = (event) => { const $SteamMulti = Java.loadClass('com.gregtechceu.gtceu.common.machine.multiblock.steam.SteamParallelMultiblockMachine'); const $Tags = Java.loadClass("dev.latvian.mods.kubejs.util.Tags") + const CoilWorkableElectricMultiblockMachine = Java.loadClass("com.gregtechceu.gtceu.api.machine.multiblock.CoilWorkableElectricMultiblockMachine") //#region Nether Dome @@ -561,4 +562,133 @@ const registerGTCEuMachines = (event) => { 'gtceu:block/casings/solid/machine_casing_stainless_evaporation', 'gtceu:block/multiblock/distillation_tower') -} + //#endregion + + //#region Ore Line + + // Ostrum Harvester + + event.create('ostrum_harvester', 'multiblock') + .machine((holder) => new CoilWorkableElectricMultiblockMachine(holder)) + .rotationState(RotationState.NON_Y_AXIS) + .recipeType('ostrum_harvester') + .recipeModifiers([GTRecipeModifiers.OC_NON_PERFECT, (machine, recipe) => GTRecipeModifiers.crackerOverclock(machine, recipe)]) + .appearanceBlock(() => Block.getBlock('gtceu:nonconducting_casing')) + .pattern(definition => FactoryBlockPattern.start() + .aisle(' ' ,'A A', 'AAAAA', 'ACCCA', 'AAEAA', ' AAA ') + .aisle(' ' ,' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') + .aisle(' ' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' G ' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' ' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' ' ,' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') + .aisle(' ' ,'A A', 'AAAAA', 'ACXCA', 'AACAA', ' AAA ') + .where('X', Predicates.controller(Predicates.blocks(definition.get()))) + .where('A', Predicates.blocks('gtceu:secure_maceration_casing')) + .where('B', Predicates.blocks('gtceu:nonconducting_casing')) + .where('C', Predicates.blocks('gtceu:nonconducting_casing') + .or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setMaxGlobalLimited(1).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.EXPORT_ITEMS).setMaxGlobalLimited(1).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMaxGlobalLimited(2).setPreviewCount(2)) + .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1).setPreviewCount(1))) + .where('D', Predicates.blocks('tfg:casings/machine_casing_vacuum_engine_intake')) + .where('E', Predicates.blocks('gtceu:nonconducting_casing') + .or(Predicates.abilities(PartAbility.MUFFLER).setExactLimit(1).setPreviewCount(1))) + .where('F', Predicates.heatingCoils()) + .where('G', Predicates.blocks('tfg:spice')) + .where('#', Predicates.air()) + .where(' ', Predicates.any()) + .build() + ) + .workableCasingModel( + 'gtceu:block/casings/gcym/nonconducting_casing', + 'gtceu:block/multiblock/distillation_tower') + + // Moon Harvester + + event.create('moon_dust_harvester', 'multiblock') + .machine((holder) => new CoilWorkableElectricMultiblockMachine(holder)) + .rotationState(RotationState.NON_Y_AXIS) + .recipeType('moon_dust_harvester') + .recipeModifiers([GTRecipeModifiers.OC_NON_PERFECT, (machine, recipe) => GTRecipeModifiers.crackerOverclock(machine, recipe)]) + .appearanceBlock(() => Block.getBlock('gtceu:nonconducting_casing')) + .pattern(definition => FactoryBlockPattern.start() + .aisle('A A', 'AAAAA', 'ACCCA', 'AAEAA', ' AAA ') + .aisle(' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') + .aisle(' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') + .aisle('A A', 'AAAAA', 'ACXCA', 'AACAA', ' AAA ') + .where('X', Predicates.controller(Predicates.blocks(definition.get()))) + .where('A', Predicates.blocks('tfg:casings/machine_casing_iron_desh')) + .where('B', Predicates.blocks('gtceu:nonconducting_casing')) + .where('C', Predicates.blocks('gtceu:nonconducting_casing') + .or(Predicates.abilities(PartAbility.IMPORT_ITEMS).setMaxGlobalLimited(1).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.EXPORT_ITEMS).setMaxGlobalLimited(1).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1).setPreviewCount(1))) + .where('D', Predicates.blocks('tfg:casings/machine_casing_vacuum_engine_intake')) + .where('E', Predicates.blocks('gtceu:nonconducting_casing')) + .where('F', Predicates.heatingCoils()) + .where('#', Predicates.air()) + .where(' ', Predicates.any()) + .build() + ) + .workableCasingModel( + 'gtceu:block/casings/gcym/nonconducting_casing', + 'gtceu:block/multiblock/distillation_tower') + + // Extraterrestrial Ore Fabricator + + event.create('extraterrestrial_ore_fabricator', 'multiblock') + .rotationState(RotationState.NON_Y_AXIS) + .recipeType('extraterrestrial_ore_fabricator') + .recipeModifiers([GTRecipeModifiers.PARALLEL_HATCH, GTRecipeModifiers.OC_NON_PERFECT]) + .appearanceBlock(() => Block.getBlock('tfg:casings/machine_casing_mars')) + .pattern(definition => FactoryBlockPattern.start() + .aisle('AAAAAAAAA', 'AAAAAAAAA', 'AAAAAAAAA', ' ', ' ' ) + .aisle('BAAAAAAAA', 'B#######D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' ) + .aisle('AAAAAAAAA', 'A#######D', 'BB###BBGA', ' C###C ', ' BBHBB ' ) + .aisle('BEBEBEAAA', 'BEBEBEA#D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' ) + .aisle('A#####AFA', 'A#####AXA', 'AAAAAAAFA', ' ', ' ' ) + .where('X', Predicates.controller(Predicates.blocks(definition.get()))) + .where('A', Predicates.blocks('tfg:casings/machine_casing_mars') + .or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2))) + .where('B', Predicates.blocks('gtceu:high_temperature_smelting_casing')) + .where('C', Predicates.blocks('tfg:casings/machine_casing_vacuum_engine_intake')) + .where('D', Predicates.blocks('gtceu:heat_vent')) + .where('E', Predicates.blocks('tfg:casings/machine_casing_mars') + .or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setMaxGlobalLimited(6))) + .where('F', Predicates.blocks('tfg:casings/machine_casing_mars') + .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1))) + .where('G', Predicates.abilities(PartAbility.MUFFLER).setExactLimit(1)) + .where('H', Predicates.abilities(PartAbility.EXPORT_ITEMS).setExactLimit(1)) + .where('#', Predicates.air()) + .where(' ', Predicates.any()) + .build() + ) + .shapeInfo(controller => MultiblockShapeInfo.builder() + .aisle('KKAAAAAAA', 'AAAAAAAAA', 'AAAAAAAAA', ' ', ' ' ) + .aisle('BAAAAAAAA', 'B D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' ) + .aisle('AAAAAAAAA', 'A D', 'BB BBGA', ' C C ', ' BBHBB ' ) + .aisle('BEBEBEAAA', 'BEBEBEA#D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' ) + .aisle('A AMA', 'A AXA', 'AAAAAAAAA', ' ', ' ' ) + .where('X', controller, Direction.SOUTH) + .where('A', Block.getBlock('tfg:casings/machine_casing_mars')) + .where('B', Block.getBlock('gtceu:high_temperature_smelting_casing')) + .where('C', Block.getBlock('tfg:casings/machine_casing_vacuum_engine_intake')) + .where('D', Block.getBlock('gtceu:heat_vent')) + .where('E', GTMachines.FLUID_IMPORT_HATCH[GTValues.EV], Direction.SOUTH) + .where('G', GTMachines.MUFFLER_HATCH[GTValues.LV], Direction.UP) + .where('H', GTMachines.ITEM_EXPORT_BUS[GTValues.EV], Direction.UP) + .where('M', GTMachines.AUTO_MAINTENANCE_HATCH, Direction.SOUTH) + .where('K', GTMachines.ENERGY_INPUT_HATCH[GTValues.HV], Direction.NORTH) + .where(' ', Block.getBlock('minecraft:air')) + .build() + ) + + .workableCasingModel( + 'tfg:block/casings/machine_casing_mars', + 'gtceu:block/machines/thermal_centrifuge') + +} \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index d066405f5..692a1384e 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -29,6 +29,7 @@ const registerGTCEuMaterialModification = (event) => { GENERATE_DOUBLE_INGOTS, HAS_SMALL_TFC_ORE, HAS_SMALL_NATIVE_TFC_ORE, + GENERATE_DUSTY_ORES, } = TFGMaterialFlags const { @@ -166,6 +167,15 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Tin.addFlags(GENERATE_DOUBLE_INGOTS); GTMaterials.Zinc.addFlags(GENERATE_DOUBLE_INGOTS, GENERATE_BOLT_SCREW); GTMaterials.SterlingSilver.addFlags(GENERATE_DOUBLE_INGOTS); + + // /* Generate Dusty Ores for Infinite Ores + + GTMaterials.Goethite.addFlags(GENERATE_DUSTY_ORES); + GTMaterials.Diamond.addFlags(GENERATE_DUSTY_ORES); + GTMaterials.CertusQuartz.addFlags(GENERATE_DUSTY_ORES); + GTMaterials.Gold.addFlags(GENERATE_DUSTY_ORES); + GTMaterials.Cassiterite.addFlags(GENERATE_DUSTY_ORES); + // // /* Имеют инструменты, броню TFC, двойные слитки */ GTMaterials.Copper.addFlags(GENERATE_DOUBLE_INGOTS, HAS_TFC_TOOL, HAS_TFC_ARMOR, HAS_TFC_UTILITY, CAN_BE_UNMOLDED); @@ -258,6 +268,9 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Silicon.addFlags(GENERATE_DENSE); + GTMaterials.RTMAlloy.addFlags(GENERATE_DENSE); + GTMaterials.Lead.addFlags(GENERATE_DENSE); + GTMaterials.Quartzite.addFlags(GENERATE_ROD); GTMaterials.TreatedWood.addFlags(GENERATE_LONG_ROD); diff --git a/kubejs/startup_scripts/gtceu/recipe_types.js b/kubejs/startup_scripts/gtceu/recipe_types.js index c34118ad5..94554dc48 100644 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ b/kubejs/startup_scripts/gtceu/recipe_types.js @@ -72,4 +72,28 @@ const registerGTCEuRecipeTypes = (event) => { .setProgressBar(GuiTextures.PROGRESS_BAR_DISTILLATION_TOWER, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.BATH) + event.create('ostrum_harvester') + .category('ostrum_harvester') + .setEUIO('in') + .setMaxIOSize(0, 1, 1, 0) + .setSlotOverlay(false, false, GuiTextures.EXTRACTOR_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.JET_ENGINE) + + event.create('moon_dust_harvester') + .category('moon_dust_harvester') + .setEUIO('in') + .setMaxIOSize(1, 1, 0, 0) + .setSlotOverlay(false, false, GuiTextures.DUST_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.JET_ENGINE) + + event.create('extraterrestrial_ore_fabricator') + .category('extraterrestrial_ore_fabricator') + .setEUIO('in') + .setMaxIOSize(0, 6, 2, 0) + .setSlotOverlay(false, false, GuiTextures.EXTRACTOR_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_EXTRACT, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.BATH) + } diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index c73d7b257..8da674a2a 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -32,6 +32,21 @@ const registerTFGBlocks = (event) => { .particleCount(2) .particleForced(false) + event.create('tfg:spice', 'tfg:particle_emitter') + .textureAll('tfg:block/sand_spice') + .soundType('sand') + .hardness(1) + .resistance(1) + .unbreakable() + .tagBlock('tfcambiental:hot_stuff') + .lightLevel(0.1) + .mapColor('color_white') + .particleOffset(0, 2, 0) + .particleVelocity(0.05, 0, 0.05) + .particle('electric_spark') + .particleCount(3) + .particleForced(false) + // #region Machine Casings global.TFG_MACHINE_CASINGS.forEach(type => { @@ -56,6 +71,16 @@ const registerTFGBlocks = (event) => { .tagBlock('minecraft:mineable/wrench') .mapColor('color_light_gray') + event.create('tfg:casings/machine_casing_vacuum_engine_intake', 'gtceu:active') + .simple('tfg:block/casings/machine_casing_vacuum_engine_intake') + .translationKey(`block.tfg.casings.machine_casing_vacuum_engine_intake`) + .soundType('metal') + .resistance(6).hardness(5) + .tagBlock('mineable/pickaxe') + .tagBlock('forge:mineable/wrench') + .requiresTool(true) + .mapColor('color_light_gray') + //#endregion // #region Decorative vases diff --git a/kubejs/startup_scripts/tfg/fluids.js b/kubejs/startup_scripts/tfg/fluids.js index d7e7599e6..a961968dc 100644 --- a/kubejs/startup_scripts/tfg/fluids.js +++ b/kubejs/startup_scripts/tfg/fluids.js @@ -32,6 +32,13 @@ const registerTFGFluids = (event) => { .noBlock() //#region Mars + + event.create('tfg:heavy_ammoniacal_water') + .thinTexture(0x08733f) + .bucketColor(0x08733f) + .temperature(236) + .noBlock() + //#endregion //#region Venus @@ -51,4 +58,5 @@ const registerTFGFluids = (event) => { .temperature(1000) .renderType('translucent') //#endregion + } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index 6049828a5..b314a0370 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -9,7 +9,6 @@ const registerTFGItems = (event) => { registerTFGDeprecatedItems(event) registerTFGFoodItems(event) - registerTFGNuclearItems(event) // #region Electronics event.create('tfg:unfinished_electron_tube', 'create:sequenced_assembly') @@ -389,4 +388,7 @@ const registerTFGItems = (event) => { event.create('tfg:photo_cell_t1') .translationKey("item.tfg.basic.photovoltaic.cell") .texture('tfg:item/photo_cell_t1') + + //#endregion + } diff --git a/kubejs/startup_scripts/tfg/items.nuclear.js b/kubejs/startup_scripts/tfg/items.nuclear.js deleted file mode 100644 index b7af34d20..000000000 --- a/kubejs/startup_scripts/tfg/items.nuclear.js +++ /dev/null @@ -1,6 +0,0 @@ -// priority: 0 - -function registerTFGNuclearItems(event) { - - -} \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index c4c2c0256..9f895bc1f 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -330,4 +330,70 @@ const registerTFGMaterials = (event) => { .gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(293)) .color(0x82a6ce) .formula('HI') + + //#endregion + + //# Mars Ore Line + + event.create('lightweight_ostrum_vapor') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(760)) + .formula('(?)') + + event.create('ostrum_vapor') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(815)) + .formula('(?)') + + event.create('dense_ostrum_vapor') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(930)) + .formula('(?)') + + event.create('residual_radioactive_concoction') + .liquid(new GTFluidBuilder().customStill().temperature(450)) + .formula('(?)') + + //#endregion + + // Moon Ore Line + + event.create('regolith_vapor') + .gas(new GTFluidBuilder().state(GTFluidState.GAS).customStill().temperature(727)) + + event.create('tfg:certus_regolith') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION) + .iconSet(GTMaterialIconSet.CERTUS) + .color('0xc1e6e4') + .secondaryColor('0x7a5225') + + event.create('tfg:goethe_regolith') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION) + .iconSet(GTMaterialIconSet.METALLIC) + .color('0xb0af5b') + .secondaryColor('0x7a5225') + + event.create('tfg:bright_regolith') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION) + .iconSet(GTMaterialIconSet.SHINY) + .color('0xf0efe9') + .secondaryColor('0xffffff') + + event.create('tfg:cassiterite_regolith') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION) + .iconSet(GTMaterialIconSet.METALLIC) + .color('0xbab6b7') + .secondaryColor('0x7a5225') + + // Reactant to Ore line + + event.create('tfg:regolith_mush') + .dust() + .flags(GTMaterialFlags.NO_UNIFICATION) + .iconSet(GTMaterialIconSet.WOOD) + .color('0xa2cde0') + .secondaryColor('0x7a5225') + + } diff --git a/kubejs/startup_scripts/tfg/materials.nuclear.js b/kubejs/startup_scripts/tfg/materials.nuclear.js index 3ca41eee1..2adc6678d 100644 --- a/kubejs/startup_scripts/tfg/materials.nuclear.js +++ b/kubejs/startup_scripts/tfg/materials.nuclear.js @@ -129,14 +129,6 @@ const registerTFGNuclearMaterials = (event) => { //#region Dust - event.create('tfg:mars_stone_dust') - .dust() - .components('2x deuterium', '1x oxygen') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0xE79B07) - .secondaryColor(0x5A4316) - .iconSet(GTMaterialIconSet.ROUGH) - event.create('tfg:nuclear_residue') .dust() .formula('(?)') From 55b56630ebf7a654428d4ea1a5b135337e6a448c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 12:49:53 +0100 Subject: [PATCH 113/158] changelist for tom, also removed all the redundant dusty_raw_ore item models and the old bedrock ore function --- CHANGELOG.md | 3 + .../material_sets/bright/dusty_raw_ore.json | 8 --- .../material_sets/certus/dusty_raw_ore.json | 8 --- .../material_sets/diamond/dusty_raw_ore.json | 8 --- .../material_sets/fine/dusty_raw_ore.json | 8 --- .../material_sets/metallic/dusty_raw_ore.json | 8 --- .../material_sets/quartz/dusty_raw_ore.json | 8 --- .../material_sets/ruby/dusty_raw_ore.json | 8 --- .../material_sets/shiny/dusty_raw_ore.json | 8 --- .../material_sets/tfc_gold/dusty_raw_ore.json | 8 --- .../tfc_realgar/dusty_raw_ore.json | 8 --- kubejs/server_scripts/gregtech/data.js | 71 ------------------- kubejs/server_scripts/main_server_script.js | 4 -- 13 files changed, 3 insertions(+), 155 deletions(-) delete mode 100644 kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json delete mode 100644 kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json delete mode 100644 kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json delete mode 100644 kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json delete mode 100644 kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json delete mode 100644 kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json delete mode 100644 kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json delete mode 100644 kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json delete mode 100644 kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json delete mode 100644 kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 227b659c8..2c857a41e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Complete rework of prospector's picks. (#1594) @Redeix - Removed the mod that was causing placed entities to sometimes not spawn - Removed energy P2P (#1661) @TomPlop @BlueBoat29 +- Removed GT bedrock miners, replaced with a new system for Moon infinites (#1569) @TomPlop ### Changes - Rebalance Large Solar Array to make Mk2 circuit 2 viable, and buffed to LSA Mk3 circuit 2 (#1591) @TomPlop - Added mechanical press recipes to weld weak steels @Pyritie @@ -21,6 +22,8 @@ - Added IV fridge, and IV-UV aqueous accumulator, food processor, food oven, and gas compressor machines @Pyritie - Added machine recipes for the wrought iron grill @Pyritie - Added recipes for redyeing/bleaching shipping containers (#1631) @Pyritie +- Adjusted recipes for ME Interface and Pattern Provider for consistency (#1569) @TomPlop +- Changed the cost of the ME Quantum Tunnel (#1569) @TomPlop ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop diff --git a/kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/bright/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/certus/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/diamond/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/fine/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/metallic/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/quartz/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/ruby/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/shiny/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/tfc_gold/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json b/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json deleted file mode 100644 index 686c28056..000000000 --- a/kubejs/assets/gtceu/models/item/material_sets/tfc_realgar/dusty_raw_ore.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gtceu:item/material_sets/dull/dusty_raw_ore", - "layer1": "gtceu:item/material_sets/dull/dusty_raw_ore_secondary", - "layer2": "gtceu:item/material_sets/dull/dusty_raw_ore_overlay" - } -} diff --git a/kubejs/server_scripts/gregtech/data.js b/kubejs/server_scripts/gregtech/data.js index db04fc032..1721efdff 100644 --- a/kubejs/server_scripts/gregtech/data.js +++ b/kubejs/server_scripts/gregtech/data.js @@ -122,77 +122,6 @@ const registerGTCEUMetals = (event) => { event.metal('gtceu:aluminium_silicate', 1540, 0.00857, '#forge:ingots/aluminium_silicate', null, null, 1, 'tfg:aluminium_silicate') } - -const registerGTCEUBedrockOreVeins = (event) => { -/* - // Tin, Magnesium - event.add('tfg:moon_tin', vein => { - vein.weight(75) - .size(2) - .yield(1, 4) - .material(GTMaterials.Cassiterite, 5) - .material(GTMaterials.Tin, 2) - .material(GTMaterials.Olivine, 1) - .dimensions('ad_astra:moon') - }) - - // Iron, Gold, Magnesium - event.add('tfg:moon_magnetite', vein => { - vein.weight(75) - .size(2) - .yield(1, 4) - .material(GTMaterials.Magnetite, 8) - .material(GTMaterials.Gold, 3) - .material(GTMaterials.Olivine, 1) - .dimensions('ad_astra:moon') - }) - - // Copper, Arsenic, Tin - event.add('tfg:moon_copper', vein => { - vein.weight(100) - .size(2) - .yield(1, 4) - .material(GTMaterials.Chalcopyrite, 10) - .material(GTMaterials.Zeolite, 4) - .material(GTMaterials.Cassiterite, 3) - .dimensions('ad_astra:moon') - }) - - // Certus Quartz, Barium - event.add('tfg:moon_certus', vein => { - vein.weight(20) - .size(1) - .yield(1, 2) - .material(GTMaterials.CertusQuartz, 6) - .material(GTMaterials.Barite, 2) - .material(GTMaterials.Quartzite, 7) - .dimensions('ad_astra:moon') - }) - - // Asbestos, Tin, Calcium - event.add('tfg:moon_asbestos', vein => { - vein.weight(100) - .size(2) - .yield(1, 5) - .material(GTMaterials.Asbestos, 3) - .material(GTMaterials.CassiteriteSand, 4) - .material(GTMaterials.Diatomite, 1) - .dimensions('ad_astra:moon') - }) - - // Mica - Talc Silicon Aluminium Potassium Fluorine Caesium - event.add('tfg:moon_mica', vein => { - vein.weight(50) - .size(1) - .yield(1, 3) - .material(GTMaterials.Mica, 5) - .material(GTMaterials.Kyanite, 2) - .material(GTMaterials.Pollucite, 1) - .dimensions('ad_astra:moon') - }) - */ -} - function registerGTCEUBedrockFluidVeins(event) { event.add('tfg:moon_helium_3', vein => { diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index c2af044ab..46f6bc168 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -187,10 +187,6 @@ GTCEuServerEvents.oreVeins(event => { event.removeAll() }) -GTCEuServerEvents.bedrockOreVeins(event => { - registerGTCEUBedrockOreVeins(event) -}) - GTCEuServerEvents.fluidVeins(event => { registerGTCEUBedrockFluidVeins(event) }) From bbdeb9ba12648cfe4277312afa17bb0af8ae86b2 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 15:10:26 +0100 Subject: [PATCH 114/158] reduced food oven recipes from 1A LV to slightly-less-than-1A LV --- kubejs/server_scripts/tfg/recipes.food.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index b57371354..da3ff0b5d 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -97,7 +97,7 @@ function registerTFGFoodRecipes(event) { * @param {boolean?} isFirmaDynamic */ function cookingRecipe(id, input, out, fluid, isFirmaDynamic) { - return registerFoodRecipe("food_oven", id, 300, 32, "", { + return registerFoodRecipe("food_oven", id, 300, GTValues.VA[GTValues.LV], "", { itemInputs: [input], itemOutputs: [out], fluidInputs: (fluid === undefined) ? [] : [fluid], @@ -599,7 +599,7 @@ function registerTFGFoodRecipes(event) { cookingRecipe("dried_seaweed_b", "tfc:groundcover/seaweed", "tfc:food/dried_seaweed") // Vinegar - processorRecipe('vinegar_alcohol', 600, 32, { + processorRecipe('vinegar_alcohol', 600, GTValues.VA[GTValues.LV], { circuit: 5, itemInputs: ['#tfc:foods/fruits'], fluidInputs: ['#tfc:alcohols 250'], From 0e151376eafd9b54e47ab9ae87f2a3a3ee359f44 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 21:21:47 +0100 Subject: [PATCH 115/158] fixed alabaster --- CHANGELOG.md | 1 + kubejs/server_scripts/tfc/recipes.removes.js | 1 + kubejs/server_scripts/tfg/recipes.rocks.js | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c857a41e..eaf7484b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ - Added recipes for redyeing/bleaching shipping containers (#1631) @Pyritie - Adjusted recipes for ME Interface and Pattern Provider for consistency (#1569) @TomPlop - Changed the cost of the ME Quantum Tunnel (#1569) @TomPlop +- Alabaster is now renewable via rock breaker @gustovafing ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop diff --git a/kubejs/server_scripts/tfc/recipes.removes.js b/kubejs/server_scripts/tfc/recipes.removes.js index 95ee811ee..95af557e8 100644 --- a/kubejs/server_scripts/tfc/recipes.removes.js +++ b/kubejs/server_scripts/tfc/recipes.removes.js @@ -150,6 +150,7 @@ function removeTFCRecipes(event) { event.remove({ id: 'tfc:crafting/vanilla/redstone/minecart' }) event.remove({ id: 'tfc:crafting/cake' }) event.remove({ id: 'tfc:crafting/pumpkin_chunks' }) + event.remove({ id: 'tfc:crafting/alabaster_brick' }) event.remove({ id: /^tfc:crafting\/dough\/.*/ }) diff --git a/kubejs/server_scripts/tfg/recipes.rocks.js b/kubejs/server_scripts/tfg/recipes.rocks.js index 6118e4eb9..519d5f9e4 100644 --- a/kubejs/server_scripts/tfg/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/recipes.rocks.js @@ -797,15 +797,15 @@ function registerTFGRockRecipes(event) { //#region Alabaster - event.recipes.gtceu.rock_breaker("tfg:alabaster") + event.recipes.gtceu.rock_breaker("tfg:alabaster") .notConsumable("tfc:alabaster/raw") .itemOutputs("tfc:alabaster/raw") .duration(16) .EUt(7) - event.recipes.gtceu.cutter("tfg:raw_alabaster_to_bricks") - .inputItems("tfc:alabaster/raw") - .outputItems("tfc:alabaster_brick", 4) + event.recipes.gtceu.cutter("tfg:raw_alabaster_to_bricks") + .itemInputs("tfc:alabaster/raw") + .itemOutputs("4x tfc:alabaster_brick") .duration(40) .EUt(2) From acc03bbe7209fc5e794a21aff988dfaf0cdc8e7c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 21:22:04 +0100 Subject: [PATCH 116/158] removed portable energy interface because it doesn't work with FE converters --- kubejs/startup_scripts/create_additions/constants.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kubejs/startup_scripts/create_additions/constants.js b/kubejs/startup_scripts/create_additions/constants.js index c17400028..8cee92602 100644 --- a/kubejs/startup_scripts/create_additions/constants.js +++ b/kubejs/startup_scripts/create_additions/constants.js @@ -34,5 +34,6 @@ global.CREATE_ADDITIONS_DISABLED_ITEMS = [ 'createaddition:copper_spool', 'createaddition:festive_spool', 'createaddition:small_light_connector', - 'createaddition:electrum_block' + 'createaddition:electrum_block', + 'createaddition:portable_energy_interface' ]; From 46b6a2da60b0939b0c5bd5a506c2ec0922b4068c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 21:27:18 +0100 Subject: [PATCH 117/158] gregtech papyrus tweaks --- kubejs/server_scripts/minecraft/recipes.js | 9 ++++++++- kubejs/server_scripts/tfg/recipes.miscellaneous.js | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 92108d98c..16a2df8f5 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -147,14 +147,21 @@ const registerMinecraftRecipes = (event) => { event.recipes.gtceu.chemical_bath('paper_from_papyrus_distilled') .itemInputs('tfc:papyrus') .inputFluids(Fluid.of('gtceu:distilled_water', 100)) - .itemOutputs('minecraft:paper') + .itemOutputs('4x tfc:soaked_papyrus_strip') .duration(100) .EUt(7) event.recipes.gtceu.chemical_bath('paper_from_papyrus') .itemInputs('tfc:papyrus') .inputFluids("#tfg:clean_water 100") + .itemOutputs('4x tfc:soaked_papyrus_strip') + .duration(100) + .EUt(7) + + event.recipes.gtceu.assembler('papyrus_strips') + .itemInputs('4x tfc:soaked_papyrus_strip') .itemOutputs('minecraft:paper') + .circuit(1) .duration(100) .EUt(7) diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 21692b19b..3f96d316b 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -880,6 +880,7 @@ function registerTFGMiscellaneousRecipes(event) { ) .inputFluids(Fluid.of('gtceu:glue', 50)) .itemOutputs('tfg:harvest_basket') + .circuit(2) .duration(100) .EUt(GTValues.VA[GTValues.ULV]) From 7b3f4e8726a960c211c644d6e11a072807fbc20a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 21:53:02 +0100 Subject: [PATCH 118/158] fix #1672 --- CHANGELOG.md | 1 + kubejs/server_scripts/gregtech/recipes.materials.js | 12 ++++++++++++ kubejs/startup_scripts/tfc/constants.js | 3 +-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eaf7484b1..a625b18e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ - Fixed using the grappling hook on a ladder killing you (#106) @Zippity - Added more missing food processor recipes (#1632, #1638) @Pyritie - Fixed a few stuck quests (#1667, #1666) @Wicpar +- Fixed inconsistent quern and macerator recipes for small tfc ores (#1672) @Pyritie ## [0.10.9] - 10-08-2025 ### Changes diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index cc7a5edee..b98be1958 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -368,6 +368,15 @@ function registerGTCEUMetalRecipes(event) { .duration(material.getMass()) .category(GTRecipeCategories.ORE_CRUSHING) .EUt(GTValues.VA[GTValues.ULV]) + + let tfcName = material.getName(); + if (material === GTMaterials.Bismuth) + tfcName = "bismuthinite"; + else if (material === GTMaterials.YellowLimonite) + tfcName = "limonite"; + + event.recipes.tfc.quern(smallDust, smallOre) + .id(`tfc:quern/small_${tfcName}`) } /** @@ -385,6 +394,9 @@ function registerGTCEUMetalRecipes(event) { .duration(material.getMass()) .category(GTRecipeCategories.ORE_CRUSHING) .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.tfc.quern(smallDust, smallNativeOre) + .id(`tfc:quern/small_native_${material.getName()}`) } /** diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index dd39c1ced..2f8c73dff 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -960,8 +960,7 @@ global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = [ { input: '#forge:dusts/borax', output: '4x tfc:powder/flux', name: 'flux_powder' }, { input: '#forge:dusts/soda_ash', output: '4x tfc:powder/soda_ash', name: 'soda_ash' }, { input: 'gtceu:charcoal_dust', output: '2x tfc:powder/charcoal', name: 'charcoal' }, - { input: 'tfc:ore/sylvite', output: '4x tfc:powder/sylvite', name: 'sylvite' }, - { input: 'firmalife:ore/small_chromite', output: 'gtceu:small_chromite_dust', name: 'chromite' } + { input: 'tfc:ore/sylvite', output: '4x tfc:powder/sylvite', name: 'sylvite' } ]; global.TFC_GRAINS = [ From e76bed1b256b2879fac3d3c20c16f3897f392c6f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 21:59:42 +0100 Subject: [PATCH 119/158] langs --- kubejs/assets/gtceu/lang/en_us.json | 11 +++ kubejs/assets/gtceu/lang/uk_ua.json | 2 + kubejs/assets/tfc/lang/uk_ua.json | 3 + kubejs/assets/tfg/lang/en_us.json | 5 ++ kubejs/assets/tfg/lang/uk_ua.json | 100 ++++++++++++++++++++++------ 5 files changed, 101 insertions(+), 20 deletions(-) diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index cee31871e..203ad05e9 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -13,6 +13,9 @@ "block.gtceu.heat_exchanger": "Heat Exchanger", "block.gtceu.fission_reactor": "Fission Reactor", "block.gtceu.evaporation_tower": "Evaporation Tower", + "block.gtceu.ostrum_harvester": "Ostrum Harvester", + "block.gtceu.moon_dust_harvester": "Moon Dust Harvester", + "block.gtceu.extraterrestrial_ore_fabricator": "Extraterrestrial Ore Fabricator", "block.gtceu.copper_crate": "Copper Crate", "block.gtceu.copper_drum": "Copper Drum", "block.gtceu.black_bronze_crate": "Black Bronze Crate", @@ -35,6 +38,9 @@ "gtceu.heat_exchanger": "Heat Exchanger", "gtceu.fission_reactor": "Fission Reactor", "gtceu.evaporation_tower": "Evaporation Tower", + "gtceu.ostrum_harvester": "Ostrum Harvester", + "gtceu.moon_dust_harvester": "Moon Dust Harvester", + "gtceu.extraterrestrial_ore_fabricator": "Extraterrestrial Ore Fabricator", "item.gtceu.tiny_wood_dust": "Tiny Pile of Softwood Pulp", "item.gtceu.small_wood_dust": "Small Pile of Softwood Pulp", "item.gtceu.wood_dust": "Softwood Pulp", @@ -140,6 +146,11 @@ "material.gtceu.plutonium_pellet": "Plutonium Pellet", "material.gtceu.uranium_pellet": "Uranium Pellet", "material.gtceu.thorium_pellet": "Thorium Pellet", + "material.gtceu.residual_radioactive_concoction": "Residual Radioactive Concoction", + "material.gtceu.regolith_vapor": "Regolith Vapor", + "material.gtceu.dense_ostrum_vapor": "Dense Ostrum Vapor", + "material.gtceu.lightweight_ostrum_vapor": "Lightweight Ostrum Vapor", + "material.gtceu.ostrum_vapor": "Ostrum Vapor", "metaitem.dust.tooltip.purify": "Drop in Water to get Clean Dust", "metaitem.crushed.tooltip.purify": "Drop in Water to get Purified Ore", "item.gtceu.tool.behavior.silk_ice": "Silk harvests Packed Ice", diff --git a/kubejs/assets/gtceu/lang/uk_ua.json b/kubejs/assets/gtceu/lang/uk_ua.json index 4dda465b9..d62cb2589 100644 --- a/kubejs/assets/gtceu/lang/uk_ua.json +++ b/kubejs/assets/gtceu/lang/uk_ua.json @@ -87,6 +87,8 @@ "item.gtceu.treated_wood_plate": "Оброблена ДВП середньої щільності", "item.gtceu.wood_plate": "ДВП середньої щільності", "item.gtceu.treated_wood_dust": "Оброблений композит на основі ДСП", + "item.gtceu.small_treated_wood_dust": "Невелика купа обробленого деревостружкового композиту", + "item.gtceu.tiny_treated_wood_dust": "Маленька купа обробленого деревостружкового композиту", "material.gtceu.ice": "Крижана каша", "material.gtceu.damascus_steel": "Свиняча сталь", "material.gtceu.cooperite": "Куперит", diff --git a/kubejs/assets/tfc/lang/uk_ua.json b/kubejs/assets/tfc/lang/uk_ua.json index dede5e361..43c8df416 100644 --- a/kubejs/assets/tfc/lang/uk_ua.json +++ b/kubejs/assets/tfc/lang/uk_ua.json @@ -3,6 +3,9 @@ "block.tfc.fluid.salt_water": "Морська Вода", "block.tfc.cauldron.salt_water": "Котел з морською водою", "fluid.tfc.salt_water": "Морська Вода", + "block.fluid.tfc.salt_water": "Морська Вода", + "fluid.tfc.river_water": "Річкова вода", + "block.fluid.tfc.river_water": "Річкова вода", "item.tfc.bucket.salt_water": "Відро морської води", "item.tfc.powder.saltpeter": "Порошок Селітри", "item.tfc.powder.sulfur": "Сірчаний Порошок", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index cae8874f2..d999d8baf 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -658,6 +658,11 @@ "material.tfg.nuclear_residue": "Nuclear Residue", "material.tfg.oxidized_nuclear_residue": "Oxidized Nuclear Residue", "material.tfg.refined_nuclear_residue": "Refined Nuclear Residue", + "material.tfg.certus_regolith": "Certus Regolith", + "material.tfg.goethe_regolith": "Goethe Regolith", + "material.tfg.bright_regolith": "Bright Regolith", + "material.tfg.cassiterite_regolith": "Cassiterite Regolith", + "material.tfg.regolith_mush": "Regolith Mush", "ore_vein.tfg.deep_garnet_amethyst": "Amethyst & Garnet", "ore_vein.tfg.deep_garnet_opal": "Opal & Garnet", "ore_vein.tfg.deep_gold": "Gold (Deep)", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index 932f5c4a4..2c29801b2 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -199,29 +199,52 @@ "block.tfg.mv_aqueous_accumulator": "§bРозширений Водний Акумулятор§r", "block.tfg.hv_aqueous_accumulator": "§6Розширений Водний Акумулятор II§r", "block.tfg.ev_aqueous_accumulator": "§5Розширений Водний Акумулятор III§r", + "block.tfg.iv_aqueous_accumulator": "§9Elite Aqueous Accumulator§r", + "block.tfg.luv_aqueous_accumulator": "§dЕлітний Водяний Акумулятор II§r", + "block.tfg.zpm_aqueous_accumulator": "§cЕлітний Водяний Акумулятор III§r", + "block.tfg.uv_aqueous_accumulator": "§3Абсолютний Водяний Акумулятор§r", "block.tfg.electric_greenhouse": "Електрична теплиця", "block.tfg.lv_food_processor": "Базовий Кухонний Комбайн", "block.tfg.mv_food_processor": "§bУдосконалений Кухонний Комбайн§r", "block.tfg.hv_food_processor": "§6Удосконалений Кухонний Комбайн II§r", "block.tfg.ev_food_processor": "§6Удосконалений Кухонний Комбайн III§r", + "block.tfg.iv_food_processor": "§9Елітний Харчопереробник§r", + "block.tfg.luv_food_processor": "§dЕлітний Харчопереробник II§r", + "block.tfg.zpm_food_processor": "§cЕлітний Харчопереробник III§r", + "block.tfg.uv_food_processor": "§3Абсолютний Харчопереробник§r", "block.tfg.lv_food_oven": "Базова Електрична Духова Шафа", "block.tfg.mv_food_oven": "§bУдосконалена Електрична Духова Шафа§r", "block.tfg.hv_food_oven": "§6Удосконалена Електрична Духова Шафа III§r", "block.tfg.ev_food_oven": "§6Удосконалена Електрична Духова Шафа III§r", + "block.tfg.iv_food_oven": "§9Елітна Електрична Піч§r", + "block.tfg.luv_food_oven": "§dЕлітна Електрична Піч II§r", + "block.tfg.zpm_food_oven": "§cЕлітна Електрична Піч III§r", + "block.tfg.uv_food_oven": "§3Абсолютна Електрична Піч§r", "block.tfg.lv_food_refrigerator": "Базовий Холодильник", "block.tfg.mv_food_refrigerator": "§bУдосконалений Холодильник§r", "block.tfg.hv_food_refrigerator": "§6Удосконалений Холодильник II§r", "block.tfg.ev_food_refrigerator": "§5Удосконалений Холодильник III§r", + "block.tfg.iv_food_refrigerator": "§9Елітний Холодильник§r", "block.tfg.lv_gas_pressurizer": "Базовий газовий пресуризатор", "block.tfg.mv_gas_pressurizer": "§bПокращений газовий пресуризатор§r", "block.tfg.hv_gas_pressurizer": "§bПокращений газовий пресуризатор II§r", "block.tfg.ev_gas_pressurizer": "§bПокращений газовий пресуризатор III§r", + "block.tfg.iv_gas_pressurizer": "§9Елітний Газовий Пресуризатор§r", + "block.tfg.luv_gas_pressurizer": "§dЕлітний Газовий Пресуризатор II§r", + "block.tfg.zpm_gas_pressurizer": "§dЕлітний Газовий Пресуризатор III§r", + "block.tfg.uv_gas_pressurizer": "§3Абсолютний Газовий Пресуризатор III§r", "block.tfg.semiheavy_ammoniacal_water": "Термохімічно збагачена амоніачна напівважка вода", "block.tfg.grass.mars_dirt": "Марсіанський ґрунт", "block.tfg.grass.mars_farmland": "Марсіанське поле", "block.tfg.grass.amber_mycelium": "Бурштиновий міцелій", "block.tfg.grass.rusticus_mycelium": "Міцелій Rusticus", "block.tfg.grass.sangnum_mycelium": "Сангнумний міцелій", + "block.tfg.saplings.crimson": "Багряний гриб", + "block.tfg.saplings.warped": "Покручений гриб", + "block.tfg.saplings.alphacene": "Альфаценовий гриб", + "block.tfg.saplings.aeronos": "Аеронський гриб", + "block.tfg.saplings.strophar": "Строфарський гриб", + "block.tfg.saplings.glacian": "Глаціанський гриб", "block.tfg.electromagnetic_accelerator": "Електромагнітний прискорювач", "block.tfg.superconductor_coil_large": "Велика надпровідна котушка", "block.tfg.superconductor_coil_small": "Мала надпровідна котушка", @@ -328,6 +351,9 @@ "block.tfg.sandstone.stairs.smooth.fluorapatite.yellow": "Сходи з гладкого жовтого флуорапатитового пісковику", "block.tfg.sandstone.fluorapatite.yellow": "Тесаний жовтий флуорапатитовий пісковик", "block.tfg.sandstone.smooth.chiseled.fluorapatite.yellow": "Різьблений жовтий флуорапатитовий пісковик", + "block.tfg.large_nest_box": "Велике багряне гніздо", + "tfg.block_entity.large_nest_box": "Велика гніздова скринька", + "block.tfg.large_nest_box_warped": "Велике покручене гніздо", "fluid.tfg.nether_slurry": "Незерський шлам", "fluid.tfg.enriched_nether_slurry": "Збагачений незерський шлам", "fluid.tfg.ender_slurry": "Ендерський шлам", @@ -749,12 +775,12 @@ "tfg.tooltip.moon_rabbit_variant.cyan": "Хутро кольору морської піни", "tfg.tooltip.moon_rabbit_variant.purple": "Лавандове хутро", "tfg.tooltip.moon_rabbit_variant.sofu": "Пломбірне хутро", - "entity.tfg.glacian_ram.male": "Glacian Ram", - "entity.tfg.glacian_ram.female": "Glacian Ewe", - "tfg.tooltip.attribution.glacian_ram": "§9§oCredit: Ad Astra", - "entity.tfg.sniffer.male": "Sniffer", - "entity.tfg.sniffer.female": "Sniffer", - "tfg.tooltip.attribution.sniffer": "§9§oCredit: Minecraft", + "entity.tfg.glacian_ram.male": "Глаціанський баран", + "entity.tfg.glacian_ram.female": "Глаціанська вівця", + "tfg.tooltip.attribution.glacian_ram": "§9§oАвтор: Ad Astra", + "entity.tfg.sniffer.male": "Сніффер", + "entity.tfg.sniffer.female": "Сніффер", + "tfg.tooltip.attribution.sniffer": "§9§oАвтор: Minecraft", "item.treetap.tap": "Застарілий предмет, створіть для оновлення", "item.gtceu.zinc_ingot": "Застарілий предмет, створіть для оновлення", "item.gtceu.brass_ingot": "Застарілий предмет, створіть для оновлення", @@ -894,6 +920,40 @@ "tooltip.tfg.ore_prospector_mode_vein": "per-vein", "tooltip.tfg.ore_prospector_mode_block": "per-block", "tfg.hangglider.disabled_dimension": "Тут не можна використовувати дельтаплан!", + "tfg.tooltip.nametag": "§7Використовується на столі переписування разом із предметом для його іменування або з чорною фарбою для іменування мітки.", + "tfg.tooltip.yeast_starter": "§7Створено з сушених фруктів", + "tfg.tooltip.beehive": "§7Потрібно заповнити порожніми рамками та оточити квітами, щоб привабити бджіл.", + "tfg.tooltip.obsolete.tree_tap": "§4Застаріле§f: Замінено на AFC TreeTap, можна створити з цього предмета, просто поклавши його на верстак!", + "tfg.tooltip.obsolete.fridge": "§4Застаріле§f: Замінено на TFG Refrigerator, можна створити з цього предмета, просто поклавши його на верстак!", + "tfg.tooltip.blaze_burner": "§cНаджар§r §7за допомогою коксу, антрациту або бездоганних і вишуканих вугільних самоцвітів.", + "tfg.tooltip.machine.perfect_overclock": "Ця машина має §2Ідеальний розгін§r!", + "tfg.tooltip.nether_dome_1": "§7Штучне середовище для імітації Нижнього світу.", + "tfg.tooltip.machine.customize_interior": "§7Інтер'єр можна налаштувати! Перевірте попередній перегляд мультиблоку в JEI.", + "tfg.tooltip.end_dome_1": "§7Штучне середовище для імітації Краю.", + "tfg.tooltip.armor.copper_diving_suit_warmth": "§7Тепло: -1", + "tfg.tooltip.armor.copper_diving_suit_insulation": "§7Ізоляція: +1", + "tfg.tooltip.armor.netherite_diving_suit_warmth": "§7Тепло: -2", + "tfg.tooltip.armor.netherite_diving_suit_insulation": "§7Ізоляція: +9", + "tfg.tooltip.armor.netherite_diving_suit_set": "§7Одягніть повний комплект, щоб стати §eСтійким до спеки§7 від навколишньої температури.", + "tfg.tooltip.armor.nanomuscle_warmth": "§7Тепло: 0", + "tfg.tooltip.armor.nanomuscle_insulation": "§7Ізоляція: +10", + "tfg.tooltip.armor.nanomuscle_set": "§7Одягніть повний комплект, щоб стати §eПовністю ізольованим§7 від навколишньої температури.", + "tfg.tooltip.armor.quarktech_warmth": "§7Тепло: 0", + "tfg.tooltip.armor.quarktech_insulation": "§7Ізоляція: +10", + "tfg.tooltip.armor.quarktech_set": "§7Одягніть повний комплект, щоб стати §eПовністю ізольованим§7 від навколишньої температури.", + "tfg.tooltip.armor.space_suit_warmth": "§7Тепло: 0", + "tfg.tooltip.armor.space_suit_insulation": "§7Ізоляція: +10", + "tfg.tooltip.armor.space_suit_set": "§7Одягніть повний комплект, щоб стати §eПовністю ізольованим§7 від навколишньої температури.", + "tfg.tooltip.support.tier1": "§79 x 5 x 9", + "tfg.tooltip.support.tier2": "§717 x 9 x 17", + "tfg.tooltip.support.tier3": "§733 x 13 x 33", + "tfg.tooltip.vessels": "§cМакс: 3024mB", + "tfg.tooltip.solar_panel.single": "Виробляє §6256 FE/t§r (64 EU/t) на §6Місяці§r протягом §6дня§r", + "tfg.tooltip.solar_panel.large_tier1": "Гігантська структура, що виробляє від §61024 до 4096 EU/t§r на §6Місяці§r протягом §6дня§r", + "tfg.tooltip.solar_panel.large_tier2": "Гігантська структура, що виробляє від §64096 до 16384 EU/t§r на §6Місяці§r протягом §6дня§r", + "tfg.tooltip.solar_panel.large_tier3": "Гігантська структура, що виробляє від §616384 до 65536 EU/t§r на §6Місяці§r протягом §6дня§r", + "tfg.tooltip.petrified_egg": "§7Потребує магми для інкубації", + "tfg.tooltip.obsolete.depreciated": "§cЗастаріле, більше не створюється", "tfc.jei.flint_knapping": "Обробка Кременю", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "Фарбування", "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.gray": "Фарбування", @@ -1013,7 +1073,7 @@ "quests.ae2.subtitle": "Найпотужніший інструмент, що допоможе тобі з GregTech, відкривається після твоєї першої подорожі на Місяць", "quests.ae2.certus_quartz.title": "Істинний кварц", "quests.ae2.certus_quartz.subtitle": "Маленький крок для тебе — гігантський стрибок для логістики", - "quests.ae2.certus_quartz.desc": "З першим кроком на Місяці ти отримуєш доступ до своєї першої жили &bІстинного кварцу&r.\nНе хвилюйся — вони досить поширені й мають бути легкими для пошуку, хоча хороший Розвідник руди точно не завадить.\n\nЧи вирішиш ти встановити шахтаря, чи викопати жилу вручну — обов’язково назбирай солідну кількість, адже вона знадобиться для прогресу в AE2.", + "quests.ae2.certus_quartz.desc": "З першим кроком на Місяці ти отримуєш доступ до своєї першої жили &bІстинного кварцу&r.\nНе хвилюйся — вони досить поширені й мають бути легкими для пошуку, хоча хороший Розвідник руди точно не завадить.\n\nЧи вирішиш ти встановити бур, чи викопати жилу вручну — обов’язково назбирай солідну кількість, адже вона знадобиться для прогресу в AE2.", "quests.ae2.certus_quartz.task": "Руда істинного кварцу", "quests.ae2.polarizer.title": "Намагнічувач", "quests.ae2.polarizer.subtitle": "Редстону недостатньо", @@ -1260,7 +1320,7 @@ "quests.gregtech_energy.lce_fuel.desc.2": "Щойно ви досягнете рівня &5EV&r і отримаєте доступ до &6Дистиляційної Вежі&r, настав час переходити на Бензин і Високооктановий Бензин. Не варто робити це надто рано — нафти слід правильно дистилювати, і робити це за допомогою звичайної Дистилерії зовсім неефективно.\n\nДля роботи цієї системи вам знадобиться поєднання дистиляції нафти та обробки органічних сполук. На щастя, Піролізна Піч і Дистиляційна Вежа справляються з цим напрочуд ефективно.\n\nЯкщо вам вдасться забезпечити стабільне постачання Високооктанового Бензину, то зможете пройти весь модпак, використовуючи лише Двигуни Внутрішнього Згоряння.", "quests.gregtech_energy.lce_fuel.task": "У мене достатньо", "quests.gregtech_energy.large_solar.subtitle": "Величезна проста енергія", - "quests.gregtech_energy.large_solar.desc.1": "Велика сонячна матриця MK I — це твоє основне рішення, якщо плануєш розгорнути більшу базу на Місяці.\n\nВона особливо корисна для &bобробних ліній AE2&r, а також здатна живити твої &bВидобувачі корінної породи&r.\n\nНе забудь, що ти можеш скористатися предметом &bТермінал GregTech&r, щоб миттєво побудувати мультиблок — просто затисни Shift і клацни ПКМ по контролері.\n\nПеревір рецепти, натиснувши &eU&r на контролері — там знайдеш усі доступні варіанти.", + "quests.gregtech_energy.large_solar.desc.1": "Велика сонячна матриця MK I — це твоє основне рішення, якщо плануєш розгорнути більшу базу на Місяці.\n\nВона особливо корисна для &bобробних ліній AE2&r, а також здатна живити твої &bГлибинні бури&r.\n\nНе забудь, що ти можеш скористатися предметом &bТермінал GregTech&r, щоб миттєво побудувати мультиблок — просто затисни Shift і клацни ПКМ по контролері.\n\nПеревір рецепти, натиснувши &eU&r на контролері — там знайдеш усі доступні варіанти.", "quests.gregtech_energy.large_solar.desc.2": "&6Велика сонячна матриця MK I&r має &92 різні рецепти&r:\n\n&9• Пасивний режим&r — \nУ цьому режимі не витрачаються жодні предмети, що робить його повністю пасивним. Проте він генерує лише &62A HV&r вдень — цього вистачить для базових систем, але далеко не оптимально.\n\n&9• Активний режим з обслуговуванням&r — \nЯкщо хочеш &aмаксимізувати енергетичний вихід&r, доведеться слідкувати за обслуговуванням. На початку кожного циклу існує &c5% шанс&r, що буде витрачено &dФотовольтаїчну капсулу&r.\n\n&eНаша рекомендація:&r \nНалаштуй пасивну логістичну лінію для постачання сонячної панелі фотовольтаїчними капсулами.\n\nЇх можна або транспортувати з &aЗемлі&r, або виготовляти безпосередньо на &7Місяці&r — вибір за тобою!", "quests.gregtech_energy.large_solar_t2.subtitle": "Ще потужніше", "quests.gregtech_energy.large_solar_t2.desc.1": "Якщо ти будуєш &dбазу AE2 на Місяці&r, тобі, швидше за все, знадобиться набагато більше енергії. І саме тут вступає в гру &6Велика сонячна матриця MK II&r!\n\nЯк і MK I, вона має 2 рецепти — але цього разу жоден із них не є повністю пасивним.", @@ -1462,7 +1522,7 @@ "quests.high_voltage.250_iq.desc.1": "Це гайд про те, як автоматично направити &lвсі&r твої Гарячі Злитки до &3Хімічної ванни&r, зберігаючи повну автоматизацію в ідеальному стані.\n\nДешевий варіант — використовувати фільтри та вручну додавати Гарячі Злитки по одному... але це ж так нудно! Давай краще оберемо веселий варіант.\n\nВстанови &aФільтр за тегом предмета&r на бік &3Хімічної ванни&r, відкрий його та встанови режим whitelist на -&e&l*hot_ingots*&r-.\n\nЗвідси ти можеш прокладати маршрути через &9будь-яку логістичну систему&r на свій вибір.", "quests.high_voltage.250_iq.desc.2": "Підключи вихід твого &3ЕДП(ів)&r до входу &3Хімічної ванни&r та до вихідного контейнера (Скрині або Ящика). Також можеш поставити &dОбмежувальну трубу&r перед контейнером, щоб забезпечити пріоритет для Хімічної ванни.\n\n&l&9Примітка:&r Якщо хочеш дізнатися більше тегів для автоматизації, вони відображаються при наведенні на предмет із затиснутим Shift. Наприклад, предмет із тегом &e&o#forge:plates/copper&r буде фільтруватися як &e&lplates/copper&r.\n\n&9&lІнша примітка:&r Фільтр за тегом предмета частково підтримує &dregex&r. Наведи курсор на іконку інформації, щоб дізнатися більше.", "quests.high_voltage.bedrock_miner.subtitle": "Необмежені руди?", - "quests.high_voltage.bedrock_miner.desc.1": "Це може бути твоє перше знайомство з &cРудним буром корінної породи&r, адже його рідко використовують у GregTech.\n\nВін працює подібно до &bРідинної бурової установки&r, але цільові жили &nніколи не виснажуються&r.\n\nВін майже не споживає енергії — чудово працює на &bMV&r або &6HV&r — і не потребує &aжодних вхідних матеріалів&r.\n\nТо в чому ж підступ? \nПотрібно знайти самі жили.", + "quests.high_voltage.bedrock_miner.desc.1": "Це може бути твоє перше знайомство з &cГлибинним буром&r, адже його рідко використовують у GregTech.\n\nВін працює подібно до &bРідинної Бурової Установки&r, але цільові жили &nніколи не виснажуються&r.\n\nВін майже не споживає енергії — чудово працює на &bMV&r або &6HV&r — і не потребує &aжодних вхідних матеріалів&r.\n\nТо в чому ж підступ? \nПотрібно знайти самі жили.", "quests.high_voltage.bedrock_miner.desc.2": "Тобі знадобиться &6HV&r Розвідник, налаштований на режим &oПошуку руд у корінній породі&r (&7Shift + ПКМ&r), а також трохи терпіння. Коли знайдеш потрібну жилу, доведеться ще й придумати, як доставити ресурси назад на свою базу.\n\nНа &fМісяці&r ти зможеш знайти свої перші рудні жили в корінній породі, що дозволить пасивно отримувати кілька важливих елементів абсолютно безкоштовно — назавжди. Перевір JEI, щоб побачити доступні варіанти! Чим вища &aВисота&r, тим частіше трапляється жила.\n\nОскільки вони будуть дуже розкидані, це чудова нагода побудувати &7місячний потяг&r!", "quests.high_voltage.space_alloy.title": "R-Алюміносталь", "quests.high_voltage.space_alloy.subtitle": "Ми це вигадали самі", @@ -1579,7 +1639,7 @@ "quests.low_voltage.machine_auto_output_behaviour.title": "Поведінка автоматичного виводу машини", "quests.low_voltage.machine_auto_output_behaviour.subtitle": "Давай навчатися.", "quests.low_voltage.machine_auto_output_behaviour.desc.1": "Усі машини зазвичай мають одну &7Лицьову Сторону&r та одну &9Вихідну Сторону&r. \n\n&7Лицьова Сторона&r повинна бути очевидною. \n&9Вихідна Сторона&r — це сторона з точкою або отвором. За замовчуванням вона розташована на задній частині машини при її встановленні. \n\nМашини можуть &aавтовивантажувати&r через свою вихідну сторону. \nЩоб увімкнути автовивантаження, натисни відповідну кнопку в GUI.\nАвтовивантаження рідин та предметів перемикаються окремо. \nДодатковий контроль над автовивантаженням можна здійснити за допомогою &dФільтрів&r та &dКришок&r, які описані в квесті у верхньому лівому куті цього.", - "quests.low_voltage.machine_auto_output_behaviour.desc.2": "Клацання правою кнопкою миші на машині з &5Гайковим ключем&r змінює вихідну сторону, а shift+клацання змінює лицьову сторону. Май на увазі, що лицьова сторона &cне може&r бути вихідною стороною! \n\nЗа замовчуванням предмети та рідини не можна вставляти через вихідну сторону, але це можна змінити за допомогою &5Викрутки&r. \nАбо клацни правою кнопкою миші безпосередньо на вихідній стороні, або shift+клацни на сітці, що відповідає стороні виходу. \n\nЄ унікальні машини, які не обробляють рецепти, такі як &3Насос&r, &3Шахтар&r, &3Рибалка&r, &3Колектор предметів&r тощо. Ці машини вивантажують предмети на свою &7Лицьову сторону&r (яка все ще позначена крапкою).", + "quests.low_voltage.machine_auto_output_behaviour.desc.2": "ПКМ на машині з &5Гайковим ключем&r змінює вихідну сторону, а shift+клацання змінює лицьову сторону. Май на увазі, що лицьова сторона &cне може&r бути вихідною стороною! \n\nЗа замовчуванням предмети та рідини не можна вставляти через вихідну сторону, але це можна змінити за допомогою &5Викрутки&r. \nАбо клацни правою кнопкою миші безпосередньо на вихідній стороні, або shift+клацни на сітці, що відповідає стороні виходу. \n\nЄ унікальні машини, які не обробляють рецепти, такі як &3Насос&r, &3Бур&r, &3Рибалка&r, &3Колектор предметів&r тощо. Ці машини вивантажують предмети на свою &7Лицьову сторону&r (яка все ще позначена крапкою).", "quests.low_voltage.machine_auto_output_behaviour.task": "Хм, як цікаво!", "quests.low_voltage.programmed_circuits.title": "Програмовані схеми", "quests.low_voltage.programmed_circuits.subtitle": "Не хочеш витрачати свої схеми на вибір рецептів?", @@ -1765,8 +1825,8 @@ "quests.medium_voltage.mv_miner.subtitle": "Так що вам набридло добувати самому?", "quests.medium_voltage.mv_miner.desc.1": "Ця добра душа&r буде добувати руди для тебе, якщо її розмістити над жилою. \n\nВертикальний діапазон необмежений під майнером. Горизонтальний діапазон відображається у підказці. \n\nВаріант &bMV&r може не мати достатнього діапазону для видобутку всієї жили, але варіант &6HV&r має, тому можливо варто зачекати. Отримай &eбудь-який&r, щоб завершити це завдання.", "quests.medium_voltage.mv_miner.desc.2": "Тобі знадобиться &9Енергія&r. &aЗаряджені Батареї&r можуть працювати, але вони мають властивість швидко розряджатися, що трохи незручно. \n\nНайкраща рекомендація — використовувати заповнену &3Бочку&r з якимось паливом &7(якщо ти використовуєш Пар, це не спрацює!)&r та &3Генератор&r. \n\nРозмісти Бочку над Генератором і клацни по ньому &5Викруткою&r, щоб автоматично передавати паливо в Генератор.", - "quests.medium_voltage.mv_miner.desc.3": "&cПримітка:&r Не забудь &dзавантажити чанки&r всіх 9 шматків рудної жили &7(відкрий карту, захопи чанки за допомогою Ctrl + ЛКМ і увімкни примусове завантаження після їх захоплення)&r. \n\n&9Порада:&r Ти можеш використовувати або &3ME Сундук&r, або &3GT Create&r як вихідний інвентар, щоб зробити транспортування руд додому простішим. &3ME Сундук&r можна живити безпосередньо від EU, але це буде доступно не відразу.", - "quests.medium_voltage.mv_miner.task": "Будь-який майнер", + "quests.medium_voltage.mv_miner.desc.3": "&cПримітка:&r Не забудь &dзавантажити чанки&r всіх 9 шматків рудної жили &7(відкрий карту, захопи чанки за допомогою Ctrl + ЛКМ і увімкни примусове завантаження після їх захоплення)&r. \n\n&9Порада:&r Ти можеш використовувати або &3ME Скриню&r, або &3GT Ящик&r як вихідний інвентар, щоб зробити транспортування руд додому простішим. &3ME Скриня&r можна живити безпосередньо від EU, але це буде доступно не відразу.", + "quests.medium_voltage.mv_miner.task": "Будь-який бур", "quests.medium_voltage.mv_component.title": "Компоненти MV", "quests.medium_voltage.mv_component_.subtitle": "Ненавидів створювати це на попередньому рівні?", "quests.medium_voltage.mv_component.desc": "Ось список компонентів, які тобі знадобляться в &bMV&r. Щоб зменшити складність, обов’язково налаштуй автокрафт або &dмасове виробництво&r цих деталей, особливо &aМоторів&r. \n\nЗнайомий з &aЕмітером&r? У цьому рівні Емітер вимагає &dБездоганний Смарагд&r у рецепті, який наразі можна отримати лише через &3Сортувальну Машину&r. \n\nКонвеєри, Помпи та Роботизовані Руки є об’єктивними покращеннями порівняно з версіями &7LV&r, якщо використовувати їх як накладки.", @@ -1820,14 +1880,14 @@ "quests.medium_voltage.mv_lpg.subtitle": "Хто перший відчув запах...", "quests.medium_voltage.mv_lpg.desc.1": "&aРафінований Газ&r, &aLPG&r та &aМетан&r — це &9Газові Палива&r. LPG (Зріджений Нафтогаз) — це суміш вуглеводнів, яка зазвичай використовується в опалювальних пристроях. \n\nРафінований Газ отримується або з &dПриродного Газу&r, або з &dЛегкої Нафти&r, причому останній варіант дає більший вихід, але вимагає додаткового етапу дистиляції. \n\nВикористання &3Центрифуги&r для розділення на &aLPG&r та &aМетан&r завжди варто проводити, оскільки це практично безкоштовно.", "quests.medium_voltage.mv_lpg.desc.2": "&a&aLPG&r та &aМетан&r спалюються в &3Газовій Турбіні&r. Серед інших варіантів палива вони найпростіші у налаштуванні, що робить їх чудовими для старту. \nЇхній недолік у тому, що їх не можна додатково очищати, тому оновлення &3Рідинної Бурової Установки&r може стати пріоритетом, якщо ти вирішиш використовувати цей тип палива. \n\n&aМетан&r також можна отримати з кількох &aприродних джерел&r. &eМіж нами&r, це меми, але ти можеш дослідити їх, якщо хочеш. Врешті-решт, вибір джерела енергії — твій.", - "quests.medium_voltage.mv_brewery.title": "Місцева Пивоварня, що продає Алкоголь", + "quests.medium_voltage.mv_brewery.title": "Місцева Броварня, що продає Алкоголь", "quests.medium_voltage.mv_brewery.subtitle": "*ік*... *ік*", - "quests.medium_voltage.mv_brewery.desc.1": "Пивоварню (Brewery) можна використовувати для виготовлення &aЗмазки&r з &aРедстоуна&r та &aКреозоту&r/&aНафти&r. Змазка має кілька вузьких застосувань — зокрема її можна використовувати в &3Різаку&r для значного скорочення часу виконання рецептів.\n\nПивоварня — надзвичайно повільна машина, але вона майже не потребує енергії для роботи. Побудова &2багатьох Пивоварень&r допоможе тобі отримати достатньо Біомаси для створення пластику.\n\n&9Примітка:&r Пивоварня відкриває шлях Біомаси до &9Етилену&r. Те ж саме можна здійснити в &3Піролізній Печі&r. Альтернативний шлях передбачає використання Нафти.&r", - "quests.medium_voltage.mv_brewery.desc.2": "&l&3Лор:&r&o Ти можеш створити власну Пивоварню, якщо хочеш заснувати компанію та почати продавати Алкоголь... у GregTech 6.&r", + "quests.medium_voltage.mv_brewery.desc.1": "Броварню можна використовувати для виготовлення &aЗмазки&r з &aРедстоуна&r та &aКреозоту&r/&aНафти&r. Змазка має кілька вузьких застосувань — зокрема її можна використовувати в &3Різаку&r для значного скорочення часу виконання рецептів.\n\nБроварня — надзвичайно повільна машина, але вона майже не потребує енергії для роботи. Побудова &2багатьох Броварень&r допоможе тобі отримати достатньо Біомаси для створення пластику.\n\n&9Примітка:&r Броварня відкриває шлях Біомаси до &9Етилену&r. Те ж саме можна здійснити в &3Піролізній Печі&r. Альтернативний шлях передбачає використання Нафти.&r", + "quests.medium_voltage.mv_brewery.desc.2": "&l&3Лор:&r&o Ти можеш створити власну Броварню, якщо хочеш заснувати компанію та почати продавати Алкоголь... у GregTech 6.&r", "quests.medium_voltage.mv_biomass.title": "Біомаса", "quests.medium_voltage.mv_biomass.subtitle": "Рослини недостатньо індустріальні!", - "quests.medium_voltage.mv_biomass.desc.1": "Ласкаво просимо на органічний шлях до &dЕтилену&r! Мета тут — отримати &dЕтанол&r і змішати його з &dСірчаною Кислотою&r, щоб створити &dЕтилен&r. \n\nЩоб отримати &dЕтанол&r, тобі потрібно переганяти його з &aБіомаси&r—тож давай розглянемо різні способи її виробництва. \n\nПерший метод простий: поклади &aсаджанці&r у &dПивоварню&r з водою. Недолік? &eЦе повільно&r.", - "quests.medium_voltage.mv_biomass.desc.2": "Другий метод складніший, але дає набагато кращі результати. Тобі потрібно отримати &aБіо-Шматки&r, які виходять при &aподрібненні Рослинних Куль&r. Зверни увагу, що ти не отримаєш &aдодатковий шанс&r, поки не розблокуєш &6HV Дроблення&r. \n\n&bРослинні Кулі&r можна отримати шляхом: \n- Центрифугування &9Цукрової Тростини&r або &9Буряка&r \n- Центрифугування будь-якої &aдеревини&r, яку можна добувати &9#afc:tappable_logs&r \n- Стискання &aсаджанців&r безпосередньо \n\nНарешті, оброби свої &aБіо-Шматки&r з водою в &dПивоварні&r або скористайся &dПіролізною Піччю&r для &e66 відсотків збільшення&r виходу.", + "quests.medium_voltage.mv_biomass.desc.1": "Ласкаво просимо на органічний шлях до &dЕтилену&r! Мета тут — отримати &dЕтанол&r і змішати його з &dСірчаною Кислотою&r, щоб створити &dЕтилен&r. \n\nЩоб отримати &dЕтанол&r, тобі потрібно переганяти його з &aБіомаси&r—тож давай розглянемо різні способи її виробництва. \n\nПерший метод простий: поклади &aсаджанці&r у &dБроварню&r з водою. Недолік? &eЦе повільно&r.", + "quests.medium_voltage.mv_biomass.desc.2": "Другий метод складніший, але дає набагато кращі результати. Тобі потрібно отримати &aБіо-Шматки&r, які виходять при &aподрібненні Рослинних Культур&r. Зверни увагу, що ти не отримаєш &aдодатковий шанс&r, поки не розблокуєш &6HV Дроблення&r. \n\n&bРослинні Кулі&r можна отримати шляхом: \n- Центрифугування &9Цукрової Тростини&r або &9Буряка&r \n- Центрифугування будь-якої &aдеревини&r, яку можна добувати &9#afc:tappable_logs&r \n- Стискання &aсаджанців&r безпосередньо \n\nНарешті, оброби свої &aБіо-Шматки&r з водою в &dБроварні&r або скористайся &dПіролізною Піччю&r для &e66 відсотків збільшення&r виходу.", "quests.medium_voltage.mv_biomass.desc.3": "&l&3Лор:&r&o Ти можеш впізнати Рослинні Кулі з IndustrialCraft2! У IC2 Experimental був досить... незрозумілий спосіб перетворення Біомаси на Біогаз для енергії, який, на жаль, вимагав надто великих інвестицій, щоб бути справді вигідним.", "quests.medium_voltage.mv_distillery.title": "Дистилярня", "quests.medium_voltage.mv_distillery.subtitle": "Ілюзія Вільного Вибору", @@ -1971,7 +2031,7 @@ "quests.medium_voltage.mv_cutter.title": "Розширений Різак", "quests.medium_voltage.mv_cutter.subtitle": "Оновлення, люди, оновлення!", "quests.medium_voltage.mv_cutter.desc": "&3MV Різак&r необхідний для нарізання &7Силіконових Буль&r, щоб підготувати їх до &aЛазерного Гравіювання&r. \n\nРекомендуємо забезпечити цю машину стабільним потоком &dМастила&r, щоб скоротити час обробки. \n\nМастило можна &3зварити&r з &eНафти&r та &aТальку&r, &2Стеатиту&r або &cРедстоуну&r. \n\n&7Примітка: Ти можеш використовувати &6Велику&r &7версію, вона тепер має бак для заповнення рідиною&r&r", - "quests.medium_voltage.mv_cutter.task": "Будь-яка пивоварня", + "quests.medium_voltage.mv_cutter.task": "Будь-яка Броварня", "quests.medium_voltage.mv_laser_engraver.title": "Лазерне Гравіювання", "quests.medium_voltage.mv_laser_engraver.subtitle": "Це вершина технологій, але це також повільно", "quests.medium_voltage.mv_laser_engraver.desc": "&3Лазерний Гравер&r наносить візерунки на &9Силіконові Вафлі&r залежно від типу &9Лінзи&r, яку він отримує. Після гравіювання вафлі потрібно пропустити через &3Різальну Машину&r, щоб перетворити їх на компоненти, готові до використання в Схемах. \n\nГравери вищого рівня можуть гравіювати складніші вафлі для більш ефективних Схем.", @@ -2256,7 +2316,7 @@ "quests.space_survival.flag.task": "Будь-який прапор", "quests.space_survival.chorus.title": "Фрукт хоруса", "quests.space_survival.chorus.subtitle": "Це кінець?", - "quests.space_survival.chorus.desc": "&5Плід Хорусу&r відіграє доволі важливу роль на Місяці — це буде твоє головне джерело азоту. Щоб розпочати, знайди рослини хорусу, застрибуй на верхівку та зривай &5Квіти хорусу&r. Якщо зламати рослину знизу — квітів не отримаєш! Далі вирощуй квіти хорусу в електричній теплиці, щоб отримати поновлюване джерело плодів хорусу. З них можна виготовити біомасу та азот за допомогою пивоварні та ферментера відповідно. Біомасу також можна переганяти в вуглець — для додаткового ракетного пального!", + "quests.space_survival.chorus.desc": "&5Плід Хорусу&r відіграє доволі важливу роль на Місяці — це буде твоє основне джерело Азоту. Щоб почати, знайди рослини хорусу, застрибуй на верхівку та зламай &5Квіти хорусу&r. Ламаючи рослину знизу, ти не отримаєш жодної квітки! Далі вирощуй квіти хорусу в Електричній теплиці, щоб отримати поновлюване джерело плодів хорусу, а вже з них можна виготовити Біомасу та Азот за допомогою Броварні та Ферментатора відповідно. Біомасу також можна переганяти в Вуглець для додаткового ракетного пального!", "quests.space_survival.rover.title": "Космічний Ровер", "quests.space_survival.rover.subtitle": "Твій транспорт для втечі", "quests.space_survival.rover.desc": "Довелося залишити модний реактивний ранець вдома: атмосфери для літаків тут нема, коні не витримують — тож як пересуватись? &bРовер&r — твій вірний транспорт! Він вміщує до двох пасажирів, працює на горючих паливних сумішах (дизель, бензин і ракетне паливо), а ще має власний інвентар і радіо, що відтворює реальні радіостанції!", @@ -2534,7 +2594,7 @@ "quests.steam_age.miner.title": "Автоматичне Видобування", "quests.steam_age.miner.subtitle": "Кінець епохи обвалів", "quests.steam_age.miner.desc.1": "Тепер у вас є доступ до двох варіантів автоматичного видобування руди! Обидва варіанти досить повільні, тому краще налаштувати їх, завантажити чанки і зайнятися чимось іншим, ніж сидіти і чекати.\n\nМеханічний Бур потребуватиме конструкції для буріння вниз, розбиваючи весь камінь на своєму шляху. Ви також можете прикріпити його до передньої частини поїзда або вагонетки для створення тунелів, якщо хочете.", - "quests.steam_age.miner.desc.2": "Парова Шахтарка, з іншого боку, видобуває лише рудні блоки й замінює їх бруківкою, залишаючи решту ґрунту недоторканою. Вона може видобувати руду в (малому) радіусі, що означає, що її потрібно переміщати рідше, ніж механічну шахтарку, але вона також набагато повільніша.", + "quests.steam_age.miner.desc.2": "Паровий Бур, з іншого боку, видобуває лише рудні блоки й замінює їх бруківкою, залишаючи решту ґрунту недоторканою. Вона може видобувати руду в (малому) радіусі, що означає, що її потрібно переміщати рідше, ніж механічну шахтарку, але вона також набагато повільніша.", "quests.steam_age.paper.title": "Папір", "quests.steam_age.paper.subtitle": "Не з цукрової тростини", "quests.steam_age.paper.desc": "Якщо ви ще не зробили жодного паперу, є три різні способи отримати його без електрики:\n\n1) Створити пергамент зі шкіри, пемзи та яйця.\n\n2) Сплести разом папірус.\n\n3) Виготовити папір із твердої деревини через тривалий процес.\n\nПізніше ви зможете перетворювати деревну масу безпосередньо в папір за допомогою LV Хімічної Ванни.", From 7e62c260d26eab6e51cc2a81fc0a67cc0a677a19 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 22:00:09 +0100 Subject: [PATCH 120/158] emi categories --- .../assets/emi/category/properties/ad_astra_oxygen_loading.json | 2 +- kubejs/assets/emi/category/properties/ae2_attunement.json | 2 +- kubejs/assets/emi/category/properties/ae2_condenser.json | 2 +- .../assets/emi/category/properties/ae2_item_transformation.json | 2 +- kubejs/assets/emi/category/properties/create_draining.json | 2 +- kubejs/assets/emi/category/properties/create_spout_filling.json | 2 +- .../category/properties/domum_ornamentum_architects_cutter.json | 2 +- kubejs/assets/emi/category/properties/emi_info.json | 2 +- kubejs/assets/emi/category/properties/emi_tag.json | 2 +- .../emi/category/properties/exposure_photograph_printing.json | 2 +- .../emi/category/properties/exposure_photograph_stacking.json | 2 +- .../emi/category/properties/framedblocks_framing_saw.json | 2 +- .../emi/category/properties/greate_automatic_packing.json | 2 +- .../assets/emi/category/properties/greate_automatic_shaped.json | 2 +- .../emi/category/properties/greate_automatic_shapeless.json | 2 +- kubejs/assets/emi/category/properties/greate_block_cutting.json | 2 +- kubejs/assets/emi/category/properties/greate_fan_washing.json | 2 +- kubejs/assets/emi/category/properties/greate_mixing.json | 2 +- .../emi/category/properties/gtceu_arc_furnace_recycling.json | 2 +- kubejs/assets/emi/category/properties/gtceu_chem_dyes.json | 2 +- .../emi/category/properties/gtceu_extractor_recycling.json | 2 +- .../properties/gtceu_extraterrestrial_ore_fabricator.json | 1 + .../assets/emi/category/properties/gtceu_fission_reactor.json | 2 +- kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json | 2 +- kubejs/assets/emi/category/properties/gtceu_greenhouse.json | 2 +- kubejs/assets/emi/category/properties/gtceu_heat_exchanger.json | 2 +- .../emi/category/properties/gtceu_implosion_compressor.json | 2 +- kubejs/assets/emi/category/properties/gtceu_ingot_molding.json | 2 +- .../emi/category/properties/gtceu_macerator_recycling.json | 2 +- kubejs/assets/emi/category/properties/gtceu_mixer.json | 2 +- .../emi/category/properties/gtceu_moon_dust_harvester.json | 1 + kubejs/assets/emi/category/properties/gtceu_nether_dome.json | 2 +- .../emi/category/properties/gtceu_nuclear_fuel_factory.json | 2 +- kubejs/assets/emi/category/properties/gtceu_ore_bathing.json | 2 +- kubejs/assets/emi/category/properties/gtceu_ore_crushing.json | 2 +- kubejs/assets/emi/category/properties/gtceu_ore_forging.json | 2 +- kubejs/assets/emi/category/properties/gtceu_ore_washer.json | 2 +- .../assets/emi/category/properties/gtceu_ostrum_harvester.json | 1 + .../emi/category/properties/gtceu_programmed_circuit.json | 2 +- kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json | 2 +- .../assets/emi/category/properties/gtceu_research_station.json | 2 +- kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json | 2 +- kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json | 2 +- kubejs/assets/emi/category/properties/gtceu_wire_coating.json | 2 +- kubejs/assets/emi/category/properties/minecraft_smithing.json | 2 +- .../assets/emi/category/properties/minecraft_stonecutting.json | 2 +- .../assets/emi/category/properties/tacz_attachment_query.json | 2 +- .../emi/category/properties/taczammoquery_ammo_query.json | 2 +- 48 files changed, 48 insertions(+), 45 deletions(-) create mode 100644 kubejs/assets/emi/category/properties/gtceu_extraterrestrial_ore_fabricator.json create mode 100644 kubejs/assets/emi/category/properties/gtceu_moon_dust_harvester.json create mode 100644 kubejs/assets/emi/category/properties/gtceu_ostrum_harvester.json diff --git a/kubejs/assets/emi/category/properties/ad_astra_oxygen_loading.json b/kubejs/assets/emi/category/properties/ad_astra_oxygen_loading.json index 15e23522e..02998692d 100644 --- a/kubejs/assets/emi/category/properties/ad_astra_oxygen_loading.json +++ b/kubejs/assets/emi/category/properties/ad_astra_oxygen_loading.json @@ -1 +1 @@ -{"ad_astra:oxygen_loading":{"order":160}} \ No newline at end of file +{"ad_astra:oxygen_loading":{"order":163}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/ae2_attunement.json b/kubejs/assets/emi/category/properties/ae2_attunement.json index 21e600843..050ef7764 100644 --- a/kubejs/assets/emi/category/properties/ae2_attunement.json +++ b/kubejs/assets/emi/category/properties/ae2_attunement.json @@ -1 +1 @@ -{"ae2:attunement":{"order":157}} \ No newline at end of file +{"ae2:attunement":{"order":160}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/ae2_condenser.json b/kubejs/assets/emi/category/properties/ae2_condenser.json index 736352e76..f621d7885 100644 --- a/kubejs/assets/emi/category/properties/ae2_condenser.json +++ b/kubejs/assets/emi/category/properties/ae2_condenser.json @@ -1 +1 @@ -{"ae2:condenser":{"order":147}} \ No newline at end of file +{"ae2:condenser":{"order":150}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/ae2_item_transformation.json b/kubejs/assets/emi/category/properties/ae2_item_transformation.json index 4e667603b..21e60570d 100644 --- a/kubejs/assets/emi/category/properties/ae2_item_transformation.json +++ b/kubejs/assets/emi/category/properties/ae2_item_transformation.json @@ -1 +1 @@ -{"ae2:item_transformation":{"order":136}} \ No newline at end of file +{"ae2:item_transformation":{"order":139}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_draining.json b/kubejs/assets/emi/category/properties/create_draining.json index a0e741d6d..c34ca498f 100644 --- a/kubejs/assets/emi/category/properties/create_draining.json +++ b/kubejs/assets/emi/category/properties/create_draining.json @@ -1 +1 @@ -{"create:draining":{"order":158}} \ No newline at end of file +{"create:draining":{"order":161}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_spout_filling.json b/kubejs/assets/emi/category/properties/create_spout_filling.json index a1cccfa25..901f701ea 100644 --- a/kubejs/assets/emi/category/properties/create_spout_filling.json +++ b/kubejs/assets/emi/category/properties/create_spout_filling.json @@ -1 +1 @@ -{"create:spout_filling":{"order":159}} \ No newline at end of file +{"create:spout_filling":{"order":162}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json b/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json index 4fab80a17..b61473953 100644 --- a/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json +++ b/kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json @@ -1 +1 @@ -{"domum_ornamentum:architects_cutter":{"order":156}} \ No newline at end of file +{"domum_ornamentum:architects_cutter":{"order":159}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/emi_info.json b/kubejs/assets/emi/category/properties/emi_info.json index 581ade081..807e42a56 100644 --- a/kubejs/assets/emi/category/properties/emi_info.json +++ b/kubejs/assets/emi/category/properties/emi_info.json @@ -1 +1 @@ -{"emi:info":{"order":165}} \ No newline at end of file +{"emi:info":{"order":168}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/emi_tag.json b/kubejs/assets/emi/category/properties/emi_tag.json index 79f42778b..aa6ef6c12 100644 --- a/kubejs/assets/emi/category/properties/emi_tag.json +++ b/kubejs/assets/emi/category/properties/emi_tag.json @@ -1 +1 @@ -{"emi:tag":{"order":166}} \ No newline at end of file +{"emi:tag":{"order":169}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/exposure_photograph_printing.json b/kubejs/assets/emi/category/properties/exposure_photograph_printing.json index ed769e4c3..fbd77aa93 100644 --- a/kubejs/assets/emi/category/properties/exposure_photograph_printing.json +++ b/kubejs/assets/emi/category/properties/exposure_photograph_printing.json @@ -1 +1 @@ -{"exposure:photograph_printing":{"order":152}} \ No newline at end of file +{"exposure:photograph_printing":{"order":155}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json b/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json index 7df080a00..c79168c91 100644 --- a/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json +++ b/kubejs/assets/emi/category/properties/exposure_photograph_stacking.json @@ -1 +1 @@ -{"exposure:photograph_stacking":{"order":161}} \ No newline at end of file +{"exposure:photograph_stacking":{"order":164}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json b/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json index 4b41fbf76..267616879 100644 --- a/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json +++ b/kubejs/assets/emi/category/properties/framedblocks_framing_saw.json @@ -1 +1 @@ -{"framedblocks:framing_saw":{"order":155}} \ No newline at end of file +{"framedblocks:framing_saw":{"order":158}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_automatic_packing.json b/kubejs/assets/emi/category/properties/greate_automatic_packing.json index 1f21a3a8c..6b61d6b7d 100644 --- a/kubejs/assets/emi/category/properties/greate_automatic_packing.json +++ b/kubejs/assets/emi/category/properties/greate_automatic_packing.json @@ -1 +1 @@ -{"greate:automatic_packing":{"order":150}} \ No newline at end of file +{"greate:automatic_packing":{"order":153}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_automatic_shaped.json b/kubejs/assets/emi/category/properties/greate_automatic_shaped.json index e10ee67f4..c2210ef99 100644 --- a/kubejs/assets/emi/category/properties/greate_automatic_shaped.json +++ b/kubejs/assets/emi/category/properties/greate_automatic_shaped.json @@ -1 +1 @@ -{"greate:automatic_shaped":{"order":148}} \ No newline at end of file +{"greate:automatic_shaped":{"order":151}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json b/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json index ea5261e22..b50321f15 100644 --- a/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json +++ b/kubejs/assets/emi/category/properties/greate_automatic_shapeless.json @@ -1 +1 @@ -{"greate:automatic_shapeless":{"order":149}} \ No newline at end of file +{"greate:automatic_shapeless":{"order":152}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_block_cutting.json b/kubejs/assets/emi/category/properties/greate_block_cutting.json index 7c5cabc74..d17682c3f 100644 --- a/kubejs/assets/emi/category/properties/greate_block_cutting.json +++ b/kubejs/assets/emi/category/properties/greate_block_cutting.json @@ -1 +1 @@ -{"greate:block_cutting":{"order":154}} \ No newline at end of file +{"greate:block_cutting":{"order":157}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_fan_washing.json b/kubejs/assets/emi/category/properties/greate_fan_washing.json index 08976ed67..fa1e45dbb 100644 --- a/kubejs/assets/emi/category/properties/greate_fan_washing.json +++ b/kubejs/assets/emi/category/properties/greate_fan_washing.json @@ -1 +1 @@ -{"greate:fan_washing":{"order":138}} \ No newline at end of file +{"greate:fan_washing":{"order":141}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_mixing.json b/kubejs/assets/emi/category/properties/greate_mixing.json index ec06a9243..24217c56d 100644 --- a/kubejs/assets/emi/category/properties/greate_mixing.json +++ b/kubejs/assets/emi/category/properties/greate_mixing.json @@ -1 +1 @@ -{"greate:mixing":{"order":107}} \ No newline at end of file +{"greate:mixing":{"order":108}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json b/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json index 0fcc05a0e..eed81b2af 100644 --- a/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json +++ b/kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json @@ -1 +1 @@ -{"gtceu:arc_furnace_recycling":{"order":144}} \ No newline at end of file +{"gtceu:arc_furnace_recycling":{"order":147}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json b/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json index f60b884be..f592dd78d 100644 --- a/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json +++ b/kubejs/assets/emi/category/properties/gtceu_chem_dyes.json @@ -1 +1 @@ -{"gtceu:chem_dyes":{"order":142}} \ No newline at end of file +{"gtceu:chem_dyes":{"order":145}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json b/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json index af7be0640..15e4ca157 100644 --- a/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json +++ b/kubejs/assets/emi/category/properties/gtceu_extractor_recycling.json @@ -1 +1 @@ -{"gtceu:extractor_recycling":{"order":146}} \ No newline at end of file +{"gtceu:extractor_recycling":{"order":149}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_extraterrestrial_ore_fabricator.json b/kubejs/assets/emi/category/properties/gtceu_extraterrestrial_ore_fabricator.json new file mode 100644 index 000000000..acae1097c --- /dev/null +++ b/kubejs/assets/emi/category/properties/gtceu_extraterrestrial_ore_fabricator.json @@ -0,0 +1 @@ +{"gtceu:extraterrestrial_ore_fabricator":{"order":124}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fission_reactor.json b/kubejs/assets/emi/category/properties/gtceu_fission_reactor.json index b48cdf010..ac604f3da 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fission_reactor.json +++ b/kubejs/assets/emi/category/properties/gtceu_fission_reactor.json @@ -1 +1 @@ -{"gtceu:fission_reactor":{"order":124}} \ No newline at end of file +{"gtceu:fission_reactor":{"order":125}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json b/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json index f23e5f636..625f152b9 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json +++ b/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json @@ -1 +1 @@ -{"gtceu:fusion_reactor":{"order":125}} \ No newline at end of file +{"gtceu:fusion_reactor":{"order":126}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_greenhouse.json b/kubejs/assets/emi/category/properties/gtceu_greenhouse.json index eedcb8176..1361a60ec 100644 --- a/kubejs/assets/emi/category/properties/gtceu_greenhouse.json +++ b/kubejs/assets/emi/category/properties/gtceu_greenhouse.json @@ -1 +1 @@ -{"gtceu:greenhouse":{"order":126}} \ No newline at end of file +{"gtceu:greenhouse":{"order":127}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_heat_exchanger.json b/kubejs/assets/emi/category/properties/gtceu_heat_exchanger.json index a11f78a23..93287f083 100644 --- a/kubejs/assets/emi/category/properties/gtceu_heat_exchanger.json +++ b/kubejs/assets/emi/category/properties/gtceu_heat_exchanger.json @@ -1 +1 @@ -{"gtceu:heat_exchanger":{"order":127}} \ No newline at end of file +{"gtceu:heat_exchanger":{"order":128}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json b/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json index 1615ed1e7..c7c455065 100644 --- a/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json +++ b/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json @@ -1 +1 @@ -{"gtceu:implosion_compressor":{"order":128}} \ No newline at end of file +{"gtceu:implosion_compressor":{"order":129}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ingot_molding.json b/kubejs/assets/emi/category/properties/gtceu_ingot_molding.json index 1507b6c44..691d3f64b 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ingot_molding.json +++ b/kubejs/assets/emi/category/properties/gtceu_ingot_molding.json @@ -1 +1 @@ -{"gtceu:ingot_molding":{"order":143}} \ No newline at end of file +{"gtceu:ingot_molding":{"order":146}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_macerator_recycling.json b/kubejs/assets/emi/category/properties/gtceu_macerator_recycling.json index 58eb061dd..47e261972 100644 --- a/kubejs/assets/emi/category/properties/gtceu_macerator_recycling.json +++ b/kubejs/assets/emi/category/properties/gtceu_macerator_recycling.json @@ -1 +1 @@ -{"gtceu:macerator_recycling":{"order":145}} \ No newline at end of file +{"gtceu:macerator_recycling":{"order":148}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_mixer.json b/kubejs/assets/emi/category/properties/gtceu_mixer.json index eea125b10..772935fd5 100644 --- a/kubejs/assets/emi/category/properties/gtceu_mixer.json +++ b/kubejs/assets/emi/category/properties/gtceu_mixer.json @@ -1 +1 @@ -{"gtceu:mixer":{"order":108}} \ No newline at end of file +{"gtceu:mixer":{"order":107}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_moon_dust_harvester.json b/kubejs/assets/emi/category/properties/gtceu_moon_dust_harvester.json new file mode 100644 index 000000000..803200e6f --- /dev/null +++ b/kubejs/assets/emi/category/properties/gtceu_moon_dust_harvester.json @@ -0,0 +1 @@ +{"gtceu:moon_dust_harvester":{"order":133}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_nether_dome.json b/kubejs/assets/emi/category/properties/gtceu_nether_dome.json index 302667d16..1ea8384f5 100644 --- a/kubejs/assets/emi/category/properties/gtceu_nether_dome.json +++ b/kubejs/assets/emi/category/properties/gtceu_nether_dome.json @@ -1 +1 @@ -{"gtceu:nether_dome":{"order":129}} \ No newline at end of file +{"gtceu:nether_dome":{"order":130}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_nuclear_fuel_factory.json b/kubejs/assets/emi/category/properties/gtceu_nuclear_fuel_factory.json index f51f17a44..53a66941c 100644 --- a/kubejs/assets/emi/category/properties/gtceu_nuclear_fuel_factory.json +++ b/kubejs/assets/emi/category/properties/gtceu_nuclear_fuel_factory.json @@ -1 +1 @@ -{"gtceu:nuclear_fuel_factory":{"order":130}} \ No newline at end of file +{"gtceu:nuclear_fuel_factory":{"order":131}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json b/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json index 71f32433f..7f72fd197 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json @@ -1 +1 @@ -{"gtceu:ore_bathing":{"order":141}} \ No newline at end of file +{"gtceu:ore_bathing":{"order":144}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json b/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json index 0c76b9cc0..b05b57f76 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json @@ -1 +1 @@ -{"gtceu:ore_crushing":{"order":139}} \ No newline at end of file +{"gtceu:ore_crushing":{"order":142}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_forging.json b/kubejs/assets/emi/category/properties/gtceu_ore_forging.json index ff4791683..dc6d9e3ac 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_forging.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_forging.json @@ -1 +1 @@ -{"gtceu:ore_forging":{"order":140}} \ No newline at end of file +{"gtceu:ore_forging":{"order":143}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_washer.json b/kubejs/assets/emi/category/properties/gtceu_ore_washer.json index 58e9e2f86..7b7d0a331 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_washer.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_washer.json @@ -1 +1 @@ -{"gtceu:ore_washer":{"order":137}} \ No newline at end of file +{"gtceu:ore_washer":{"order":140}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ostrum_harvester.json b/kubejs/assets/emi/category/properties/gtceu_ostrum_harvester.json new file mode 100644 index 000000000..0e164cd61 --- /dev/null +++ b/kubejs/assets/emi/category/properties/gtceu_ostrum_harvester.json @@ -0,0 +1 @@ +{"gtceu:ostrum_harvester":{"order":132}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json b/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json index 5bd06eb69..4bdba8aed 100644 --- a/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json +++ b/kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json @@ -1 +1 @@ -{"gtceu:programmed_circuit":{"order":164}} \ No newline at end of file +{"gtceu:programmed_circuit":{"order":167}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json b/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json index 24e980282..5fef26d48 100644 --- a/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json +++ b/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json @@ -1 +1 @@ -{"gtceu:pyrolyse_oven":{"order":131}} \ No newline at end of file +{"gtceu:pyrolyse_oven":{"order":134}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_research_station.json b/kubejs/assets/emi/category/properties/gtceu_research_station.json index 561d3ff09..0421b74de 100644 --- a/kubejs/assets/emi/category/properties/gtceu_research_station.json +++ b/kubejs/assets/emi/category/properties/gtceu_research_station.json @@ -1 +1 @@ -{"gtceu:research_station":{"order":132}} \ No newline at end of file +{"gtceu:research_station":{"order":135}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json b/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json index 6a96027e1..e0f7f088f 100644 --- a/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json +++ b/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json @@ -1 +1 @@ -{"gtceu:steam_bloomery":{"order":133}} \ No newline at end of file +{"gtceu:steam_bloomery":{"order":136}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json b/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json index c8c311d3a..7de68c9e7 100644 --- a/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json +++ b/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json @@ -1 +1 @@ -{"gtceu:vacuum_freezer":{"order":134}} \ No newline at end of file +{"gtceu:vacuum_freezer":{"order":137}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_wire_coating.json b/kubejs/assets/emi/category/properties/gtceu_wire_coating.json index babcc7fae..0a8a44291 100644 --- a/kubejs/assets/emi/category/properties/gtceu_wire_coating.json +++ b/kubejs/assets/emi/category/properties/gtceu_wire_coating.json @@ -1 +1 @@ -{"gtceu:wire_coating":{"order":135}} \ No newline at end of file +{"gtceu:wire_coating":{"order":138}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/minecraft_smithing.json b/kubejs/assets/emi/category/properties/minecraft_smithing.json index a8dfa8cba..2555ee200 100644 --- a/kubejs/assets/emi/category/properties/minecraft_smithing.json +++ b/kubejs/assets/emi/category/properties/minecraft_smithing.json @@ -1 +1 @@ -{"minecraft:smithing":{"order":151}} \ No newline at end of file +{"minecraft:smithing":{"order":154}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/minecraft_stonecutting.json b/kubejs/assets/emi/category/properties/minecraft_stonecutting.json index 505522bdf..503fa0f66 100644 --- a/kubejs/assets/emi/category/properties/minecraft_stonecutting.json +++ b/kubejs/assets/emi/category/properties/minecraft_stonecutting.json @@ -1 +1 @@ -{"minecraft:stonecutting":{"order":153}} \ No newline at end of file +{"minecraft:stonecutting":{"order":156}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tacz_attachment_query.json b/kubejs/assets/emi/category/properties/tacz_attachment_query.json index 88a63eec8..c6e0a8465 100644 --- a/kubejs/assets/emi/category/properties/tacz_attachment_query.json +++ b/kubejs/assets/emi/category/properties/tacz_attachment_query.json @@ -1 +1 @@ -{"tacz:attachment_query":{"order":162}} \ No newline at end of file +{"tacz:attachment_query":{"order":165}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/taczammoquery_ammo_query.json b/kubejs/assets/emi/category/properties/taczammoquery_ammo_query.json index 6afdd44f3..b41343d9b 100644 --- a/kubejs/assets/emi/category/properties/taczammoquery_ammo_query.json +++ b/kubejs/assets/emi/category/properties/taczammoquery_ammo_query.json @@ -1 +1 @@ -{"taczammoquery:ammo_query":{"order":163}} \ No newline at end of file +{"taczammoquery:ammo_query":{"order":166}} \ No newline at end of file From 6a06eb815c6c0b2518313e73ed134b9e872f9eec Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 22:26:56 +0100 Subject: [PATCH 121/158] a few new ore veins --- CHANGELOG.md | 2 + .../entries/tfg_ores/earth_ore_index.json | 6 +- .../entries/tfg_ores/earth_vein_index.json | 98 +++- .../entries/tfg_ores/mars_ore_index.json | 22 + .../entries/tfg_ores/mars_vein_index.json | 49 ++ .../entries/tfg_ores/moon_ore_index.json | 15 +- .../entries/tfg_ores/moon_vein_index.json | 485 +++++++++++++++++- .../entries/tfg_ores/nether_ore_index.json | 16 +- .../entries/tfg_ores/nether_vein_index.json | 96 +++- .../entries/tfg_ores/earth_ore_index.json | 6 +- .../entries/tfg_ores/earth_vein_index.json | 98 +++- .../entries/tfg_ores/mars_ore_index.json | 22 + .../entries/tfg_ores/mars_vein_index.json | 49 ++ .../entries/tfg_ores/moon_ore_index.json | 15 +- .../entries/tfg_ores/moon_vein_index.json | 485 +++++++++++++++++- .../entries/tfg_ores/nether_ore_index.json | 14 +- .../entries/tfg_ores/nether_vein_index.json | 96 +++- .../entries/tfg_ores/earth_ore_index.json | 8 +- .../entries/tfg_ores/earth_vein_index.json | 100 +++- .../entries/tfg_ores/mars_ore_index.json | 22 + .../entries/tfg_ores/mars_vein_index.json | 49 ++ .../entries/tfg_ores/moon_ore_index.json | 15 +- .../entries/tfg_ores/moon_vein_index.json | 485 +++++++++++++++++- .../entries/tfg_ores/nether_ore_index.json | 16 +- .../entries/tfg_ores/nether_vein_index.json | 98 +++- .../entries/tfg_ores/earth_ore_index.json | 6 +- .../entries/tfg_ores/earth_vein_index.json | 100 +++- .../entries/tfg_ores/mars_ore_index.json | 22 + .../entries/tfg_ores/mars_vein_index.json | 49 ++ .../entries/tfg_ores/moon_ore_index.json | 15 +- .../entries/tfg_ores/moon_vein_index.json | 485 +++++++++++++++++- .../entries/tfg_ores/nether_ore_index.json | 16 +- .../entries/tfg_ores/nether_vein_index.json | 98 +++- kubejs/assets/tfg/lang/en_us.json | 8 + kubejs/assets/tfg/lang/pt_br.json | 8 + kubejs/assets/tfg/lang/ru_ru.json | 8 + kubejs/assets/tfg/lang/uk_ua.json | 40 +- .../earth/vein/deep_garnet_opal.json | 4 +- .../earth/vein/deep_gold.json | 4 +- .../earth/vein/deep_hematite.json | 4 +- .../earth/vein/deep_molybdenum.json | 4 +- .../earth/vein/deep_sapphire.json | 4 +- .../earth/vein/normal_basaltic_sands.json | 4 +- .../earth/vein/normal_beryllium.json | 4 +- .../earth/vein/normal_copper.json | 4 +- .../earth/vein/normal_garnet_tin.json | 4 +- .../earth/vein/normal_gold.json | 4 +- .../earth/vein/normal_graphite.json | 4 +- .../earth/vein/normal_gypsum.json | 200 ++++++++ .../earth/vein/normal_hematite.json | 4 +- .../earth/vein/normal_manganese.json | 4 +- .../earth/vein/normal_olivine.json | 4 +- .../earth/vein/normal_sphalerite.json | 4 +- .../earth/vein/normal_sulfur.json | 4 +- .../earth/vein/surface_copper.json | 4 +- .../earth/vein/surface_sphalerite.json | 4 +- .../mars/vein/mars_hematite.json | 252 +++++++++ .../moon/vein/moon_bauxite.json | 52 +- .../moon/vein/moon_beryllium.json | 4 +- .../moon/vein/moon_cassiterite.json | 158 ++++++ .../moon/vein/moon_desh.json | 4 +- .../moon/vein/moon_garnet.json | 133 +++++ .../moon/vein/moon_gold.json | 121 +++++ .../moon/vein/moon_graphite.json | 8 +- .../moon/vein/moon_gypsum.json | 136 +++++ .../moon/vein/moon_lubricant.json | 4 +- .../moon/vein/moon_manganese.json | 8 +- .../moon/vein/moon_mica.json | 10 +- .../moon/vein/moon_molybdenum.json | 4 +- .../moon/vein/moon_pyrolusite.json | 4 +- .../moon/vein/moon_quartz.json | 4 +- .../moon/vein/moon_sapphire.json | 4 +- .../moon/vein/moon_sheldonite.json | 4 +- .../moon/vein/moon_sphalerite.json | 4 +- .../moon/vein/moon_tetrahedrite.json | 146 ++++++ .../moon/vein/moon_topaz.json | 4 +- .../nether/vein/nether_basaltic_sands.json | 4 +- .../nether/vein/nether_beryllium.json | 4 +- .../nether/vein/nether_copper.json | 4 +- .../nether/vein/nether_garnet.json | 4 +- .../nether/vein/nether_goethite.json | 4 +- .../nether/vein/nether_gypsum.json | 151 ++++++ .../nether/vein/nether_hematite.json | 4 +- .../nether/vein/nether_magnetite.json | 4 +- .../nether/vein/nether_manganese.json | 4 +- .../nether/vein/nether_naquadah.json | 4 +- .../nether/vein/nether_olivine.json | 4 +- .../nether/vein/nether_quartz.json | 4 +- .../nether/vein/nether_sheldonite.json | 4 +- .../nether/vein/nether_sphalerite.json | 4 +- .../nether/vein/nether_sulfur.json | 4 +- .../nether/vein/nether_topaz.json | 4 +- .../earth/vein/normal_gypsum.json | 5 + .../mars/vein/mars_hematite.json | 5 + .../moon/vein/moon_cassiterite.json | 5 + .../placed_feature/moon/vein/moon_garnet.json | 5 + .../placed_feature/moon/vein/moon_gold.json | 5 + .../placed_feature/moon/vein/moon_gypsum.json | 5 + .../moon/vein/moon_tetrahedrite.json | 5 + .../nether/vein/nether_gypsum.json | 5 + kubejs/server_scripts/tfg/tags.veins.js | 14 + 101 files changed, 4598 insertions(+), 225 deletions(-) create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_ore_index.json create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_vein_index.json create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_ore_index.json create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_vein_index.json create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_ore_index.json create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_vein_index.json create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_ore_index.json create mode 100644 kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_vein_index.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_gypsum.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_hematite.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_cassiterite.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_garnet.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_gold.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_gypsum.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_tetrahedrite.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_gypsum.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/earth/vein/normal_gypsum.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/vein/mars_hematite.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_cassiterite.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_garnet.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_gold.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_gypsum.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_tetrahedrite.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/nether/vein/nether_gypsum.json diff --git a/CHANGELOG.md b/CHANGELOG.md index a625b18e9..cd8841714 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,8 @@ - Adjusted recipes for ME Interface and Pattern Provider for consistency (#1569) @TomPlop - Changed the cost of the ME Quantum Tunnel (#1569) @TomPlop - Alabaster is now renewable via rock breaker @gustovafing +- Added a new ore vein to all dimensions for gypsum, calcite, borax, and fuller's earth @Pyritie +- Added some more moon ore veins for copper, tin, gold, aluminium.. nothing exciting @Pyritie ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_ore_index.json index 4418b7c6f..a548ee3b6 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_ore_index.json @@ -14,17 +14,17 @@ }, { "Type": "patchouli:text", - "text": "$(li)Almandine: $(l:tfg_ores/earth_vein_index#deep_sapphire)38%$(/l)$()$(li)Alunite: $(l:tfg_ores/earth_vein_index#normal_saltpeter)15%$(/l)$()$(li)Amethyst: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)65%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)25%$(/l)$()$(li)Apatite: $(l:tfg_ores/earth_vein_index#normal_apatite)50%$(/l)$()$(li)Asbestos: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_quartz)18%$(/l)$()$(li)Barite: $(l:tfg_ores/earth_vein_index#normal_quartz)37%$(/l)$()$(li)Basaltic Mineral Sands: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)35%$(/l)$()$(li)Bastnasite: $(l:tfg_ores/earth_vein_index#normal_monazite)62%$(/l)$()$(li)Bauxite: $(l:tfg_ores/earth_vein_index#normal_mica)25%$(/l)$()$(li)Bentonite: $(l:tfg_ores/earth_vein_index#normal_olivine)35%$(/l)$()$(li)Beryllium: $(l:tfg_ores/earth_vein_index#normal_beryllium)35%$(/l)$()$(li)Bismuth: $(l:tfg_ores/earth_vein_index#surface_bismuthinite)90%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)80%$(/l)$()$(li)Blue Topaz: $(l:tfg_ores/earth_vein_index#deep_topaz)35%$(/l)$()$(li)Borax: $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l)$()", + "text": "$(li)Almandine: $(l:tfg_ores/earth_vein_index#deep_sapphire)38%$(/l)$()$(li)Alunite: $(l:tfg_ores/earth_vein_index#normal_saltpeter)15%$(/l)$()$(li)Amethyst: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)65%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)25%$(/l)$()$(li)Apatite: $(l:tfg_ores/earth_vein_index#normal_apatite)50%$(/l)$()$(li)Asbestos: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_quartz)18%$(/l)$()$(li)Barite: $(l:tfg_ores/earth_vein_index#normal_quartz)37%$(/l)$()$(li)Basaltic Mineral Sands: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)35%$(/l)$()$(li)Bastnasite: $(l:tfg_ores/earth_vein_index#normal_monazite)62%$(/l)$()$(li)Bauxite: $(l:tfg_ores/earth_vein_index#normal_mica)25%$(/l)$()$(li)Bentonite: $(l:tfg_ores/earth_vein_index#normal_olivine)35%$(/l)$()$(li)Beryllium: $(l:tfg_ores/earth_vein_index#normal_beryllium)35%$(/l)$()$(li)Bismuth: $(l:tfg_ores/earth_vein_index#surface_bismuthinite)90%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)80%$(/l)$()$(li)Blue Topaz: $(l:tfg_ores/earth_vein_index#deep_topaz)35%$(/l)$()$(li)Borax: $(l:tfg_ores/earth_vein_index#normal_gypsum)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Bornite: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)Calcite: $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)Cassiterite: $(l:tfg_ores/earth_vein_index#surface_cassiterite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_copper)5%$(/l)$()$(li)Cassiterite Sand: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)35%$(/l)$()$(li)Chalcocite: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/earth_vein_index#surface_copper)61%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)20%$(/l)$()$(li)Chromite: $(l:tfg_ores/earth_vein_index#deep_magnetite)33%$(/l), $(l:tfg_ores/earth_vein_index#normal_magnetite)4%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/earth_vein_index#normal_redstone)20%$(/l)$()$(li)Coal: $(l:tfg_ores/earth_vein_index#normal_coal)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_graphite)30%$(/l)$()$(li)Cobalt: $(l:tfg_ores/earth_vein_index#normal_garnierite)15%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/earth_vein_index#normal_garnierite)20%$(/l)$()$(li)Cooperite: $(l:tfg_ores/earth_vein_index#deep_sheldonite)38%$(/l)$()$(li)Diamond: $(l:tfg_ores/earth_vein_index#normal_graphite)25%$(/l)$()$(li)Diatomite: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_garnet_tin)15%$(/l)$()", + "text": "$(li)Bornite: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)Calcite: $(l:tfg_ores/earth_vein_index#normal_gypsum)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)Cassiterite: $(l:tfg_ores/earth_vein_index#surface_cassiterite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_copper)5%$(/l)$()$(li)Cassiterite Sand: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)35%$(/l)$()$(li)Chalcocite: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/earth_vein_index#surface_copper)61%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)20%$(/l)$()$(li)Chromite: $(l:tfg_ores/earth_vein_index#deep_magnetite)33%$(/l), $(l:tfg_ores/earth_vein_index#normal_magnetite)4%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/earth_vein_index#normal_redstone)20%$(/l)$()$(li)Coal: $(l:tfg_ores/earth_vein_index#normal_coal)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_graphite)30%$(/l)$()$(li)Cobalt: $(l:tfg_ores/earth_vein_index#normal_garnierite)15%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/earth_vein_index#normal_garnierite)20%$(/l)$()$(li)Cooperite: $(l:tfg_ores/earth_vein_index#deep_sheldonite)38%$(/l)$()$(li)Diamond: $(l:tfg_ores/earth_vein_index#normal_graphite)25%$(/l)$()$(li)Diatomite: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_garnet_tin)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Electrotine: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l)$()$(li)Emerald: $(l:tfg_ores/earth_vein_index#normal_beryllium)50%$(/l)$()$(li)Fuller's Earth: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Galena: $(l:tfg_ores/earth_vein_index#normal_silver)30%$(/l)$()$(li)Garnet Sand: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l)$()$(li)Garnierite: $(l:tfg_ores/earth_vein_index#normal_garnierite)30%$(/l)$()$(li)Glauconite Sand: $(l:tfg_ores/earth_vein_index#normal_lubricant)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_olivine)15%$(/l)$()$(li)Goethite: $(l:tfg_ores/earth_vein_index#deep_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)5%$(/l)$()$(li)Granitic Mineral Sand: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Graphite: $(l:tfg_ores/earth_vein_index#normal_graphite)45%$(/l)$()$(li)Green Sapphire: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l)$()$(li)Grossular: $(l:tfg_ores/earth_vein_index#normal_manganese)37%$(/l)$()$(li)Gypsum: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)15%$(/l)$()$(li)Hematite: $(l:tfg_ores/earth_vein_index#normal_hematite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)5%$(/l)$()", + "text": "$(li)Electrotine: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l)$()$(li)Emerald: $(l:tfg_ores/earth_vein_index#normal_beryllium)50%$(/l)$()$(li)Fuller's Earth: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_gypsum)15%$(/l)$()$(li)Galena: $(l:tfg_ores/earth_vein_index#normal_silver)30%$(/l)$()$(li)Garnet Sand: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l)$()$(li)Garnierite: $(l:tfg_ores/earth_vein_index#normal_garnierite)30%$(/l)$()$(li)Glauconite Sand: $(l:tfg_ores/earth_vein_index#normal_lubricant)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_olivine)15%$(/l)$()$(li)Goethite: $(l:tfg_ores/earth_vein_index#deep_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)5%$(/l)$()$(li)Granitic Mineral Sand: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Graphite: $(l:tfg_ores/earth_vein_index#normal_graphite)45%$(/l)$()$(li)Green Sapphire: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l)$()$(li)Grossular: $(l:tfg_ores/earth_vein_index#normal_manganese)37%$(/l)$()$(li)Gypsum: $(l:tfg_ores/earth_vein_index#normal_gypsum)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)15%$(/l)$()$(li)Hematite: $(l:tfg_ores/earth_vein_index#normal_hematite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)5%$(/l)$()", "type": "patchouli:text" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_vein_index.json index cf867747d..6d90ccabf 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_vein_index.json @@ -19,17 +19,17 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Garnet & Cassiterite Sands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Garnierite & Cobaltite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Goethite & Malachite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Gold (Deep)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Gold, Limonite, & Hematite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Graphite & Diamond$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Hematite & Limonite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Hematite, Goethite, & Ruby$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)Kyanite, Mica, & Bauxite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Lapis, Lazurite, & Sodalite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Limonite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Magnetite & Vanadium$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Manganese & Tantalum$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)Mineral Sands$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Garnet & Cassiterite Sands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Garnierite & Cobaltite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Goethite & Malachite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Gold (Deep)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Gold, Limonite, & Hematite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Graphite & Diamond$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gypsum)Gypsum & Calcite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Hematite & Limonite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Hematite, Goethite, & Ruby$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)Kyanite, Mica, & Bauxite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Lapis, Lazurite, & Sodalite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Limonite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Magnetite & Vanadium$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Manganese & Tantalum$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)Oilsands$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Opal & Garnet$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Quartzes$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Redstone, Cinnabar, & Ruby$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Saltpeter & Electrotine$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Salts & Borax$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Sapphire & Almandine$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Soapstone, Talc, & Trona$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Sphalerite & Sulfur$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Spodumene & Lepidolite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Sulfur & Pyrite$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)Mineral Sands$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)Oilsands$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Opal & Garnet$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Quartzes$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Redstone, Cinnabar, & Ruby$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Saltpeter & Electrotine$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Salts & Borax$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Sapphire & Almandine$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Soapstone, Talc, & Trona$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Sphalerite & Sulfur$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Spodumene & Lepidolite$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Tetrahedrite (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Tetrahedrite (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Topaz & Chalcocite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Uraninite & Pitchblende$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Wulfenite & Molybdenite$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Sulfur & Pyrite$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Tetrahedrite (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Tetrahedrite (Surface)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Topaz & Chalcocite$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Uraninite & Pitchblende$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Wulfenite & Molybdenite$()$()", "type": "patchouli:text" }, { @@ -1587,6 +1587,98 @@ "text": "$(thing)Percentage$(): 25%$(br)$(thing)Used for$(): Macerators, AE2$(br)$(thing)Formula$(): C", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Rarity$(): 180$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Disc Vein$(br)$(thing)Y$(): -32 — 60$(br)$(thing)Size$(): 40$(br)$(thing)Height$(): 9$(br)$(thing)Indicator Max Depth$(): 20$(br2)$(thing)Stone Types$(): Chalk, Chert, Claystone, Conglomerate, Dolomite, Limestone, Shale", + "title": "Gypsum & Calcite", + "type": "patchouli:text", + "anchor": "normal_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Gypsum", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 35%$(br)$(thing)Used for$(): Alabaster (dyeable) bricks$(br)$(thing)Formula$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Calcite", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 30%$(br)$(thing)Source of$(): Calcium$(br)$(thing)Formula$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Borax", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 20%$(br)$(thing)Source of$(): Sodium, Boron$(br)$(thing)Formula$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Fuller's Earth", + "multiblock": { + "mapping": { + "0": "#forge:ores/fullers_earth" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 15%$(br)$(thing)Source of$(): Magnesium$(br)$(thing)Formula$(): MgSi₄H(H₂O)₄O₁₁", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Rarity$(): 210$(br)$(thing)Density$(): 0.4$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -32 — 75$(br)$(thing)Size$(): 40$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_ore_index.json new file mode 100644 index 000000000..39be0fa88 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_ore_index.json @@ -0,0 +1,22 @@ +{ + "__credits__": "This page was automatically generated by OresToFieldGuide.", + "name": "Mars Ore Index", + "icon": "tfc:ore/normal_hematite", + "category": "tfc:tfg_ores", + "read_by_default": true, + "secret": false, + "pages": [ + { + "Type": "patchouli:text", + "text": "This is the $(thing)Ore Index$() for $(thing)Mars$(). All ores are sorted alphabetically and then by richest to poorest vein type. You can click on them to learn more information about each vein.", + "title": "Mars Ore Index", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Hematite: $(l:tfg_ores/mars_vein_index#mars_hematite)100%$(/l)$()", + "type": "patchouli:text" + } + ], + "sortnum": 6 +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_vein_index.json new file mode 100644 index 000000000..ff302ed25 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/mars_vein_index.json @@ -0,0 +1,49 @@ +{ + "__credits__": "This page was automatically generated by OresToFieldGuide.", + "name": "Mars Vein Index", + "icon": "gtceu:mars_stone_hematite_ore", + "category": "tfc:tfg_ores", + "read_by_default": true, + "secret": false, + "pages": [ + { + "Type": "patchouli:text", + "text": "This is the $(thing)Vein Index$() for $(item)Mars$(). Each Vein has details regarding its rarity, density, vein type, height found, sizes, what stones it spawns in, and more.", + "title": "Mars Vein Index", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_hematite)(Placeholder Vein)$()$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(thing)Rarity$(): 210$(br)$(thing)Density$(): 0.4$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): -16 — 100$(br)$(thing)Size$(): 40$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Argillite, Basalt, Chalk, Chert, Claystone, Conglomerate, Dacite, Diorite, Dolomite, Gabbro, Granite, Limestone, Red Granite, Shale, Trachyte", + "title": "(Placeholder Vein)", + "type": "patchouli:text", + "anchor": "mars_hematite" + }, + { + "Type": "patchouli:multiblock", + "name": "Hematite", + "multiblock": { + "mapping": { + "0": "#forge:ores/hematite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 100%$(br)$(thing)Melts into$(): Cast Iron$(br)$(thing)Formula$(): Fe₂O₃", + "type": "patchouli:multiblock" + } + ], + "sortnum": 7 +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_ore_index.json index 1f8346dd5..456d3bb57 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_ore_index.json @@ -14,27 +14,32 @@ }, { "Type": "patchouli:text", - "text": "$(li)Almandine: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Aluminium: $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l)$()$(li)Apatite: $(l:tfg_ores/moon_vein_index#moon_apatite)23%$(/l)$()$(li)Armalcolite: $(l:tfg_ores/moon_vein_index#moon_bauxite)21%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Barite: $(l:tfg_ores/moon_vein_index#moon_quartz)5%$(/l)$()$(li)Bastnasite: $(l:tfg_ores/moon_vein_index#moon_monazite)61%$(/l)$()$(li)Bauxite: $(l:tfg_ores/moon_vein_index#moon_bauxite)36%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Beryllium: $(l:tfg_ores/moon_vein_index#moon_beryllium)31%$(/l)$()$(li)Blue Topaz: $(l:tfg_ores/moon_vein_index#moon_topaz)35%$(/l)$()$(li)Bornite: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)15%$(/l)$()$(li)Certus Quartz: $(l:tfg_ores/moon_vein_index#moon_quartz)45%$(/l)$()$(li)Chalcocite: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Chromite: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/moon_vein_index#moon_redstone)19%$(/l)$()", + "text": "$(li)Almandine: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Aluminium: $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)14%$(/l)$()$(li)Alunite: $(l:tfg_ores/moon_vein_index#moon_gypsum)15%$(/l)$()$(li)Amethyst: $(l:tfg_ores/moon_vein_index#moon_garnet)38%$(/l)$()$(li)Apatite: $(l:tfg_ores/moon_vein_index#moon_apatite)23%$(/l)$()$(li)Armalcolite: $(l:tfg_ores/moon_vein_index#moon_bauxite)21%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Barite: $(l:tfg_ores/moon_vein_index#moon_quartz)5%$(/l)$()$(li)Bastnasite: $(l:tfg_ores/moon_vein_index#moon_monazite)61%$(/l)$()$(li)Bauxite: $(l:tfg_ores/moon_vein_index#moon_bauxite)36%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)20%$(/l)$()$(li)Beryllium: $(l:tfg_ores/moon_vein_index#moon_beryllium)31%$(/l)$()$(li)Blue Topaz: $(l:tfg_ores/moon_vein_index#moon_topaz)35%$(/l)$()$(li)Borax: $(l:tfg_ores/moon_vein_index#moon_gypsum)20%$(/l)$()$(li)Bornite: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)15%$(/l)$()$(li)Calcite: $(l:tfg_ores/moon_vein_index#moon_gypsum)25%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Cobalt: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)14%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Cooperite: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()$(li)Desh: $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_sphalerite)15%$(/l)$()$(li)Diamond: $(l:tfg_ores/moon_vein_index#moon_graphite)36%$(/l)$()$(li)Electrotine: $(l:tfg_ores/moon_vein_index#moon_saltpeter)37%$(/l)$()$(li)Emerald: $(l:tfg_ores/moon_vein_index#moon_beryllium)45%$(/l)$()$(li)Galena: $(l:tfg_ores/moon_vein_index#moon_silver)28%$(/l)$()$(li)Garnierite: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l)$()$(li)Glauconite Sand: $(l:tfg_ores/moon_vein_index#moon_lubricant)25%$(/l)$()$(li)Graphite: $(l:tfg_ores/moon_vein_index#moon_graphite)52%$(/l)$()$(li)Green Sapphire: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l)$()$(li)Grossular: $(l:tfg_ores/moon_vein_index#moon_manganese)37%$(/l)$()$(li)Ilmenite: $(l:tfg_ores/moon_vein_index#moon_bauxite)42%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l)$()", + "text": "$(li)Cassiterite: $(l:tfg_ores/moon_vein_index#moon_cassiterite)41%$(/l)$()$(li)Certus Quartz: $(l:tfg_ores/moon_vein_index#moon_quartz)45%$(/l)$()$(li)Chalcocite: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/moon_vein_index#moon_cassiterite)35%$(/l)$()$(li)Chromite: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/moon_vein_index#moon_redstone)19%$(/l)$()$(li)Cobalt: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)14%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Cooperite: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()$(li)Desh: $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_sphalerite)15%$(/l)$()$(li)Diamond: $(l:tfg_ores/moon_vein_index#moon_graphite)36%$(/l)$()$(li)Electrotine: $(l:tfg_ores/moon_vein_index#moon_saltpeter)37%$(/l)$()$(li)Emerald: $(l:tfg_ores/moon_vein_index#moon_beryllium)45%$(/l)$()$(li)Galena: $(l:tfg_ores/moon_vein_index#moon_silver)28%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Kyanite: $(l:tfg_ores/moon_vein_index#moon_mica)33%$(/l)$()$(li)Lead: $(l:tfg_ores/moon_vein_index#moon_silver)23%$(/l)$()$(li)Lithium: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()$(li)Magnetite: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l)$()$(li)Mica: $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Molybdenite: $(l:tfg_ores/moon_vein_index#moon_molybdenum)33%$(/l)$()$(li)Monazite: $(l:tfg_ores/moon_vein_index#moon_monazite)30%$(/l)$()$(li)Native Gold: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Native Silver: $(l:tfg_ores/moon_vein_index#moon_silver)42%$(/l)$()$(li)Neodymium: $(l:tfg_ores/moon_vein_index#moon_monazite)6%$(/l)$()$(li)Nether Quartz: $(l:tfg_ores/moon_vein_index#moon_quartz)30%$(/l)$()$(li)Nickel: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Olivine: $(l:tfg_ores/moon_vein_index#moon_graphite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_apatite)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_beryllium)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_molybdenum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_redstone)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_silver)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_sapphire)2%$(/l), $(l:tfg_ores/moon_vein_index#moon_monazite)1%$(/l)$()$(li)Pentlandite: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_lubricant)15%$(/l)$()", + "text": "$(li)Garnierite: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l)$()$(li)Glauconite Sand: $(l:tfg_ores/moon_vein_index#moon_lubricant)25%$(/l)$()$(li)Graphite: $(l:tfg_ores/moon_vein_index#moon_graphite)52%$(/l)$()$(li)Green Sapphire: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)5%$(/l)$()$(li)Grossular: $(l:tfg_ores/moon_vein_index#moon_manganese)37%$(/l)$()$(li)Gypsum: $(l:tfg_ores/moon_vein_index#moon_gypsum)35%$(/l)$()$(li)Ilmenite: $(l:tfg_ores/moon_vein_index#moon_bauxite)42%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l)$()$(li)Kyanite: $(l:tfg_ores/moon_vein_index#moon_mica)33%$(/l)$()$(li)Lead: $(l:tfg_ores/moon_vein_index#moon_silver)23%$(/l)$()$(li)Lithium: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()$(li)Magnetite: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)20%$(/l)$()$(li)Mica: $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Molybdenite: $(l:tfg_ores/moon_vein_index#moon_molybdenum)33%$(/l)$()$(li)Monazite: $(l:tfg_ores/moon_vein_index#moon_monazite)30%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Platinum: $(l:tfg_ores/moon_vein_index#moon_sheldonite)15%$(/l)$()$(li)Pollucite: $(l:tfg_ores/moon_vein_index#moon_mica)14%$(/l)$()$(li)Powellite: $(l:tfg_ores/moon_vein_index#moon_molybdenum)16%$(/l)$()$(li)Pyrite: $(l:tfg_ores/moon_vein_index#moon_sphalerite)35%$(/l)$()$(li)Pyrochlore: $(l:tfg_ores/moon_vein_index#moon_apatite)38%$(/l)$()$(li)Pyrolusite: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)38%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Pyrope: $(l:tfg_ores/moon_vein_index#moon_sapphire)27%$(/l)$()$(li)Quartzite: $(l:tfg_ores/moon_vein_index#moon_quartz)20%$(/l)$()$(li)Redstone: $(l:tfg_ores/moon_vein_index#moon_redstone)42%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/moon_vein_index#moon_beryllium)18%$(/l)$()$(li)Ruby: $(l:tfg_ores/moon_vein_index#moon_redstone)33%$(/l)$()$(li)Saltpeter: $(l:tfg_ores/moon_vein_index#moon_saltpeter)29%$(/l)$()$(li)Sapphire: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)5%$(/l)$()$(li)Scheelite: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()", + "text": "$(li)Native Copper: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)15%$(/l)$()$(li)Native Gold: $(l:tfg_ores/moon_vein_index#moon_gold)55%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Native Silver: $(l:tfg_ores/moon_vein_index#moon_silver)42%$(/l)$()$(li)Neodymium: $(l:tfg_ores/moon_vein_index#moon_monazite)6%$(/l)$()$(li)Nether Quartz: $(l:tfg_ores/moon_vein_index#moon_quartz)30%$(/l)$()$(li)Nickel: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Olivine: $(l:tfg_ores/moon_vein_index#moon_graphite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_apatite)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_beryllium)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_gypsum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_molybdenum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_redstone)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_silver)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_sapphire)2%$(/l), $(l:tfg_ores/moon_vein_index#moon_monazite)1%$(/l)$()$(li)Opal: $(l:tfg_ores/moon_vein_index#moon_garnet)38%$(/l)$()$(li)Pentlandite: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_lubricant)15%$(/l)$()$(li)Platinum: $(l:tfg_ores/moon_vein_index#moon_sheldonite)15%$(/l)$()$(li)Powellite: $(l:tfg_ores/moon_vein_index#moon_molybdenum)16%$(/l)$()$(li)Pyrite: $(l:tfg_ores/moon_vein_index#moon_sphalerite)35%$(/l)$()$(li)Pyrochlore: $(l:tfg_ores/moon_vein_index#moon_apatite)38%$(/l)$()$(li)Pyrolusite: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)38%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Soapstone: $(l:tfg_ores/moon_vein_index#moon_lubricant)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)20%$(/l)$()$(li)Spessartine: $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/moon_vein_index#moon_sphalerite)50%$(/l)$()$(li)Talc: $(l:tfg_ores/moon_vein_index#moon_lubricant)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)12%$(/l)$()$(li)Tantalite: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()$(li)Thorium: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Topaz: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Trona: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()", + "text": "$(li)Pyrope: $(l:tfg_ores/moon_vein_index#moon_sapphire)27%$(/l)$()$(li)Quartzite: $(l:tfg_ores/moon_vein_index#moon_quartz)20%$(/l)$()$(li)Red Garnet: $(l:tfg_ores/moon_vein_index#moon_garnet)9%$(/l)$()$(li)Redstone: $(l:tfg_ores/moon_vein_index#moon_redstone)42%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/moon_vein_index#moon_beryllium)18%$(/l)$()$(li)Ruby: $(l:tfg_ores/moon_vein_index#moon_redstone)33%$(/l)$()$(li)Saltpeter: $(l:tfg_ores/moon_vein_index#moon_saltpeter)29%$(/l)$()$(li)Sapphire: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)5%$(/l)$()$(li)Scheelite: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)Soapstone: $(l:tfg_ores/moon_vein_index#moon_lubricant)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)20%$(/l)$()$(li)Spessartine: $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/moon_vein_index#moon_sphalerite)50%$(/l)$()$(li)Stibnite: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)20%$(/l)$()$(li)Talc: $(l:tfg_ores/moon_vein_index#moon_lubricant)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)12%$(/l)$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Tantalite: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)40%$(/l)$()$(li)Thorium: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Tin: $(l:tfg_ores/moon_vein_index#moon_cassiterite)17%$(/l)$()$(li)Topaz: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Trona: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()$(li)Yellow Garnet: $(l:tfg_ores/moon_vein_index#moon_garnet)14%$(/l)$()$(li)Zeolite: $(l:tfg_ores/moon_vein_index#moon_cassiterite)5%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_vein_index.json index f8862b459..1dc09e4e9 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/moon_vein_index.json @@ -14,12 +14,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Apatite & Pyrochlore$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Bastnasite & Monazite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Bauxite & Ilmenite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Certus Quartz$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_magnetite)Chromite & Magnetite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sheldonite)Cooperite & Bornite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Desh & Ilmenite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_beryllium)Emerald & Beryllium$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Garnierite & Cobaltite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_graphite)Graphite & Diamond$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_mica)Kyanite, Mica, & Bauxite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_manganese)Manganese & Tantalum$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_pyrolusite)Pyrolusite and Cobalt$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Redstone, Cinnabar, & Ruby$()$()", + "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_garnet)Amethyst, Opal, & Garnet$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Apatite & Pyrochlore$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Bastnasite & Monazite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Bauxite & Ilmenite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_cassiterite)Cassiterite & Chalcopyrite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Certus Quartz$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_magnetite)Chromite & Magnetite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sheldonite)Cooperite & Bornite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Desh & Ilmenite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_beryllium)Emerald & Beryllium$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Garnierite & Cobaltite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_gold)Gold & Magnetite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_graphite)Graphite & Diamond$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_gypsum)Gypsum & Calcite$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_saltpeter)Saltpeter & Electrotine$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sapphire)Sapphire & Almandine$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_scheelite)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_silver)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_lubricant)Soapstone, Talc, & Trona$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sphalerite)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_topaz)Topaz & Chalcocite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Wulfenite & Molybdenite$()$()", + "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_mica)Kyanite, Mica, & Bauxite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_manganese)Manganese & Tantalum$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_pyrolusite)Pyrolusite and Cobalt$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Redstone, Cinnabar, & Ruby$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_saltpeter)Saltpeter & Electrotine$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sapphire)Sapphire & Almandine$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_scheelite)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_silver)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_lubricant)Soapstone, Talc, & Trona$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sphalerite)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_tetrahedrite)Tetrahedrite & Chalcocite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_topaz)Topaz & Chalcocite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Wulfenite & Molybdenite$()$()", "type": "patchouli:text" }, { @@ -27,6 +27,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Rarity$(): 230$(br)$(thing)Density$(): 0.35$(br)$(thing)Type$(): Disc Vein$(br)$(thing)Y$(): 10 — 128$(br)$(thing)Size$(): 35$(br)$(thing)Height$(): 7$(br)$(thing)Indicator Max Depth$(): 20$(br2)$(thing)Stone Types$(): Andesite, Basalt, Rhyolite", + "title": "Amethyst, Opal, & Garnet", + "type": "patchouli:text", + "anchor": "moon_garnet" + }, + { + "Type": "patchouli:multiblock", + "name": "Amethyst", + "multiblock": { + "mapping": { + "0": "#forge:ores/amethyst" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 38%$(br)$(thing)Source of$(): Iron$(br)$(thing)Formula$(): (SiO₂)₄Fe", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Opal", + "multiblock": { + "mapping": { + "0": "#forge:ores/opal" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 38%$(br)$(thing)Source of$(): Silicon, Oxygen$(br)$(thing)Formula$(): (SiO₂)", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Yellow Garnet", + "multiblock": { + "mapping": { + "0": "#forge:ores/yellow_garnet" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 14%$(br)$(thing)Source of$(): Andradite, Grossular, Uvarovite", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Red Garnet", + "multiblock": { + "mapping": { + "0": "#forge:ores/red_garnet" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 9%$(br)$(thing)Source of$(): Pyrope, Almandine, Spessartine", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Rarity$(): 250$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 0 — 100$(br)$(thing)Size$(): 35$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Diorite, Norite", @@ -278,6 +370,98 @@ "text": "$(thing)Percentage$(): 21%$(br)$(thing)Source of$(): Magnesium, Rutile, Titanium$(br)$(thing)Formula$(): (Mg,Fe)Ti₂O₅", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Rarity$(): 210$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 10 — 128$(br)$(thing)Size$(): 40$(br)$(thing)Indicator Max Depth$(): 60$(br2)$(thing)Stone Types$(): Diorite, Gabbro, Granite, Norite", + "title": "Cassiterite & Chalcopyrite", + "type": "patchouli:text", + "anchor": "moon_cassiterite" + }, + { + "Type": "patchouli:multiblock", + "name": "Cassiterite", + "multiblock": { + "mapping": { + "0": "#forge:ores/cassiterite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 41%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): SnO₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Chalcopyrite", + "multiblock": { + "mapping": { + "0": "#forge:ores/chalcopyrite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 35%$(br)$(thing)Melts into$(): Copper$(br)$(thing)Formula$(): CuFeS₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Tin", + "multiblock": { + "mapping": { + "0": "#forge:ores/tin" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 17%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): Sn", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Zeolite", + "multiblock": { + "mapping": { + "0": "#forge:ores/zeolite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 5%$(br)$(thing)Source of$(): Aluminium, Oxygen$(br)$(thing)Formula$(): NaCa₄Si₂₇Al₉(H₂O)₂₈O₇₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Rarity$(): 230$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 10 — 100$(br)$(thing)Size$(): 60$(br)$(thing)Indicator Max Depth$(): 80$(br2)$(thing)Stone Types$(): Andesite, Anorthosite, Basalt, Dacite, Diorite, Gabbro, Norite, Phonolite, Rhyolite", @@ -875,6 +1059,98 @@ "text": "$(thing)Percentage$(): 14%$(br)$(thing)Smelts into$(): Cobalt$(br)$(thing)Formula$(): Co", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Rarity$(): 170$(br)$(thing)Density$(): 0.4$(br)$(thing)Type$(): Disc Vein$(br)$(thing)Y$(): 10 — 80$(br)$(thing)Size$(): 40$(br)$(thing)Height$(): 10$(br)$(thing)Indicator Max Depth$(): 60$(br2)$(thing)Stone Types$(): Basalt, Diorite, Granite", + "title": "Gold & Magnetite", + "type": "patchouli:text", + "anchor": "moon_gold" + }, + { + "Type": "patchouli:multiblock", + "name": "Native Gold", + "multiblock": { + "mapping": { + "0": "#forge:ores/gold" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 55%$(br)$(thing)Melts into$(): Gold$(br)$(thing)Formula$(): Au", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Bauxite", + "multiblock": { + "mapping": { + "0": "#forge:ores/bauxite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 20%$(br)$(thing)Source of$(): Aluminium$(br)$(thing)Formula$(): Al₂O₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Magnetite", + "multiblock": { + "mapping": { + "0": "#forge:ores/magnetite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 20%$(br)$(thing)Melts into$(): Cast Iron$(br)$(thing)Formula$(): Fe₃O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Green Sapphire", + "multiblock": { + "mapping": { + "0": "#forge:ores/green_sapphire" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 5%$(br)$(thing)Source of$(): Aluminium$(br)$(thing)Formula$(): Al₂O₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Rarity$(): 260$(br)$(thing)Density$(): 0.55$(br)$(thing)Type$(): Pipe Vein$(br)$(thing)Y$(): 0 — 120$(br)$(thing)Height$(): 60$(br)$(thing)Radius$(): 12$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Basalt, Basalt, Gabbro, Phonolite", @@ -942,6 +1218,113 @@ "text": "$(thing)Percentage$(): 10%$(br)$(thing)Source of$(): Magnesium, Iron$(br)$(thing)Formula$(): Mg₂Fe(SiO₂)₂", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Rarity$(): 180$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Disc Vein$(br)$(thing)Y$(): 10 — 100$(br)$(thing)Size$(): 40$(br)$(thing)Height$(): 9$(br)$(thing)Indicator Max Depth$(): 20$(br2)$(thing)Stone Types$(): Anorthosite, Norite, Phonolite", + "title": "Gypsum & Calcite", + "type": "patchouli:text", + "anchor": "moon_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Gypsum", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 35%$(br)$(thing)Used for$(): Alabaster (dyeable) bricks$(br)$(thing)Formula$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Calcite", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 25%$(br)$(thing)Source of$(): Calcium$(br)$(thing)Formula$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Borax", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 20%$(br)$(thing)Source of$(): Sodium, Boron$(br)$(thing)Formula$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Alunite", + "multiblock": { + "mapping": { + "0": "#forge:ores/alunite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 15%$(br)$(thing)Source of$(): Potassium, Aluminium$(br)$(thing)Formula$(): KAl₃Si₂H₆O₁₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Olivine", + "multiblock": { + "mapping": { + "0": "#forge:ores/olivine" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 5%$(br)$(thing)Source of$(): Magnesium, Iron$(br)$(thing)Formula$(): Mg₂Fe(SiO₂)₂", + "type": "patchouli:multiblock" + }, { "Type": "patchouli:text", "text": "$(thing)Rarity$(): 250$(br)$(thing)Density$(): 0.25$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 0 — 120$(br)$(thing)Size$(): 35$(br)$(thing)Indicator Max Depth$(): 50$(br2)$(thing)Stone Types$(): Anorthosite, Diorite, Gabbro, Norite", @@ -1011,10 +1394,10 @@ }, { "Type": "patchouli:multiblock", - "name": "Pollucite", + "name": "Aluminium", "multiblock": { "mapping": { - "0": "#forge:ores/pollucite" + "0": "#forge:ores/aluminium" }, "pattern": [ [ @@ -1026,7 +1409,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Percentage$(): 14%$(br)$(thing)Source of$(): Caesium, Aluminium$(br)$(thing)Formula$(): Cs₂Al₂Si₄(H₂O)₂O₁₂", + "text": "$(thing)Percentage$(): 14%$(br)$(thing)Source of$(): Aluminium$(br)$(thing)Formula$(): Al", "type": "patchouli:multiblock" }, { @@ -1857,6 +2240,98 @@ "text": "$(thing)Percentage$(): 15%$(br)$(thing)Source of$(): Iron, Titanium, Nitrogen$(br)$(thing)Formula$(): (Mg₂Fe(SiO₂)₂)₂(TiO₂)N₄", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Rarity$(): 190$(br)$(thing)Density$(): 0.3$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 50 — 128$(br)$(thing)Size$(): 40$(br)$(thing)Indicator Max Depth$(): 60$(br2)$(thing)Stone Types$(): Andesite, Dacite, Phonolite, Rhyolite", + "title": "Tetrahedrite & Chalcocite", + "type": "patchouli:text", + "anchor": "moon_tetrahedrite" + }, + { + "Type": "patchouli:multiblock", + "name": "Tetrahedrite", + "multiblock": { + "mapping": { + "0": "#forge:ores/tetrahedrite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 40%$(br)$(thing)Melts into$(): Copper$(br)$(thing)Formula$(): Cu₃SbS₃Fe", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Chalcocite", + "multiblock": { + "mapping": { + "0": "#forge:ores/chalcocite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 25%$(br)$(thing)Source of$(): Copper$(br)$(thing)Formula$(): Cu₂S", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Stibnite", + "multiblock": { + "mapping": { + "0": "#forge:ores/stibnite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 20%$(br)$(thing)Smelts into$(): Antimony$(br)$(thing)Formula$(): Sb₂S₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Native Copper", + "multiblock": { + "mapping": { + "0": "#forge:ores/copper" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 15%$(br)$(thing)Melts into$(): Copper$(br)$(thing)Formula$(): Cu", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Rarity$(): 210$(br)$(thing)Density$(): 0.5$(br)$(thing)Type$(): Disc Vein$(br)$(thing)Y$(): 0 — 120$(br)$(thing)Size$(): 64$(br)$(thing)Height$(): 25$(br)$(thing)Indicator Max Depth$(): 20$(br2)$(thing)Stone Types$(): Andesite, Anorthosite, Basalt, Dacite, Diorite, Gabbro, Norite, Phonolite, Rhyolite", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_ore_index.json index 83564331f..00bf20f57 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_ore_index.json @@ -14,42 +14,42 @@ }, { "Type": "patchouli:text", - "text": "$(li)Almandine: $(l:tfg_ores/nether_vein_index#nether_sapphire)38%$(/l)$()$(li)Alunite: $(l:tfg_ores/nether_vein_index#nether_saltpeter)15%$(/l)$()$(li)Amethyst: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Anthracite: $(l:tfg_ores/nether_vein_index#nether_anthracite)100%$(/l)$()$(li)Apatite: $(l:tfg_ores/nether_vein_index#nether_apatite)50%$(/l)$()$(li)Asbestos: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Barite: $(l:tfg_ores/nether_vein_index#nether_quartz)20%$(/l)$()$(li)Basaltic Mineral Sands: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)35%$(/l)$()$(li)Bastnasite: $(l:tfg_ores/nether_vein_index#nether_monazite)50%$(/l)$()$(li)Bentonite: $(l:tfg_ores/nether_vein_index#nether_olivine)35%$(/l)$()$(li)Beryllium: $(l:tfg_ores/nether_vein_index#nether_beryllium)33%$(/l)$()$(li)Blue Topaz: $(l:tfg_ores/nether_vein_index#nether_topaz)35%$(/l)$()$(li)Bornite: $(l:tfg_ores/nether_vein_index#nether_sheldonite)41%$(/l), $(l:tfg_ores/nether_vein_index#nether_topaz)15%$(/l)$()$(li)Calcite: $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()", + "text": "$(li)Almandine: $(l:tfg_ores/nether_vein_index#nether_sapphire)38%$(/l)$()$(li)Alunite: $(l:tfg_ores/nether_vein_index#nether_saltpeter)15%$(/l)$()$(li)Amethyst: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Anthracite: $(l:tfg_ores/nether_vein_index#nether_anthracite)100%$(/l)$()$(li)Apatite: $(l:tfg_ores/nether_vein_index#nether_apatite)50%$(/l)$()$(li)Asbestos: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Barite: $(l:tfg_ores/nether_vein_index#nether_quartz)20%$(/l)$()$(li)Basaltic Mineral Sands: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)35%$(/l)$()$(li)Bastnasite: $(l:tfg_ores/nether_vein_index#nether_monazite)50%$(/l)$()$(li)Bentonite: $(l:tfg_ores/nether_vein_index#nether_olivine)35%$(/l)$()$(li)Beryllium: $(l:tfg_ores/nether_vein_index#nether_beryllium)33%$(/l)$()$(li)Blue Topaz: $(l:tfg_ores/nether_vein_index#nether_topaz)35%$(/l)$()$(li)Borax: $(l:tfg_ores/nether_vein_index#nether_gypsum)20%$(/l)$()$(li)Bornite: $(l:tfg_ores/nether_vein_index#nether_sheldonite)41%$(/l), $(l:tfg_ores/nether_vein_index#nether_topaz)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Cassiterite: $(l:tfg_ores/nether_vein_index#nether_cassiterite)40%$(/l)$()$(li)Cassiterite Sand: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)35%$(/l)$()$(li)Chalcocite: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Chromite: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()$(li)Coal: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Cobalt: $(l:tfg_ores/nether_vein_index#nether_garnierite)14%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)Cooperite: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()$(li)Diamond: $(l:tfg_ores/nether_vein_index#nether_graphite)40%$(/l)$()$(li)Diatomite: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()$(li)Electrotine: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()$(li)Emerald: $(l:tfg_ores/nether_vein_index#nether_beryllium)47%$(/l)$()", + "text": "$(li)Calcite: $(l:tfg_ores/nether_vein_index#nether_gypsum)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()$(li)Cassiterite: $(l:tfg_ores/nether_vein_index#nether_cassiterite)40%$(/l)$()$(li)Cassiterite Sand: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)35%$(/l)$()$(li)Chalcocite: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Chromite: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()$(li)Coal: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Cobalt: $(l:tfg_ores/nether_vein_index#nether_garnierite)14%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)Cooperite: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()$(li)Diamond: $(l:tfg_ores/nether_vein_index#nether_graphite)40%$(/l)$()$(li)Diatomite: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()$(li)Electrotine: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Fuller's Earth: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)Galena: $(l:tfg_ores/nether_vein_index#nether_silver)30%$(/l)$()$(li)Garnet Sand: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Garnierite: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l)$()$(li)Glauconite Sand: $(l:tfg_ores/nether_vein_index#nether_lubricant)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_olivine)15%$(/l)$()$(li)Goethite: $(l:tfg_ores/nether_vein_index#nether_goethite)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Granitic Mineral Sand: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)Graphite: $(l:tfg_ores/nether_vein_index#nether_graphite)45%$(/l)$()$(li)Green Sapphire: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l)$()$(li)Grossular: $(l:tfg_ores/nether_vein_index#nether_manganese)37%$(/l)$()$(li)Gypsum: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)15%$(/l)$()$(li)Hematite: $(l:tfg_ores/nether_vein_index#nether_hematite)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)5%$(/l)$()$(li)Kyanite: $(l:tfg_ores/nether_vein_index#nether_mica)46%$(/l)$()$(li)Lapis: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()", + "text": "$(li)Emerald: $(l:tfg_ores/nether_vein_index#nether_beryllium)47%$(/l)$()$(li)Fuller's Earth: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gypsum)15%$(/l)$()$(li)Galena: $(l:tfg_ores/nether_vein_index#nether_silver)30%$(/l)$()$(li)Garnet Sand: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Garnierite: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l)$()$(li)Glauconite Sand: $(l:tfg_ores/nether_vein_index#nether_lubricant)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_olivine)15%$(/l)$()$(li)Goethite: $(l:tfg_ores/nether_vein_index#nether_goethite)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Granitic Mineral Sand: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)Graphite: $(l:tfg_ores/nether_vein_index#nether_graphite)45%$(/l)$()$(li)Green Sapphire: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l)$()$(li)Grossular: $(l:tfg_ores/nether_vein_index#nether_manganese)37%$(/l)$()$(li)Gypsum: $(l:tfg_ores/nether_vein_index#nether_gypsum)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)15%$(/l)$()$(li)Hematite: $(l:tfg_ores/nether_vein_index#nether_hematite)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)5%$(/l)$()$(li)Kyanite: $(l:tfg_ores/nether_vein_index#nether_mica)46%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Lazurite: $(l:tfg_ores/nether_vein_index#nether_lapis)35%$(/l)$()$(li)Lead: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Lithium: $(l:tfg_ores/nether_vein_index#nether_scheelite)20%$(/l)$()$(li)Magnesite: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Magnetite: $(l:tfg_ores/nether_vein_index#nether_magnetite)20%$(/l)$()$(li)Malachite: $(l:tfg_ores/nether_vein_index#nether_goethite)20%$(/l)$()$(li)Mica: $(l:tfg_ores/nether_vein_index#nether_mica)33%$(/l)$()$(li)Molybdenite: $(l:tfg_ores/nether_vein_index#nether_molybdenum)31%$(/l)$()$(li)Monazite: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Naquadah: $(l:tfg_ores/nether_vein_index#nether_naquadah)75%$(/l)$()$(li)Native Copper: $(l:tfg_ores/nether_vein_index#nether_copper)65%$(/l), $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)30%$(/l)$()$(li)Native Gold: $(l:tfg_ores/nether_vein_index#nether_gold)75%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)5%$(/l)$()$(li)Native Silver: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Neodymium: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()", + "text": "$(li)Lapis: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Lazurite: $(l:tfg_ores/nether_vein_index#nether_lapis)35%$(/l)$()$(li)Lead: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Lithium: $(l:tfg_ores/nether_vein_index#nether_scheelite)20%$(/l)$()$(li)Magnesite: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Magnetite: $(l:tfg_ores/nether_vein_index#nether_magnetite)20%$(/l)$()$(li)Malachite: $(l:tfg_ores/nether_vein_index#nether_goethite)20%$(/l)$()$(li)Mica: $(l:tfg_ores/nether_vein_index#nether_mica)33%$(/l)$()$(li)Molybdenite: $(l:tfg_ores/nether_vein_index#nether_molybdenum)31%$(/l)$()$(li)Monazite: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Naquadah: $(l:tfg_ores/nether_vein_index#nether_naquadah)75%$(/l)$()$(li)Native Copper: $(l:tfg_ores/nether_vein_index#nether_copper)65%$(/l), $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)30%$(/l)$()$(li)Native Gold: $(l:tfg_ores/nether_vein_index#nether_gold)75%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)5%$(/l)$()$(li)Native Silver: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Nether Quartz: $(l:tfg_ores/nether_vein_index#nether_quartz)54%$(/l)$()$(li)Nickel: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l), $(l:tfg_ores/nether_vein_index#nether_sheldonite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_molybdenum)15%$(/l)$()$(li)Olivine: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Opal: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Pentlandite: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_lubricant)15%$(/l)$()$(li)Pitchblende: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Platinum: $(l:tfg_ores/nether_vein_index#nether_sheldonite)5%$(/l)$()$(li)Plutonium: $(l:tfg_ores/nether_vein_index#nether_naquadah)25%$(/l)$()$(li)Pollucite: $(l:tfg_ores/nether_vein_index#nether_mica)20%$(/l)$()$(li)Powellite: $(l:tfg_ores/nether_vein_index#nether_molybdenum)10%$(/l)$()$(li)Pyrite: $(l:tfg_ores/nether_vein_index#nether_sulfur)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)10%$(/l)$()$(li)Pyrochlore: $(l:tfg_ores/nether_vein_index#nether_apatite)15%$(/l)$()$(li)Pyrolusite: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Pyrope: $(l:tfg_ores/nether_vein_index#nether_sapphire)27%$(/l)$()", + "text": "$(li)Neodymium: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Nether Quartz: $(l:tfg_ores/nether_vein_index#nether_quartz)54%$(/l)$()$(li)Nickel: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l), $(l:tfg_ores/nether_vein_index#nether_sheldonite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_molybdenum)15%$(/l)$()$(li)Olivine: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Opal: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Pentlandite: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_lubricant)15%$(/l)$()$(li)Pitchblende: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Platinum: $(l:tfg_ores/nether_vein_index#nether_sheldonite)5%$(/l)$()$(li)Plutonium: $(l:tfg_ores/nether_vein_index#nether_naquadah)25%$(/l)$()$(li)Pollucite: $(l:tfg_ores/nether_vein_index#nether_mica)20%$(/l)$()$(li)Powellite: $(l:tfg_ores/nether_vein_index#nether_molybdenum)10%$(/l)$()$(li)Pyrite: $(l:tfg_ores/nether_vein_index#nether_sulfur)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)10%$(/l)$()$(li)Pyrochlore: $(l:tfg_ores/nether_vein_index#nether_apatite)15%$(/l)$()$(li)Pyrolusite: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Quartzite: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)Red Garnet: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)Redstone: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()$(li)Ruby: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()$(li)Saltpeter: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l)$()$(li)Sapphire: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Scheelite: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)Soapstone: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)Sodalite: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Spessartine: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/nether_vein_index#nether_sphalerite)40%$(/l), $(l:tfg_ores/nether_vein_index#nether_sulfur)15%$(/l)$()$(li)Stibnite: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()$(li)Sulfur: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()", + "text": "$(li)Pyrope: $(l:tfg_ores/nether_vein_index#nether_sapphire)27%$(/l)$()$(li)Quartzite: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)Red Garnet: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)Redstone: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()$(li)Ruby: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()$(li)Saltpeter: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l)$()$(li)Sapphire: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Scheelite: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)Soapstone: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)Sodalite: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Spessartine: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/nether_vein_index#nether_sphalerite)40%$(/l), $(l:tfg_ores/nether_vein_index#nether_sulfur)15%$(/l)$()$(li)Stibnite: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Sylvite: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Talc: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Tantalite: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Thorium: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Tin: $(l:tfg_ores/nether_vein_index#nether_cassiterite)60%$(/l)$()$(li)Topaz: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Uraninite: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l)$()$(li)Yellow Garnet: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()", + "text": "$(li)Sulfur: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()$(li)Sylvite: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Talc: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Tantalite: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Thorium: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Tin: $(l:tfg_ores/nether_vein_index#nether_cassiterite)60%$(/l)$()$(li)Topaz: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Uraninite: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Yellow Limonite: $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()", + "text": "$(li)Yellow Garnet: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()$(li)Yellow Limonite: $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_vein_index.json index eef149cdd..650087f59 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_vein_index.json @@ -19,12 +19,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_graphite)Graphite & Diamond$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_hematite)Hematite & Limonite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_mica)Kyanite, Mica, & Bauxite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lapis)Lapis, Lazurite, & Sodalite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_manganese)Manganese & Tantalum$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_basaltic_sands)Mineral Sands$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_naquadah)Naquadah & Plutonium$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_quartz)Nether Quartz$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_redstone)Redstone, Cinnabar, & Ruby$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_saltpeter)Saltpeter & Electrotine$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sapphire)Sapphire & Almandine$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_scheelite)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_silver)Silver, Galena, & Lead$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lubricant)Soapstone, Talc, & Trona$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_graphite)Graphite & Diamond$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_gypsum)Gypsum & Calcite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_hematite)Hematite & Limonite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_mica)Kyanite, Mica, & Bauxite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lapis)Lapis, Lazurite, & Sodalite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_manganese)Manganese & Tantalum$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_basaltic_sands)Mineral Sands$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_naquadah)Naquadah & Plutonium$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_quartz)Nether Quartz$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_redstone)Redstone, Cinnabar, & Ruby$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_saltpeter)Saltpeter & Electrotine$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sapphire)Sapphire & Almandine$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_scheelite)Scheelite & Tungstate$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_silver)Silver, Galena, & Lead$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_sphalerite)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sulfur)Sulfur & Pyrite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sylvite)Sylvite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_tetrahedrite)Tetrahedrite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_topaz)Topaz & Chalcocite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_pitchblende)Uraninite & Pitchblende$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_molybdenum)Wulfenite & Molybdenite$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_lubricant)Soapstone, Talc, & Trona$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sphalerite)Sphalerite & Pyrite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sulfur)Sulfur & Pyrite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sylvite)Sylvite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_tetrahedrite)Tetrahedrite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_topaz)Topaz & Chalcocite$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_pitchblende)Uraninite & Pitchblende$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_molybdenum)Wulfenite & Molybdenite$()$()", "type": "patchouli:text" }, { @@ -1257,6 +1257,98 @@ "text": "$(thing)Percentage$(): 15%$(br)$(thing)Used for$(): Fuel, Distillation$(br)$(thing)Formula$(): C", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Rarity$(): 180$(br)$(thing)Density$(): 0.4$(br)$(thing)Type$(): Disc Vein$(br)$(thing)Y$(): 32 — 128$(br)$(thing)Size$(): 40$(br)$(thing)Height$(): 9$(br2)$(thing)Stone Types$(): Migmatite, Pyroxenite, Travertine", + "title": "Gypsum & Calcite", + "type": "patchouli:text", + "anchor": "nether_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Gypsum", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 35%$(br)$(thing)Used for$(): Alabaster (dyeable) bricks$(br)$(thing)Formula$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Calcite", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 30%$(br)$(thing)Source of$(): Calcium$(br)$(thing)Formula$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Borax", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 20%$(br)$(thing)Source of$(): Sodium, Boron$(br)$(thing)Formula$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Fuller's Earth", + "multiblock": { + "mapping": { + "0": "#forge:ores/fullers_earth" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Percentage$(): 15%$(br)$(thing)Source of$(): Magnesium$(br)$(thing)Formula$(): MgSi₄H(H₂O)₄O₁₁", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Rarity$(): 220$(br)$(thing)Density$(): 0.45$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 0 — 128$(br)$(thing)Size$(): 35$(br2)$(thing)Stone Types$(): Basalt, Migmatite, Pyroxenite, Travertine", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_ore_index.json index af8ff8e08..88ba2dfe7 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_ore_index.json @@ -19,7 +19,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Bentonita: $(l:tfg_ores/earth_vein_index#normal_olivine)35%$(/l)$()$(li)Berílio: $(l:tfg_ores/earth_vein_index#normal_beryllium)35%$(/l)$()$(li)Bismuto: $(l:tfg_ores/earth_vein_index#surface_bismuthinite)90%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)80%$(/l)$()$(li)Bórax: $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l)$()$(li)Bornita: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)Calcita: $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)Calcocita: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Calcopirita: $(l:tfg_ores/earth_vein_index#surface_copper)61%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)20%$(/l)$()$(li)Carvão: $(l:tfg_ores/earth_vein_index#normal_coal)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_graphite)30%$(/l)$()$(li)Cassiterita: $(l:tfg_ores/earth_vein_index#surface_cassiterite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_copper)5%$(/l)$()$(li)Chumbo: $(l:tfg_ores/earth_vein_index#normal_silver)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)11%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)7%$(/l)$()$(li)Cianita: $(l:tfg_ores/earth_vein_index#normal_mica)35%$(/l)$()$(li)Cinábrio: $(l:tfg_ores/earth_vein_index#normal_redstone)20%$(/l)$()$(li)Cobaltita: $(l:tfg_ores/earth_vein_index#normal_garnierite)20%$(/l)$()", + "text": "$(li)Bentonita: $(l:tfg_ores/earth_vein_index#normal_olivine)35%$(/l)$()$(li)Berílio: $(l:tfg_ores/earth_vein_index#normal_beryllium)35%$(/l)$()$(li)Bismuto: $(l:tfg_ores/earth_vein_index#surface_bismuthinite)90%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)80%$(/l)$()$(li)Bórax: $(l:tfg_ores/earth_vein_index#normal_gypsum)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l)$()$(li)Bornita: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)Calcita: $(l:tfg_ores/earth_vein_index#normal_gypsum)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)Calcocita: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Calcopirita: $(l:tfg_ores/earth_vein_index#surface_copper)61%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)20%$(/l)$()$(li)Carvão: $(l:tfg_ores/earth_vein_index#normal_coal)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_graphite)30%$(/l)$()$(li)Cassiterita: $(l:tfg_ores/earth_vein_index#surface_cassiterite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_copper)5%$(/l)$()$(li)Chumbo: $(l:tfg_ores/earth_vein_index#normal_silver)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)11%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)7%$(/l)$()$(li)Cianita: $(l:tfg_ores/earth_vein_index#normal_mica)35%$(/l)$()$(li)Cinábrio: $(l:tfg_ores/earth_vein_index#normal_redstone)20%$(/l)$()$(li)Cobaltita: $(l:tfg_ores/earth_vein_index#normal_garnierite)20%$(/l)$()", "type": "patchouli:text" }, { @@ -29,7 +29,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Fosfato Tricálcico: $(l:tfg_ores/earth_vein_index#normal_apatite)35%$(/l)$()$(li)Galena: $(l:tfg_ores/earth_vein_index#normal_silver)30%$(/l)$()$(li)Garnierita: $(l:tfg_ores/earth_vein_index#normal_garnierite)30%$(/l)$()$(li)Gipsita: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)15%$(/l)$()$(li)Glossulária: $(l:tfg_ores/earth_vein_index#normal_manganese)37%$(/l)$()$(li)Goethita: $(l:tfg_ores/earth_vein_index#deep_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)5%$(/l)$()$(li)Grafite: $(l:tfg_ores/earth_vein_index#normal_graphite)45%$(/l)$()$(li)Granada Amarela: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)15%$(/l)$()$(li)Granada Vermelha: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)5%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)5%$(/l)$()$(li)Hematita: $(l:tfg_ores/earth_vein_index#normal_hematite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)5%$(/l)$()$(li)Lápis-lazúri: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)Lazurita: $(l:tfg_ores/earth_vein_index#normal_lapis)35%$(/l)$()$(li)Lepidorita: $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)15%$(/l)$()$(li)Limonita Amarela: $(l:tfg_ores/earth_vein_index#normal_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l)$()", + "text": "$(li)Fosfato Tricálcico: $(l:tfg_ores/earth_vein_index#normal_apatite)35%$(/l)$()$(li)Galena: $(l:tfg_ores/earth_vein_index#normal_silver)30%$(/l)$()$(li)Garnierita: $(l:tfg_ores/earth_vein_index#normal_garnierite)30%$(/l)$()$(li)Gipsita: $(l:tfg_ores/earth_vein_index#normal_gypsum)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)15%$(/l)$()$(li)Glossulária: $(l:tfg_ores/earth_vein_index#normal_manganese)37%$(/l)$()$(li)Goethita: $(l:tfg_ores/earth_vein_index#deep_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)5%$(/l)$()$(li)Grafite: $(l:tfg_ores/earth_vein_index#normal_graphite)45%$(/l)$()$(li)Granada Amarela: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)15%$(/l)$()$(li)Granada Vermelha: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)5%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)5%$(/l)$()$(li)Hematita: $(l:tfg_ores/earth_vein_index#normal_hematite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)5%$(/l)$()$(li)Lápis-lazúri: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)Lazurita: $(l:tfg_ores/earth_vein_index#normal_lapis)35%$(/l)$()$(li)Lepidorita: $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)15%$(/l)$()$(li)Limonita Amarela: $(l:tfg_ores/earth_vein_index#normal_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l)$()", "type": "patchouli:text" }, { @@ -44,7 +44,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Safira: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)8%$(/l)$()$(li)Safira Verde: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l)$()$(li)Sal: $(l:tfg_ores/earth_vein_index#normal_salt)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)30%$(/l)$()$(li)Sal-gema: $(l:tfg_ores/earth_vein_index#normal_salt)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)20%$(/l)$()$(li)Salitre: $(l:tfg_ores/earth_vein_index#normal_saltpeter)35%$(/l)$()$(li)Sheelita: $(l:tfg_ores/earth_vein_index#deep_scheelite)45%$(/l)$()$(li)Sodalita: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)Talco: $(l:tfg_ores/earth_vein_index#normal_lubricant)20%$(/l)$()$(li)Tantalita: $(l:tfg_ores/earth_vein_index#normal_manganese)12%$(/l)$()$(li)Terra de Fuller: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Tetraedrita: $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)50%$(/l)$()$(li)Topázio: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Topázio Azul: $(l:tfg_ores/earth_vein_index#deep_topaz)35%$(/l)$()$(li)Tório: $(l:tfg_ores/earth_vein_index#normal_beryllium)15%$(/l)$()", + "text": "$(li)Safira: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)8%$(/l)$()$(li)Safira Verde: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l)$()$(li)Sal: $(l:tfg_ores/earth_vein_index#normal_salt)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)30%$(/l)$()$(li)Sal-gema: $(l:tfg_ores/earth_vein_index#normal_salt)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)20%$(/l)$()$(li)Salitre: $(l:tfg_ores/earth_vein_index#normal_saltpeter)35%$(/l)$()$(li)Sheelita: $(l:tfg_ores/earth_vein_index#deep_scheelite)45%$(/l)$()$(li)Sodalita: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)Talco: $(l:tfg_ores/earth_vein_index#normal_lubricant)20%$(/l)$()$(li)Tantalita: $(l:tfg_ores/earth_vein_index#normal_manganese)12%$(/l)$()$(li)Terra de Fuller: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_gypsum)15%$(/l)$()$(li)Tetraedrita: $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)50%$(/l)$()$(li)Topázio: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Topázio Azul: $(l:tfg_ores/earth_vein_index#deep_topaz)35%$(/l)$()$(li)Tório: $(l:tfg_ores/earth_vein_index#normal_beryllium)15%$(/l)$()", "type": "patchouli:text" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_vein_index.json index af283d506..f1d4c2eb5 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/earth_vein_index.json @@ -19,17 +19,17 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)Cooperita e Bornita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)Cromita e Magnetita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Enxofre e Pirita$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Esfalerita e Enxofre$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Esfalerita e Pirita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)Esmeralda e Berílio$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Espodumena e Lepidolita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Garnierita e Cobaltita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Goethita e Malaquita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Grafite e Diamante$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Granada e Areia Cassiterita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Hematita e Limonita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Hematita, Goethita e Rubi$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Lápis-lazúri, Lazurita e Sodalita$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)Cooperita e Bornita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)Cromita e Magnetita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Enxofre e Pirita$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Esfalerita e Enxofre$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Esfalerita e Pirita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)Esmeralda e Berílio$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Espodumena e Lepidolita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Garnierita e Cobaltita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gypsum)Gipsita e Calcita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Goethita e Malaquita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Grafite e Diamante$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Granada e Areia Cassiterita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Hematita e Limonita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Hematita, Goethita e Rubi$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Limonita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Magnetita e Vanádio$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Manganês e Tântalo$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Opala e Granada$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Ouro (Profundo)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Ouro, Limonita e Hematita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Pedra-sabão, Talco e Trona$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Prata, Galena e Chumbo$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Quartzos$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Redstone, Cinábrio e Rubi$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Safira e Almandina$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Sais e Bórax$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Salitre e Eletrotina$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Sheelita e Tungstato$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Lápis-lazúri, Lazurita e Sodalita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Limonita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Magnetita e Vanádio$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Manganês e Tântalo$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Opala e Granada$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Ouro (Profundo)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Ouro, Limonita e Hematita$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Pedra-sabão, Talco e Trona$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Prata, Galena e Chumbo$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Quartzos$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Redstone, Cinábrio e Rubi$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Safira e Almandina$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Sais e Bórax$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Salitre e Eletrotina$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Tetraedrita (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Tetraedrita (Superfície)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Topázio e Calcocita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Uraninita e Pechblenda$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Wulfenita e Molibdenita$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Sheelita e Tungstato$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Tetraedrita (Normal)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Tetraedrita (Superfície)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Topázio e Calcocita$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Uraninita e Pechblenda$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Wulfenita e Molibdenita$()$()", "type": "patchouli:text" }, { @@ -1656,6 +1656,98 @@ "text": "$(thing)Porcentagem$(): 10%$(br)$(thing)Derrete em$(): Níquel$(br)$(thing)Fórmula$(): Ni", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Raridade$(): 180$(br)$(thing)Densidade$(): 0.3$(br)$(thing)Tipo$(): Veio em Disco$(br)$(thing)Y$(): -32 — 60$(br)$(thing)Tamanho$(): 40$(br)$(thing)Altura$(): 9$(br)$(thing)Profundidade Máxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Argilito, Calcário, Cherte, Conglomerado, Dolomito, Folhelho, Giz", + "title": "Gipsita e Calcita", + "type": "patchouli:text", + "anchor": "normal_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Gipsita", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 35%$(br)$(thing)Usado para$(): Tijolos de Alabastro (tingíveis)$(br)$(thing)Fórmula$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Calcita", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 30%$(br)$(thing)Fonte de$(): Cálcio$(br)$(thing)Fórmula$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Bórax", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 20%$(br)$(thing)Fonte de$(): Sódio, Boro$(br)$(thing)Fórmula$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Terra de Fuller", + "multiblock": { + "mapping": { + "0": "#forge:ores/fullers_earth" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 15%$(br)$(thing)Fonte de$(): Magnésio$(br)$(thing)Fórmula$(): MgSi₄H(H₂O)₄O₁₁", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Raridade$(): 240$(br)$(thing)Densidade$(): 0.35$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): -64 — 30$(br)$(thing)Tamanho$(): 32$(br)$(thing)Profundidade Máxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Calcário, Mármore", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_ore_index.json new file mode 100644 index 000000000..96566acf8 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_ore_index.json @@ -0,0 +1,22 @@ +{ + "__credits__": "This page was automatically generated by OresToFieldGuide.", + "name": "Mars Ore Index", + "icon": "tfc:ore/normal_hematite", + "category": "tfc:tfg_ores", + "read_by_default": true, + "secret": false, + "pages": [ + { + "Type": "patchouli:text", + "text": "Este é o $(thing)Índice de Minérios$() para $(thing)Mars$(). Todos os minérios estão ordenados alfabeticamente e do veio mais rico para o mais pobre. Você pode clicar neles para saber mais sobre cada veio.", + "title": "Mars Ore Index", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Hematita: $(l:tfg_ores/mars_vein_index#mars_hematite)100%$(/l)$()", + "type": "patchouli:text" + } + ], + "sortnum": 6 +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_vein_index.json new file mode 100644 index 000000000..342df1e59 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/mars_vein_index.json @@ -0,0 +1,49 @@ +{ + "__credits__": "This page was automatically generated by OresToFieldGuide.", + "name": "Mars Vein Index", + "icon": "gtceu:mars_stone_hematite_ore", + "category": "tfc:tfg_ores", + "read_by_default": true, + "secret": false, + "pages": [ + { + "Type": "patchouli:text", + "text": "Este é o $(thing)Índice de Veios$() para $(item)Mars$(). Cada veio contém detalhes sobre sua raridade, densidade, tipo de veio, altura onde é encontrado, tamanhos, tipos de rocha em que aparece e mais.", + "title": "Mars Vein Index", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_hematite)(Placeholder Vein)$()$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(thing)Raridade$(): 210$(br)$(thing)Densidade$(): 0.4$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): -16 — 100$(br)$(thing)Tamanho$(): 40$(br)$(thing)Profundidade Máxima do Indicador$(): 50$(br2)$(thing)Tipos de Pedra$(): Argilita, Argilito, Basalto, Calcário, Cherte, Conglomerado, Dacito, Diorito, Dolomito, Folhelho, Gabro, Giz, Granito, Red Granite, Traquito", + "title": "(Placeholder Vein)", + "type": "patchouli:text", + "anchor": "mars_hematite" + }, + { + "Type": "patchouli:multiblock", + "name": "Hematita", + "multiblock": { + "mapping": { + "0": "#forge:ores/hematite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 100%$(br)$(thing)Derrete em$(): Ferro Fundido$(br)$(thing)Fórmula$(): Fe₂O₃", + "type": "patchouli:multiblock" + } + ], + "sortnum": 7 +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_ore_index.json index aa06f97b3..35ac3acf8 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_ore_index.json @@ -14,27 +14,32 @@ }, { "Type": "patchouli:text", - "text": "$(li)Almandina: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Alumínio: $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l)$()$(li)Apatita: $(l:tfg_ores/moon_vein_index#moon_apatite)23%$(/l)$()$(li)Areia Glauconita: $(l:tfg_ores/moon_vein_index#moon_lubricant)25%$(/l)$()$(li)Armalcolita: $(l:tfg_ores/moon_vein_index#moon_bauxite)21%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Barita: $(l:tfg_ores/moon_vein_index#moon_quartz)5%$(/l)$()$(li)Bastnasita: $(l:tfg_ores/moon_vein_index#moon_monazite)61%$(/l)$()$(li)Bauxita: $(l:tfg_ores/moon_vein_index#moon_bauxite)36%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Berílio: $(l:tfg_ores/moon_vein_index#moon_beryllium)31%$(/l)$()$(li)Bornita: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)15%$(/l)$()$(li)Calcocita: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Chumbo: $(l:tfg_ores/moon_vein_index#moon_silver)23%$(/l)$()$(li)Cianita: $(l:tfg_ores/moon_vein_index#moon_mica)33%$(/l)$()$(li)Cinábrio: $(l:tfg_ores/moon_vein_index#moon_redstone)19%$(/l)$()", + "text": "$(li)Almandina: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Alumínio: $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)14%$(/l)$()$(li)Alunita: $(l:tfg_ores/moon_vein_index#moon_gypsum)15%$(/l)$()$(li)Ametista: $(l:tfg_ores/moon_vein_index#moon_garnet)38%$(/l)$()$(li)Apatita: $(l:tfg_ores/moon_vein_index#moon_apatite)23%$(/l)$()$(li)Areia Glauconita: $(l:tfg_ores/moon_vein_index#moon_lubricant)25%$(/l)$()$(li)Armalcolita: $(l:tfg_ores/moon_vein_index#moon_bauxite)21%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Barita: $(l:tfg_ores/moon_vein_index#moon_quartz)5%$(/l)$()$(li)Bastnasita: $(l:tfg_ores/moon_vein_index#moon_monazite)61%$(/l)$()$(li)Bauxita: $(l:tfg_ores/moon_vein_index#moon_bauxite)36%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)20%$(/l)$()$(li)Berílio: $(l:tfg_ores/moon_vein_index#moon_beryllium)31%$(/l)$()$(li)Bórax: $(l:tfg_ores/moon_vein_index#moon_gypsum)20%$(/l)$()$(li)Bornita: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)15%$(/l)$()$(li)Calcita: $(l:tfg_ores/moon_vein_index#moon_gypsum)25%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Cobaltita: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Cobalto: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)14%$(/l)$()$(li)Cooperita: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()$(li)Cromita: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l)$()$(li)Desh: $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_sphalerite)15%$(/l)$()$(li)Diamante: $(l:tfg_ores/moon_vein_index#moon_graphite)36%$(/l)$()$(li)Eletrotina: $(l:tfg_ores/moon_vein_index#moon_saltpeter)37%$(/l)$()$(li)Esfalerita: $(l:tfg_ores/moon_vein_index#moon_sphalerite)50%$(/l)$()$(li)Esmeralda: $(l:tfg_ores/moon_vein_index#moon_beryllium)45%$(/l)$()$(li)Espessartita: $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Fosfato Tricálcico: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Galena: $(l:tfg_ores/moon_vein_index#moon_silver)28%$(/l)$()$(li)Garnierita: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l)$()$(li)Glossulária: $(l:tfg_ores/moon_vein_index#moon_manganese)37%$(/l)$()", + "text": "$(li)Calcocita: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Calcopirita: $(l:tfg_ores/moon_vein_index#moon_cassiterite)35%$(/l)$()$(li)Cassiterita: $(l:tfg_ores/moon_vein_index#moon_cassiterite)41%$(/l)$()$(li)Chumbo: $(l:tfg_ores/moon_vein_index#moon_silver)23%$(/l)$()$(li)Cianita: $(l:tfg_ores/moon_vein_index#moon_mica)33%$(/l)$()$(li)Cinábrio: $(l:tfg_ores/moon_vein_index#moon_redstone)19%$(/l)$()$(li)Cobaltita: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Cobalto: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)14%$(/l)$()$(li)Cobre Nativo: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)15%$(/l)$()$(li)Cooperita: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()$(li)Cromita: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l)$()$(li)Desh: $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_sphalerite)15%$(/l)$()$(li)Diamante: $(l:tfg_ores/moon_vein_index#moon_graphite)36%$(/l)$()$(li)Eletrotina: $(l:tfg_ores/moon_vein_index#moon_saltpeter)37%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Grafite: $(l:tfg_ores/moon_vein_index#moon_graphite)52%$(/l)$()$(li)Ilmenita: $(l:tfg_ores/moon_vein_index#moon_bauxite)42%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l)$()$(li)Lítio: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()$(li)Magnetita: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l)$()$(li)Magnetita de Vanádio: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Mica: $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Molibdenita: $(l:tfg_ores/moon_vein_index#moon_molybdenum)33%$(/l)$()$(li)Monazita: $(l:tfg_ores/moon_vein_index#moon_monazite)30%$(/l)$()$(li)Neodímio: $(l:tfg_ores/moon_vein_index#moon_monazite)6%$(/l)$()$(li)Níquel: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Olivina: $(l:tfg_ores/moon_vein_index#moon_graphite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_apatite)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_beryllium)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_molybdenum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_redstone)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_silver)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_sapphire)2%$(/l), $(l:tfg_ores/moon_vein_index#moon_monazite)1%$(/l)$()$(li)Ouro Nativo: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Pedra-sabão: $(l:tfg_ores/moon_vein_index#moon_lubricant)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)20%$(/l)$()$(li)Pentlandita: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_lubricant)15%$(/l)$()", + "text": "$(li)Esfalerita: $(l:tfg_ores/moon_vein_index#moon_sphalerite)50%$(/l)$()$(li)Esmeralda: $(l:tfg_ores/moon_vein_index#moon_beryllium)45%$(/l)$()$(li)Espessartita: $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Estanho: $(l:tfg_ores/moon_vein_index#moon_cassiterite)17%$(/l)$()$(li)Estibnita: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)20%$(/l)$()$(li)Fosfato Tricálcico: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Galena: $(l:tfg_ores/moon_vein_index#moon_silver)28%$(/l)$()$(li)Garnierita: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l)$()$(li)Gipsita: $(l:tfg_ores/moon_vein_index#moon_gypsum)35%$(/l)$()$(li)Glossulária: $(l:tfg_ores/moon_vein_index#moon_manganese)37%$(/l)$()$(li)Grafite: $(l:tfg_ores/moon_vein_index#moon_graphite)52%$(/l)$()$(li)Granada Amarela: $(l:tfg_ores/moon_vein_index#moon_garnet)14%$(/l)$()$(li)Granada Vermelha: $(l:tfg_ores/moon_vein_index#moon_garnet)9%$(/l)$()$(li)Ilmenita: $(l:tfg_ores/moon_vein_index#moon_bauxite)42%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Pirita: $(l:tfg_ores/moon_vein_index#moon_sphalerite)35%$(/l)$()$(li)Pirocloro: $(l:tfg_ores/moon_vein_index#moon_apatite)38%$(/l)$()$(li)Pirolusita: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)38%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Piropo: $(l:tfg_ores/moon_vein_index#moon_sapphire)27%$(/l)$()$(li)Platina: $(l:tfg_ores/moon_vein_index#moon_sheldonite)15%$(/l)$()$(li)Polucita: $(l:tfg_ores/moon_vein_index#moon_mica)14%$(/l)$()$(li)Powellita: $(l:tfg_ores/moon_vein_index#moon_molybdenum)16%$(/l)$()$(li)Prata Nativa: $(l:tfg_ores/moon_vein_index#moon_silver)42%$(/l)$()$(li)Quartzito: $(l:tfg_ores/moon_vein_index#moon_quartz)20%$(/l)$()$(li)Quartzo Certus: $(l:tfg_ores/moon_vein_index#moon_quartz)45%$(/l)$()$(li)Quartzo do Nether: $(l:tfg_ores/moon_vein_index#moon_quartz)30%$(/l)$()$(li)Redstone: $(l:tfg_ores/moon_vein_index#moon_redstone)42%$(/l)$()$(li)Rubi: $(l:tfg_ores/moon_vein_index#moon_redstone)33%$(/l)$()$(li)Safira: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)5%$(/l)$()", + "text": "$(li)Lítio: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()$(li)Magnetita: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)20%$(/l)$()$(li)Magnetita de Vanádio: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Mica: $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Molibdenita: $(l:tfg_ores/moon_vein_index#moon_molybdenum)33%$(/l)$()$(li)Monazita: $(l:tfg_ores/moon_vein_index#moon_monazite)30%$(/l)$()$(li)Neodímio: $(l:tfg_ores/moon_vein_index#moon_monazite)6%$(/l)$()$(li)Níquel: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Olivina: $(l:tfg_ores/moon_vein_index#moon_graphite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_apatite)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_beryllium)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_gypsum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_molybdenum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_redstone)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_silver)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_sapphire)2%$(/l), $(l:tfg_ores/moon_vein_index#moon_monazite)1%$(/l)$()$(li)Opala: $(l:tfg_ores/moon_vein_index#moon_garnet)38%$(/l)$()$(li)Ouro Nativo: $(l:tfg_ores/moon_vein_index#moon_gold)55%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Pedra-sabão: $(l:tfg_ores/moon_vein_index#moon_lubricant)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)20%$(/l)$()$(li)Pentlandita: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_lubricant)15%$(/l)$()$(li)Pirita: $(l:tfg_ores/moon_vein_index#moon_sphalerite)35%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Safira Verde: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l)$()$(li)Sal-gema: $(l:tfg_ores/moon_vein_index#moon_beryllium)18%$(/l)$()$(li)Salitre: $(l:tfg_ores/moon_vein_index#moon_saltpeter)29%$(/l)$()$(li)Sheelita: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)Talco: $(l:tfg_ores/moon_vein_index#moon_lubricant)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)12%$(/l)$()$(li)Tantalita: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()$(li)Topázio: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Topázio Azul: $(l:tfg_ores/moon_vein_index#moon_topaz)35%$(/l)$()$(li)Tório: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Trona: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Tungstato: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Wulfenita: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()", + "text": "$(li)Pirocloro: $(l:tfg_ores/moon_vein_index#moon_apatite)38%$(/l)$()$(li)Pirolusita: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)38%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Piropo: $(l:tfg_ores/moon_vein_index#moon_sapphire)27%$(/l)$()$(li)Platina: $(l:tfg_ores/moon_vein_index#moon_sheldonite)15%$(/l)$()$(li)Powellita: $(l:tfg_ores/moon_vein_index#moon_molybdenum)16%$(/l)$()$(li)Prata Nativa: $(l:tfg_ores/moon_vein_index#moon_silver)42%$(/l)$()$(li)Quartzito: $(l:tfg_ores/moon_vein_index#moon_quartz)20%$(/l)$()$(li)Quartzo Certus: $(l:tfg_ores/moon_vein_index#moon_quartz)45%$(/l)$()$(li)Quartzo do Nether: $(l:tfg_ores/moon_vein_index#moon_quartz)30%$(/l)$()$(li)Redstone: $(l:tfg_ores/moon_vein_index#moon_redstone)42%$(/l)$()$(li)Rubi: $(l:tfg_ores/moon_vein_index#moon_redstone)33%$(/l)$()$(li)Safira: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)5%$(/l)$()$(li)Safira Verde: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)5%$(/l)$()$(li)Sal-gema: $(l:tfg_ores/moon_vein_index#moon_beryllium)18%$(/l)$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Salitre: $(l:tfg_ores/moon_vein_index#moon_saltpeter)29%$(/l)$()$(li)Sheelita: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)Talco: $(l:tfg_ores/moon_vein_index#moon_lubricant)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)12%$(/l)$()$(li)Tantalita: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()$(li)Tetraedrita: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)40%$(/l)$()$(li)Topázio: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Topázio Azul: $(l:tfg_ores/moon_vein_index#moon_topaz)35%$(/l)$()$(li)Tório: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Trona: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Tungstato: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Wulfenita: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()$(li)Zeólita: $(l:tfg_ores/moon_vein_index#moon_cassiterite)5%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_vein_index.json index 5fc41c51a..b5a686893 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/moon_vein_index.json @@ -14,12 +14,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Apatita e Pirocloro$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Bastnasita e Monazita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Bauxita e Ilmenita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_mica)Cianita, Mica e Bauxita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sheldonite)Cooperita e Bornita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_magnetite)Cromita e Magnetita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Desh e Ilmenita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sphalerite)Esfalerita e Pirita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_beryllium)Esmeralda e Berílio$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Garnierita e Cobaltita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_graphite)Grafite e Diamante$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_manganese)Manganês e Tântalo$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_lubricant)Pedra-sabão, Talco e Trona$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_pyrolusite)Pirolusita e Cobalto$()$()", + "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_garnet)Ametista, Opala e Granada$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Apatita e Pirocloro$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Bastnasita e Monazita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Bauxita e Ilmenita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_cassiterite)Cassiterita e Calcopirita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_mica)Cianita, Mica e Bauxita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sheldonite)Cooperita e Bornita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_magnetite)Cromita e Magnetita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Desh e Ilmenita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sphalerite)Esfalerita e Pirita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_beryllium)Esmeralda e Berílio$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Garnierita e Cobaltita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_gypsum)Gipsita e Calcita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_graphite)Grafite e Diamante$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_silver)Prata, Galena e Chumbo$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Quartzo Certus$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Redstone, Cinábrio e Rubi$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sapphire)Safira e Almandina$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_saltpeter)Salitre e Eletrotina$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_scheelite)Sheelita e Tungstato$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_topaz)Topázio e Calcosita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Wulfenita e Molibdenita$()$()", + "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_manganese)Manganês e Tântalo$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_gold)Ouro e Magnetita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_lubricant)Pedra-sabão, Talco e Trona$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_pyrolusite)Pirolusita e Cobalto$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_silver)Prata, Galena e Chumbo$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Quartzo Certus$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Redstone, Cinábrio e Rubi$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sapphire)Safira e Almandina$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_saltpeter)Salitre e Eletrotina$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_scheelite)Sheelita e Tungstato$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_tetrahedrite)Tetraedrita e Calcocita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_topaz)Topázio e Calcosita$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Wulfenita e Molibdenita$()$()", "type": "patchouli:text" }, { @@ -27,6 +27,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Raridade$(): 230$(br)$(thing)Densidade$(): 0.35$(br)$(thing)Tipo$(): Veio em Disco$(br)$(thing)Y$(): 10 — 128$(br)$(thing)Tamanho$(): 35$(br)$(thing)Altura$(): 7$(br)$(thing)Profundidade Máxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Andesito, Basalto, Riolito", + "title": "Ametista, Opala e Granada", + "type": "patchouli:text", + "anchor": "moon_garnet" + }, + { + "Type": "patchouli:multiblock", + "name": "Ametista", + "multiblock": { + "mapping": { + "0": "#forge:ores/amethyst" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 38%$(br)$(thing)Fonte de$(): Ferro$(br)$(thing)Fórmula$(): (SiO₂)₄Fe", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Opala", + "multiblock": { + "mapping": { + "0": "#forge:ores/opal" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 38%$(br)$(thing)Fonte de$(): Silício, Oxigênio$(br)$(thing)Fórmula$(): (SiO₂)", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Granada Amarela", + "multiblock": { + "mapping": { + "0": "#forge:ores/yellow_garnet" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 14%$(br)$(thing)Fonte de$(): Andradita, Glossulária, Uvarovita", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Granada Vermelha", + "multiblock": { + "mapping": { + "0": "#forge:ores/red_garnet" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 9%$(br)$(thing)Fonte de$(): Piropo, Almandina, Espessartita", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Raridade$(): 250$(br)$(thing)Densidade$(): 0.3$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 100$(br)$(thing)Tamanho$(): 35$(br)$(thing)Profundidade Máxima do Indicador$(): 50$(br2)$(thing)Tipos de Pedra$(): Anortosito, Diorito, Norito", @@ -278,6 +370,98 @@ "text": "$(thing)Porcentagem$(): 21%$(br)$(thing)Fonte de$(): Magnésio, Rutilo, Titânio$(br)$(thing)Fórmula$(): (Mg,Fe)Ti₂O₅", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Raridade$(): 210$(br)$(thing)Densidade$(): 0.3$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 10 — 128$(br)$(thing)Tamanho$(): 40$(br)$(thing)Profundidade Máxima do Indicador$(): 60$(br2)$(thing)Tipos de Pedra$(): Diorito, Gabro, Granito, Norito", + "title": "Cassiterita e Calcopirita", + "type": "patchouli:text", + "anchor": "moon_cassiterite" + }, + { + "Type": "patchouli:multiblock", + "name": "Cassiterita", + "multiblock": { + "mapping": { + "0": "#forge:ores/cassiterite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 41%$(br)$(thing)Derrete em$(): Estanho$(br)$(thing)Fórmula$(): SnO₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Calcopirita", + "multiblock": { + "mapping": { + "0": "#forge:ores/chalcopyrite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 35%$(br)$(thing)Derrete em$(): Cobre$(br)$(thing)Fórmula$(): CuFeS₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Estanho", + "multiblock": { + "mapping": { + "0": "#forge:ores/tin" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 17%$(br)$(thing)Derrete em$(): Estanho$(br)$(thing)Fórmula$(): Sn", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Zeólita", + "multiblock": { + "mapping": { + "0": "#forge:ores/zeolite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 5%$(br)$(thing)Fonte de$(): Alumínio, Oxigênio$(br)$(thing)Fórmula$(): NaCa₄Si₂₇Al₉(H₂O)₂₈O₇₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Raridade$(): 250$(br)$(thing)Densidade$(): 0.25$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 120$(br)$(thing)Tamanho$(): 35$(br)$(thing)Profundidade Máxima do Indicador$(): 50$(br2)$(thing)Tipos de Pedra$(): Anortosito, Diorito, Gabro, Norito", @@ -347,10 +531,10 @@ }, { "Type": "patchouli:multiblock", - "name": "Polucita", + "name": "Alumínio", "multiblock": { "mapping": { - "0": "#forge:ores/pollucite" + "0": "#forge:ores/aluminium" }, "pattern": [ [ @@ -362,7 +546,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Porcentagem$(): 14%$(br)$(thing)Fonte de$(): Césio, Alumínio$(br)$(thing)Fórmula$(): Cs₂Al₂Si₄(H₂O)₂O₁₂", + "text": "$(thing)Porcentagem$(): 14%$(br)$(thing)Fonte de$(): Alumínio$(br)$(thing)Fórmula$(): Al", "type": "patchouli:multiblock" }, { @@ -957,6 +1141,113 @@ "text": "$(thing)Porcentagem$(): 14%$(br)$(thing)Derrete em$(): Cobalto$(br)$(thing)Fórmula$(): Co", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Raridade$(): 180$(br)$(thing)Densidade$(): 0.3$(br)$(thing)Tipo$(): Veio em Disco$(br)$(thing)Y$(): 10 — 100$(br)$(thing)Tamanho$(): 40$(br)$(thing)Altura$(): 9$(br)$(thing)Profundidade Máxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Anortosito, Fonolito, Norito", + "title": "Gipsita e Calcita", + "type": "patchouli:text", + "anchor": "moon_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Gipsita", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 35%$(br)$(thing)Usado para$(): Tijolos de Alabastro (tingíveis)$(br)$(thing)Fórmula$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Calcita", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 25%$(br)$(thing)Fonte de$(): Cálcio$(br)$(thing)Fórmula$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Bórax", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 20%$(br)$(thing)Fonte de$(): Sódio, Boro$(br)$(thing)Fórmula$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Alunita", + "multiblock": { + "mapping": { + "0": "#forge:ores/alunite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 15%$(br)$(thing)Fonte de$(): Potássio, Alumínio$(br)$(thing)Fórmula$(): KAl₃Si₂H₆O₁₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Olivina", + "multiblock": { + "mapping": { + "0": "#forge:ores/olivine" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 5%$(br)$(thing)Fonte de$(): Magnésio, Ferro$(br)$(thing)Fórmula$(): Mg₂Fe(SiO₂)₂", + "type": "patchouli:multiblock" + }, { "Type": "patchouli:text", "text": "$(thing)Raridade$(): 260$(br)$(thing)Densidade$(): 0.55$(br)$(thing)Tipo$(): Veio Tubular$(br)$(thing)Y$(): 0 — 120$(br)$(thing)Altura$(): 60$(br)$(thing)Raio$(): 12$(br)$(thing)Profundidade Máxima do Indicador$(): 50$(br2)$(thing)Tipos de Pedra$(): Anortosito, Basalto, Basalto, Fonolito, Gabro", @@ -1116,6 +1407,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Raridade$(): 170$(br)$(thing)Densidade$(): 0.4$(br)$(thing)Tipo$(): Veio em Disco$(br)$(thing)Y$(): 10 — 80$(br)$(thing)Tamanho$(): 40$(br)$(thing)Altura$(): 10$(br)$(thing)Profundidade Máxima do Indicador$(): 60$(br2)$(thing)Tipos de Pedra$(): Basalto, Diorito, Granito", + "title": "Ouro e Magnetita", + "type": "patchouli:text", + "anchor": "moon_gold" + }, + { + "Type": "patchouli:multiblock", + "name": "Ouro Nativo", + "multiblock": { + "mapping": { + "0": "#forge:ores/gold" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 55%$(br)$(thing)Derrete em$(): Ouro$(br)$(thing)Fórmula$(): Au", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Bauxita", + "multiblock": { + "mapping": { + "0": "#forge:ores/bauxite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 20%$(br)$(thing)Fonte de$(): Alumínio$(br)$(thing)Fórmula$(): Al₂O₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Magnetita", + "multiblock": { + "mapping": { + "0": "#forge:ores/magnetite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 20%$(br)$(thing)Derrete em$(): Ferro Fundido$(br)$(thing)Fórmula$(): Fe₃O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Safira Verde", + "multiblock": { + "mapping": { + "0": "#forge:ores/green_sapphire" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 5%$(br)$(thing)Fonte de$(): Aluminium$(br)$(thing)Fórmula$(): Al₂O₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Raridade$(): 190$(br)$(thing)Densidade$(): 0.25$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 66$(br)$(thing)Tamanho$(): 36$(br)$(thing)Profundidade Máxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Anortosito, Basalto, Diorito, Gabro, Norito", @@ -1857,6 +2240,98 @@ "text": "$(thing)Porcentagem$(): 10%$(br)$(thing)Fonte de$(): Lítio$(br)$(thing)Fórmula$(): Li", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Raridade$(): 190$(br)$(thing)Densidade$(): 0.3$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 50 — 128$(br)$(thing)Tamanho$(): 40$(br)$(thing)Profundidade Máxima do Indicador$(): 60$(br2)$(thing)Tipos de Pedra$(): Andesito, Dacito, Fonolito, Riolito", + "title": "Tetraedrita e Calcocita", + "type": "patchouli:text", + "anchor": "moon_tetrahedrite" + }, + { + "Type": "patchouli:multiblock", + "name": "Tetraedrita", + "multiblock": { + "mapping": { + "0": "#forge:ores/tetrahedrite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 40%$(br)$(thing)Derrete em$(): Cobre$(br)$(thing)Fórmula$(): Cu₃SbS₃Fe", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Calcocita", + "multiblock": { + "mapping": { + "0": "#forge:ores/chalcocite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 25%$(br)$(thing)Fonte de$(): Cobre$(br)$(thing)Fórmula$(): Cu₂S", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Estibnita", + "multiblock": { + "mapping": { + "0": "#forge:ores/stibnite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 20%$(br)$(thing)Derrete em$(): Antimônio$(br)$(thing)Fórmula$(): Sb₂S₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Cobre Nativo", + "multiblock": { + "mapping": { + "0": "#forge:ores/copper" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 15%$(br)$(thing)Derrete em$(): Cobre$(br)$(thing)Fórmula$(): Cu", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Raridade$(): 210$(br)$(thing)Densidade$(): 0.5$(br)$(thing)Tipo$(): Veio em Disco$(br)$(thing)Y$(): 0 — 120$(br)$(thing)Tamanho$(): 64$(br)$(thing)Altura$(): 25$(br)$(thing)Profundidade Máxima do Indicador$(): 20$(br2)$(thing)Tipos de Pedra$(): Andesito, Anortosito, Basalto, Dacito, Diorito, Fonolito, Gabro, Norito, Riolito", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_ore_index.json index b81e60be6..1c66924f1 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_ore_index.json @@ -19,37 +19,37 @@ }, { "Type": "patchouli:text", - "text": "$(li)Berílio: $(l:tfg_ores/nether_vein_index#nether_beryllium)33%$(/l)$()$(li)Bornita: $(l:tfg_ores/nether_vein_index#nether_sheldonite)41%$(/l), $(l:tfg_ores/nether_vein_index#nether_topaz)15%$(/l)$()$(li)Calcita: $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()$(li)Calcocita: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Calcopirita: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Carvão: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Cassiterita: $(l:tfg_ores/nether_vein_index#nether_cassiterite)40%$(/l)$()$(li)Chumbo: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Cianita: $(l:tfg_ores/nether_vein_index#nether_mica)46%$(/l)$()$(li)Cinábrio: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()$(li)Cobaltita: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)Cobalto: $(l:tfg_ores/nether_vein_index#nether_garnierite)14%$(/l)$()$(li)Cobre Nativo: $(l:tfg_ores/nether_vein_index#nether_copper)65%$(/l), $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)30%$(/l)$()$(li)Cooperita: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()", + "text": "$(li)Berílio: $(l:tfg_ores/nether_vein_index#nether_beryllium)33%$(/l)$()$(li)Bórax: $(l:tfg_ores/nether_vein_index#nether_gypsum)20%$(/l)$()$(li)Bornita: $(l:tfg_ores/nether_vein_index#nether_sheldonite)41%$(/l), $(l:tfg_ores/nether_vein_index#nether_topaz)15%$(/l)$()$(li)Calcita: $(l:tfg_ores/nether_vein_index#nether_gypsum)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()$(li)Calcocita: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Calcopirita: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Carvão: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Cassiterita: $(l:tfg_ores/nether_vein_index#nether_cassiterite)40%$(/l)$()$(li)Chumbo: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Cianita: $(l:tfg_ores/nether_vein_index#nether_mica)46%$(/l)$()$(li)Cinábrio: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()$(li)Cobaltita: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)Cobalto: $(l:tfg_ores/nether_vein_index#nether_garnierite)14%$(/l)$()$(li)Cobre Nativo: $(l:tfg_ores/nether_vein_index#nether_copper)65%$(/l), $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)30%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Cromita: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Diamante: $(l:tfg_ores/nether_vein_index#nether_graphite)40%$(/l)$()$(li)Diatomita: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()$(li)Eletrotina: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()$(li)Enxofre: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()$(li)Esfalerita: $(l:tfg_ores/nether_vein_index#nether_sphalerite)40%$(/l), $(l:tfg_ores/nether_vein_index#nether_sulfur)15%$(/l)$()$(li)Esmeralda: $(l:tfg_ores/nether_vein_index#nether_beryllium)47%$(/l)$()$(li)Espessartita: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Estanho: $(l:tfg_ores/nether_vein_index#nether_cassiterite)60%$(/l)$()$(li)Estibnita: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()$(li)Fosfato Tricálcico: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Galena: $(l:tfg_ores/nether_vein_index#nether_silver)30%$(/l)$()$(li)Garnierita: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l)$()$(li)Gipsita: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)15%$(/l)$()", + "text": "$(li)Cooperita: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()$(li)Cromita: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Diamante: $(l:tfg_ores/nether_vein_index#nether_graphite)40%$(/l)$()$(li)Diatomita: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()$(li)Eletrotina: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()$(li)Enxofre: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()$(li)Esfalerita: $(l:tfg_ores/nether_vein_index#nether_sphalerite)40%$(/l), $(l:tfg_ores/nether_vein_index#nether_sulfur)15%$(/l)$()$(li)Esmeralda: $(l:tfg_ores/nether_vein_index#nether_beryllium)47%$(/l)$()$(li)Espessartita: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Estanho: $(l:tfg_ores/nether_vein_index#nether_cassiterite)60%$(/l)$()$(li)Estibnita: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()$(li)Fosfato Tricálcico: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Galena: $(l:tfg_ores/nether_vein_index#nether_silver)30%$(/l)$()$(li)Garnierita: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Glossulária: $(l:tfg_ores/nether_vein_index#nether_manganese)37%$(/l)$()$(li)Goethita: $(l:tfg_ores/nether_vein_index#nether_goethite)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Grafite: $(l:tfg_ores/nether_vein_index#nether_graphite)45%$(/l)$()$(li)Granada Amarela: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()$(li)Granada Vermelha: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)Hematita: $(l:tfg_ores/nether_vein_index#nether_hematite)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)5%$(/l)$()$(li)Lápis-lazúri: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Lazurita: $(l:tfg_ores/nether_vein_index#nether_lapis)35%$(/l)$()$(li)Limonita Amarela: $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Lítio: $(l:tfg_ores/nether_vein_index#nether_scheelite)20%$(/l)$()$(li)Magnesita: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Magnetita: $(l:tfg_ores/nether_vein_index#nether_magnetite)20%$(/l)$()$(li)Magnetita de Vanádio: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()$(li)Malaquita: $(l:tfg_ores/nether_vein_index#nether_goethite)20%$(/l)$()", + "text": "$(li)Gipsita: $(l:tfg_ores/nether_vein_index#nether_gypsum)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)15%$(/l)$()$(li)Glossulária: $(l:tfg_ores/nether_vein_index#nether_manganese)37%$(/l)$()$(li)Goethita: $(l:tfg_ores/nether_vein_index#nether_goethite)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Grafite: $(l:tfg_ores/nether_vein_index#nether_graphite)45%$(/l)$()$(li)Granada Amarela: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()$(li)Granada Vermelha: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)Hematita: $(l:tfg_ores/nether_vein_index#nether_hematite)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)5%$(/l)$()$(li)Lápis-lazúri: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Lazurita: $(l:tfg_ores/nether_vein_index#nether_lapis)35%$(/l)$()$(li)Limonita Amarela: $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Lítio: $(l:tfg_ores/nether_vein_index#nether_scheelite)20%$(/l)$()$(li)Magnesita: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Magnetita: $(l:tfg_ores/nether_vein_index#nether_magnetite)20%$(/l)$()$(li)Magnetita de Vanádio: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Mica: $(l:tfg_ores/nether_vein_index#nether_mica)33%$(/l)$()$(li)Molibdenita: $(l:tfg_ores/nether_vein_index#nether_molybdenum)31%$(/l)$()$(li)Monazita: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Naquadah: $(l:tfg_ores/nether_vein_index#nether_naquadah)75%$(/l)$()$(li)Neodímio: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Níquel: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l), $(l:tfg_ores/nether_vein_index#nether_sheldonite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_molybdenum)15%$(/l)$()$(li)Olivina: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Opala: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Ouro Nativo: $(l:tfg_ores/nether_vein_index#nether_gold)75%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)5%$(/l)$()$(li)Pechblenda: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Pedra-sabão: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)Pentlandita: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_lubricant)15%$(/l)$()$(li)Pirita: $(l:tfg_ores/nether_vein_index#nether_sulfur)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)10%$(/l)$()$(li)Pirocloro: $(l:tfg_ores/nether_vein_index#nether_apatite)15%$(/l)$()", + "text": "$(li)Malaquita: $(l:tfg_ores/nether_vein_index#nether_goethite)20%$(/l)$()$(li)Mica: $(l:tfg_ores/nether_vein_index#nether_mica)33%$(/l)$()$(li)Molibdenita: $(l:tfg_ores/nether_vein_index#nether_molybdenum)31%$(/l)$()$(li)Monazita: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Naquadah: $(l:tfg_ores/nether_vein_index#nether_naquadah)75%$(/l)$()$(li)Neodímio: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Níquel: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l), $(l:tfg_ores/nether_vein_index#nether_sheldonite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_molybdenum)15%$(/l)$()$(li)Olivina: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Opala: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Ouro Nativo: $(l:tfg_ores/nether_vein_index#nether_gold)75%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)5%$(/l)$()$(li)Pechblenda: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Pedra-sabão: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)Pentlandita: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_lubricant)15%$(/l)$()$(li)Pirita: $(l:tfg_ores/nether_vein_index#nether_sulfur)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)10%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Pirolusita: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Piropo: $(l:tfg_ores/nether_vein_index#nether_sapphire)27%$(/l)$()$(li)Platina: $(l:tfg_ores/nether_vein_index#nether_sheldonite)5%$(/l)$()$(li)Plutônio: $(l:tfg_ores/nether_vein_index#nether_naquadah)25%$(/l)$()$(li)Polucita: $(l:tfg_ores/nether_vein_index#nether_mica)20%$(/l)$()$(li)Powellita: $(l:tfg_ores/nether_vein_index#nether_molybdenum)10%$(/l)$()$(li)Prata Nativa: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Quartzito: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)Quartzo do Nether: $(l:tfg_ores/nether_vein_index#nether_quartz)54%$(/l)$()$(li)Redstone: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()$(li)Rubi: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()$(li)Safira: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Safira Verde: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l)$()$(li)Sal-gema: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()", + "text": "$(li)Pirocloro: $(l:tfg_ores/nether_vein_index#nether_apatite)15%$(/l)$()$(li)Pirolusita: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Piropo: $(l:tfg_ores/nether_vein_index#nether_sapphire)27%$(/l)$()$(li)Platina: $(l:tfg_ores/nether_vein_index#nether_sheldonite)5%$(/l)$()$(li)Plutônio: $(l:tfg_ores/nether_vein_index#nether_naquadah)25%$(/l)$()$(li)Polucita: $(l:tfg_ores/nether_vein_index#nether_mica)20%$(/l)$()$(li)Powellita: $(l:tfg_ores/nether_vein_index#nether_molybdenum)10%$(/l)$()$(li)Prata Nativa: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Quartzito: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)Quartzo do Nether: $(l:tfg_ores/nether_vein_index#nether_quartz)54%$(/l)$()$(li)Redstone: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()$(li)Rubi: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()$(li)Safira: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Safira Verde: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Salitre: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l)$()$(li)Sheelita: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)Silvita: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Sodalita: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Talco: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Tantalita: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Terra de Fuller: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)Tetraedrita: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Topázio: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Topázio Azul: $(l:tfg_ores/nether_vein_index#nether_topaz)35%$(/l)$()$(li)Tório: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Trona: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Tungstato: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Uraninita: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()", + "text": "$(li)Sal-gema: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()$(li)Salitre: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l)$()$(li)Sheelita: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)Silvita: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Sodalita: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Talco: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Tantalita: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Terra de Fuller: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gypsum)15%$(/l)$()$(li)Tetraedrita: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Topázio: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Topázio Azul: $(l:tfg_ores/nether_vein_index#nether_topaz)35%$(/l)$()$(li)Tório: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Trona: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Tungstato: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Wulfenita: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l)$()", + "text": "$(li)Uraninita: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Wulfenita: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_vein_index.json index 40320e307..61c1ee0fd 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/nether_vein_index.json @@ -19,12 +19,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_garnierite)Garnierita e Cobaltita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_goethite)Goethita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_graphite)Grafite e Diamante$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_garnet_tin)Granada e Areia Cassiterita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_hematite)Hematita e Limonita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lapis)Lápis-lazúri, Lazurita e Sodalita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_manganese)Manganês e Tântalo$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_naquadah)Naquadah e Plutônio$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_quartz)Nether Quartzo$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_gold)Ouro e Hematita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lubricant)Pedra-sabão, Talco e Trona$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_silver)Prata, Galena e Chumbo$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_redstone)Redstone, Cinábrio e Rubi$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sapphire)Safira e Almandina$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_garnierite)Garnierita e Cobaltita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_gypsum)Gipsita e Calcita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_goethite)Goethita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_graphite)Grafite e Diamante$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_garnet_tin)Granada e Areia Cassiterita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_hematite)Hematita e Limonita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lapis)Lápis-lazúri, Lazurita e Sodalita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_manganese)Manganês e Tântalo$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_naquadah)Naquadah e Plutônio$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_quartz)Nether Quartzo$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_gold)Ouro e Hematita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lubricant)Pedra-sabão, Talco e Trona$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_silver)Prata, Galena e Chumbo$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_redstone)Redstone, Cinábrio e Rubi$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_saltpeter)Salitre e Eletrotina$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_scheelite)Sheelita e Tungstato$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sylvite)Silvita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_tetrahedrite)Tetraedrita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_topaz)Topázio e Calcosita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_pitchblende)Uraninita e Pechblenda$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_molybdenum)Wulfenita e Molibdenita$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_sapphire)Safira e Almandina$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_saltpeter)Salitre e Eletrotina$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_scheelite)Sheelita e Tungstato$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sylvite)Silvita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_tetrahedrite)Tetraedrita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_topaz)Topázio e Calcosita$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_pitchblende)Uraninita e Pechblenda$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_molybdenum)Wulfenita e Molibdenita$()$()", "type": "patchouli:text" }, { @@ -1207,6 +1207,98 @@ "text": "$(thing)Porcentagem$(): 14%$(br)$(thing)Derrete em$(): Cobalto$(br)$(thing)Fórmula$(): Co", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Raridade$(): 180$(br)$(thing)Densidade$(): 0.4$(br)$(thing)Tipo$(): Veio em Disco$(br)$(thing)Y$(): 32 — 128$(br)$(thing)Tamanho$(): 40$(br)$(thing)Altura$(): 9$(br2)$(thing)Tipos de Pedra$(): Migmatito, Piroxenito, Travertino", + "title": "Gipsita e Calcita", + "type": "patchouli:text", + "anchor": "nether_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Gipsita", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 35%$(br)$(thing)Usado para$(): Tijolos de Alabastro (tingíveis)$(br)$(thing)Fórmula$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Calcita", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 30%$(br)$(thing)Fonte de$(): Cálcio$(br)$(thing)Fórmula$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Bórax", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 20%$(br)$(thing)Fonte de$(): Sódio, Boro$(br)$(thing)Fórmula$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Terra de Fuller", + "multiblock": { + "mapping": { + "0": "#forge:ores/fullers_earth" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Porcentagem$(): 15%$(br)$(thing)Fonte de$(): Magnésio$(br)$(thing)Fórmula$(): MgSi₄H(H₂O)₄O₁₁", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Raridade$(): 240$(br)$(thing)Densidade$(): 0.45$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 0 — 128$(br)$(thing)Tamanho$(): 37$(br2)$(thing)Tipos de Pedra$(): Basalto, Migmatito, Piroxenito, Travertino", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_ore_index.json index b703b7402..fe2c9cc1f 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_ore_index.json @@ -14,17 +14,17 @@ }, { "Type": "patchouli:text", - "text": "$(li)Алмаз: $(l:tfg_ores/earth_vein_index#normal_graphite)25%$(/l)$()$(li)Алунит: $(l:tfg_ores/earth_vein_index#normal_saltpeter)15%$(/l)$()$(li)Альмандин: $(l:tfg_ores/earth_vein_index#deep_sapphire)38%$(/l)$()$(li)Аметист: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)65%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)25%$(/l)$()$(li)Апатит: $(l:tfg_ores/earth_vein_index#normal_apatite)50%$(/l)$()$(li)Асбест: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_quartz)18%$(/l)$()$(li)Базальтовый минеральный песок: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)35%$(/l)$()$(li)Барит: $(l:tfg_ores/earth_vein_index#normal_quartz)37%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/earth_vein_index#normal_monazite)62%$(/l)$()$(li)Бентонит: $(l:tfg_ores/earth_vein_index#normal_olivine)35%$(/l)$()$(li)Бериллий: $(l:tfg_ores/earth_vein_index#normal_beryllium)35%$(/l)$()$(li)Боксит: $(l:tfg_ores/earth_vein_index#normal_mica)25%$(/l)$()$(li)Борнит: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)Бура: $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l)$()", + "text": "$(li)Алмаз: $(l:tfg_ores/earth_vein_index#normal_graphite)25%$(/l)$()$(li)Алунит: $(l:tfg_ores/earth_vein_index#normal_saltpeter)15%$(/l)$()$(li)Альмандин: $(l:tfg_ores/earth_vein_index#deep_sapphire)38%$(/l)$()$(li)Аметист: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)65%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)25%$(/l)$()$(li)Апатит: $(l:tfg_ores/earth_vein_index#normal_apatite)50%$(/l)$()$(li)Асбест: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_quartz)18%$(/l)$()$(li)Базальтовый минеральный песок: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)35%$(/l)$()$(li)Барит: $(l:tfg_ores/earth_vein_index#normal_quartz)37%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/earth_vein_index#normal_monazite)62%$(/l)$()$(li)Бентонит: $(l:tfg_ores/earth_vein_index#normal_olivine)35%$(/l)$()$(li)Бериллий: $(l:tfg_ores/earth_vein_index#normal_beryllium)35%$(/l)$()$(li)Боксит: $(l:tfg_ores/earth_vein_index#normal_mica)25%$(/l)$()$(li)Борнит: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)Бура: $(l:tfg_ores/earth_vein_index#normal_gypsum)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Ванадий магнетит: $(l:tfg_ores/earth_vein_index#normal_magnetite)22%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)25%$(/l)$()$(li)Висмут: $(l:tfg_ores/earth_vein_index#surface_bismuthinite)90%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)80%$(/l)$()$(li)Вольфрамат: $(l:tfg_ores/earth_vein_index#deep_scheelite)35%$(/l)$()$(li)Вульфенит: $(l:tfg_ores/earth_vein_index#deep_molybdenum)47%$(/l)$()$(li)Галена: $(l:tfg_ores/earth_vein_index#normal_silver)30%$(/l)$()$(li)Гарниерит: $(l:tfg_ores/earth_vein_index#normal_garnierite)30%$(/l)$()$(li)Гематит: $(l:tfg_ores/earth_vein_index#normal_hematite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)5%$(/l)$()$(li)Гётит: $(l:tfg_ores/earth_vein_index#deep_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)5%$(/l)$()$(li)Гипс: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)15%$(/l)$()$(li)Глауконитовый песок: $(l:tfg_ores/earth_vein_index#normal_lubricant)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_olivine)15%$(/l)$()$(li)Гранатовый песок: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l)$()$(li)Гранитовый минеральный песок: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Графит: $(l:tfg_ores/earth_vein_index#normal_graphite)45%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/earth_vein_index#normal_manganese)37%$(/l)$()", + "text": "$(li)Ванадий магнетит: $(l:tfg_ores/earth_vein_index#normal_magnetite)22%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)25%$(/l)$()$(li)Висмут: $(l:tfg_ores/earth_vein_index#surface_bismuthinite)90%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)80%$(/l)$()$(li)Вольфрамат: $(l:tfg_ores/earth_vein_index#deep_scheelite)35%$(/l)$()$(li)Вульфенит: $(l:tfg_ores/earth_vein_index#deep_molybdenum)47%$(/l)$()$(li)Галена: $(l:tfg_ores/earth_vein_index#normal_silver)30%$(/l)$()$(li)Гарниерит: $(l:tfg_ores/earth_vein_index#normal_garnierite)30%$(/l)$()$(li)Гематит: $(l:tfg_ores/earth_vein_index#normal_hematite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)5%$(/l)$()$(li)Гётит: $(l:tfg_ores/earth_vein_index#deep_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)5%$(/l)$()$(li)Гипс: $(l:tfg_ores/earth_vein_index#normal_gypsum)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)15%$(/l)$()$(li)Глауконитовый песок: $(l:tfg_ores/earth_vein_index#normal_lubricant)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_olivine)15%$(/l)$()$(li)Гранатовый песок: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l)$()$(li)Гранитовый минеральный песок: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Графит: $(l:tfg_ores/earth_vein_index#normal_graphite)45%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/earth_vein_index#normal_manganese)37%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Диатомовый пелит: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_garnet_tin)15%$(/l)$()$(li)Жёлтый гранат: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)15%$(/l)$()$(li)Жёлтый лимонит: $(l:tfg_ores/earth_vein_index#normal_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l)$()$(li)Зелёный сапфир: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l)$()$(li)Изумруд: $(l:tfg_ores/earth_vein_index#normal_beryllium)50%$(/l)$()$(li)Кальцит: $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)Каменная соль: $(l:tfg_ores/earth_vein_index#normal_salt)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)20%$(/l)$()$(li)Касситерит: $(l:tfg_ores/earth_vein_index#surface_cassiterite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_copper)5%$(/l)$()$(li)Касситеритовый песок: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)35%$(/l)$()$(li)Кварцит: $(l:tfg_ores/earth_vein_index#normal_quartz)43%$(/l)$()$(li)Киноварь: $(l:tfg_ores/earth_vein_index#normal_redstone)20%$(/l)$()$(li)Кобальт: $(l:tfg_ores/earth_vein_index#normal_garnierite)15%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/earth_vein_index#normal_garnierite)20%$(/l)$()$(li)Красный гранат: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)5%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)5%$(/l)$()", + "text": "$(li)Диатомовый пелит: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_garnet_tin)15%$(/l)$()$(li)Жёлтый гранат: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)15%$(/l)$()$(li)Жёлтый лимонит: $(l:tfg_ores/earth_vein_index#normal_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l)$()$(li)Зелёный сапфир: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l)$()$(li)Изумруд: $(l:tfg_ores/earth_vein_index#normal_beryllium)50%$(/l)$()$(li)Кальцит: $(l:tfg_ores/earth_vein_index#normal_gypsum)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)Каменная соль: $(l:tfg_ores/earth_vein_index#normal_salt)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)20%$(/l)$()$(li)Касситерит: $(l:tfg_ores/earth_vein_index#surface_cassiterite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_copper)5%$(/l)$()$(li)Касситеритовый песок: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)35%$(/l)$()$(li)Кварцит: $(l:tfg_ores/earth_vein_index#normal_quartz)43%$(/l)$()$(li)Киноварь: $(l:tfg_ores/earth_vein_index#normal_redstone)20%$(/l)$()$(li)Кобальт: $(l:tfg_ores/earth_vein_index#normal_garnierite)15%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/earth_vein_index#normal_garnierite)20%$(/l)$()$(li)Красный гранат: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)5%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)5%$(/l)$()", "type": "patchouli:text" }, { @@ -39,7 +39,7 @@ }, { "Type": "patchouli:text", - "text": "$(li)Самородная Медь: $(l:tfg_ores/earth_vein_index#normal_copper)65%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)30%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()$(li)Самородная Серебро: $(l:tfg_ores/earth_vein_index#normal_silver)15%$(/l)$()$(li)Сапфир: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)8%$(/l)$()$(li)Свинец: $(l:tfg_ores/earth_vein_index#normal_silver)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)11%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)7%$(/l)$()$(li)Селитра: $(l:tfg_ores/earth_vein_index#normal_saltpeter)35%$(/l)$()$(li)Сера: $(l:tfg_ores/earth_vein_index#surface_sphalerite)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_sphalerite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)9%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)3%$(/l)$()$(li)Синий топаз: $(l:tfg_ores/earth_vein_index#deep_topaz)35%$(/l)$()$(li)Слюда: $(l:tfg_ores/earth_vein_index#normal_mica)25%$(/l)$()$(li)Смектическая глина: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Содалит: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)Соль: $(l:tfg_ores/earth_vein_index#normal_salt)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)30%$(/l)$()$(li)Спасерит: $(l:tfg_ores/earth_vein_index#normal_manganese)25%$(/l)$()$(li)Сподумен: $(l:tfg_ores/earth_vein_index#normal_spodumene)35%$(/l)$()$(li)Стибнит: $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)20%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()", + "text": "$(li)Самородная Медь: $(l:tfg_ores/earth_vein_index#normal_copper)65%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)30%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()$(li)Самородная Серебро: $(l:tfg_ores/earth_vein_index#normal_silver)15%$(/l)$()$(li)Сапфир: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)8%$(/l)$()$(li)Свинец: $(l:tfg_ores/earth_vein_index#normal_silver)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)11%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)7%$(/l)$()$(li)Селитра: $(l:tfg_ores/earth_vein_index#normal_saltpeter)35%$(/l)$()$(li)Сера: $(l:tfg_ores/earth_vein_index#surface_sphalerite)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_sphalerite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)9%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)3%$(/l)$()$(li)Синий топаз: $(l:tfg_ores/earth_vein_index#deep_topaz)35%$(/l)$()$(li)Слюда: $(l:tfg_ores/earth_vein_index#normal_mica)25%$(/l)$()$(li)Смектическая глина: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_gypsum)15%$(/l)$()$(li)Содалит: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)Соль: $(l:tfg_ores/earth_vein_index#normal_salt)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)30%$(/l)$()$(li)Спасерит: $(l:tfg_ores/earth_vein_index#normal_manganese)25%$(/l)$()$(li)Сподумен: $(l:tfg_ores/earth_vein_index#normal_spodumene)35%$(/l)$()$(li)Стибнит: $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)20%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()", "type": "patchouli:text" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_vein_index.json index 250943cff..de5fe2c10 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/earth_vein_index.json @@ -14,22 +14,22 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)Аметист и гранат$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_apatite)Апатит и Пирохлор$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_monazite)Бастнезит и Монацит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_olivine)Бентонит и Оливин$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_bismuthinite)Висмут (Обычный)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_bismuthinite)Висмут (Поверхностный)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Вульфенит & Молибденит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Гарниерит и Кобальтит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Гематит и Лимонит$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Гематит, Гётит, Рубин$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Гётит и Малахит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Гранатовый и Касситеритовый песок$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Графит и Алмаз$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Золото (Глубокое)$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)Аметист и гранат$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_apatite)Апатит и Пирохлор$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_monazite)Бастнезит и Монацит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_olivine)Бентонит и Оливин$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_bismuthinite)Висмут (Обычный)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_bismuthinite)Висмут (Поверхностный)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Вульфенит & Молибденит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Гарниерит и Кобальтит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Гематит и Лимонит$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Гематит, Гётит, Рубин$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Гётит и Малахит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gypsum)Гипс и Кальцит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Гранатовый и Касситеритовый песок$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Графит и Алмаз$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Золото, Лимонит и Гематит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)Изумруд и Бериллий$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_cassiterite)Касситерит (Обычный)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_cassiterite)Касситерит (Поверхностный)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Кварцы$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Лазурит, Лазурит 2 и Содалит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Лимонит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Магнетит и Ванадий$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Марганец и Тантал$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_copper)Медь и Халькопирит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)Минеральные пески$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Мыльный камень, Тальк и Трона$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)Нефтеносный песок$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Опал и гранат$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Золото (Глубокое)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Золото, Лимонит и Гематит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)Изумруд и Бериллий$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_cassiterite)Касситерит (Обычный)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_cassiterite)Касситерит (Поверхностный)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Кварцы$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Лазурит, Лазурит 2 и Содалит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Лимонит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Магнетит и Ванадий$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Марганец и Тантал$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_copper)Медь и Халькопирит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)Минеральные пески$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Мыльный камень, Тальк и Трона$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)Нефтеносный песок$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Редстоун, Киноварь и Рубин$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Сапфир и Альмандин$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Селитра и Электротин$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Сера и Пирит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Серебро, Галена и Свинец$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Соли и Бура$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Сподумен и Лепидолит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Сфалерит & Пирит$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Сфалерит и Сера$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Тетраэдрит (обычный)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Тетраэдрит (Поверхностный)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Топаз и Халькозин$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_coal)Уголь$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Уранинит и Уранит$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Опал и гранат$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Редстоун, Киноварь и Рубин$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Сапфир и Альмандин$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Селитра и Электротин$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Сера и Пирит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Серебро, Галена и Свинец$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Соли и Бура$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Сподумен и Лепидолит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Сфалерит & Пирит$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Сфалерит и Сера$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Тетраэдрит (обычный)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Тетраэдрит (Поверхностный)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Топаз и Халькозин$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_coal)Уголь$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#surface_copper)Халькопирит и Реальгар$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)Хромит и Магнетит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)Ционит, Слюда и Боксит$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Шеелит и Вольфрамат$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)Шелдонит и Борнит$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Уранинит и Уранит$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_copper)Халькопирит и Реальгар$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)Хромит и Магнетит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)Ционит, Слюда и Боксит$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Шеелит и Вольфрамат$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)Шелдонит и Борнит$()$()", "type": "patchouli:text" }, { @@ -954,6 +954,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Редкость$(): 180$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): дискообразная жила$(br)$(thing)Y-уровень$(): -32 — 60$(br)$(thing)Размер$(): 40$(br)$(thing)Высота$(): 9$(br)$(thing)Индикатор Max Depth$(): 20$(br2)$(thing)Виды камней$(): Аргиллит, Доломит, Известняк, Конгломерат, Кремнистый сланец, Мел, Сланец", + "title": "Гипс и Кальцит", + "type": "patchouli:text", + "anchor": "normal_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Гипс", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 35%$(br)$(thing)Используется для$(): Алебастр (можно покрасить) и его кирпичи$(br)$(thing)Формула$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Кальцит", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 30%$(br)$(thing)Хромит$(): Кальций$(br)$(thing)Формула$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Бура", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 20%$(br)$(thing)Хромит$(): Натрий, Бор$(br)$(thing)Формула$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Смектическая глина", + "multiblock": { + "mapping": { + "0": "#forge:ores/fullers_earth" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 15%$(br)$(thing)Хромит$(): Магний$(br)$(thing)Формула$(): MgSi₄H(H₂O)₄O₁₁", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Редкость$(): 270$(br)$(thing)Плотность$(): 0.25$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -40 — 64$(br)$(thing)Размер$(): 40$(br)$(thing)Индикатор Max Depth$(): 60$(br2)$(thing)Виды камней$(): Андезит, Аргиллит, Аспидный сланец, Базальт, Габбро, Гнейс, Гранит, Дацит, Диорит, Доломит, Известняк, Кварцит, Конгломерат, Кремнистый сланец, Мел, Мрамор, Риолит, Сланец, Филлит, Шиферный сланец", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_ore_index.json new file mode 100644 index 000000000..eed6edcfa --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_ore_index.json @@ -0,0 +1,22 @@ +{ + "__credits__": "This page was automatically generated by OresToFieldGuide.", + "name": "Mars Ore Index", + "icon": "tfc:ore/normal_hematite", + "category": "tfc:tfg_ores", + "read_by_default": true, + "secret": false, + "pages": [ + { + "Type": "patchouli:text", + "text": "This is the $(thing)Ore Index$() for $(thing)Mars$(). All ores are sorted alphabetically and then by richest to poorest vein type. You can click on them to learn more information about each vein.", + "title": "Mars Ore Index", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Гематит: $(l:tfg_ores/mars_vein_index#mars_hematite)100%$(/l)$()", + "type": "patchouli:text" + } + ], + "sortnum": 6 +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_vein_index.json new file mode 100644 index 000000000..be2bb0d86 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/mars_vein_index.json @@ -0,0 +1,49 @@ +{ + "__credits__": "This page was automatically generated by OresToFieldGuide.", + "name": "Mars Vein Index", + "icon": "gtceu:mars_stone_hematite_ore", + "category": "tfc:tfg_ores", + "read_by_default": true, + "secret": false, + "pages": [ + { + "Type": "patchouli:text", + "text": "This is the $(thing)Vein Index$() for $(thing)Mars$(). Each Vein has details regarding its rarity, density, vein type, height found, sizes, what stones it spawns on, and more.", + "title": "Mars Vein Index", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_hematite)(Placeholder Vein)$()$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(thing)Редкость$(): 210$(br)$(thing)Плотность$(): 0.4$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): -16 — 100$(br)$(thing)Размер$(): 40$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Red Granite, Аргиллит, Аргиллит, Базальт, Габбро, Гранит, Дацит, Диорит, Доломит, Известняк, Конгломерат, Кремнистый сланец, Мел, Сланец, Трахит", + "title": "(Placeholder Vein)", + "type": "patchouli:text", + "anchor": "mars_hematite" + }, + { + "Type": "patchouli:multiblock", + "name": "Гематит", + "multiblock": { + "mapping": { + "0": "#forge:ores/hematite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 100%$(br)$(thing)Плавится в$(): Железо$(br)$(thing)Формула$(): Fe₂O₃", + "type": "patchouli:multiblock" + } + ], + "sortnum": 7 +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_ore_index.json index a1aedfda5..5c409537b 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_ore_index.json @@ -14,27 +14,32 @@ }, { "Type": "patchouli:text", - "text": "$(li)Armalcolite: $(l:tfg_ores/moon_vein_index#moon_bauxite)21%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Desh: $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_sphalerite)15%$(/l)$()$(li)Алмаз: $(l:tfg_ores/moon_vein_index#moon_graphite)36%$(/l)$()$(li)Альмандин: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Алюминий: $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l)$()$(li)Апатит: $(l:tfg_ores/moon_vein_index#moon_apatite)23%$(/l)$()$(li)Барит: $(l:tfg_ores/moon_vein_index#moon_quartz)5%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/moon_vein_index#moon_monazite)61%$(/l)$()$(li)Бериллий: $(l:tfg_ores/moon_vein_index#moon_beryllium)31%$(/l)$()$(li)Боксит: $(l:tfg_ores/moon_vein_index#moon_bauxite)36%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Борнит: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)15%$(/l)$()$(li)Ванадий магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Вольфрамат: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Вульфенит: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()", + "text": "$(li)Armalcolite: $(l:tfg_ores/moon_vein_index#moon_bauxite)21%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Desh: $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_sphalerite)15%$(/l)$()$(li)Алмаз: $(l:tfg_ores/moon_vein_index#moon_graphite)36%$(/l)$()$(li)Алунит: $(l:tfg_ores/moon_vein_index#moon_gypsum)15%$(/l)$()$(li)Альмандин: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Алюминий: $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)14%$(/l)$()$(li)Аметист: $(l:tfg_ores/moon_vein_index#moon_garnet)38%$(/l)$()$(li)Апатит: $(l:tfg_ores/moon_vein_index#moon_apatite)23%$(/l)$()$(li)Барит: $(l:tfg_ores/moon_vein_index#moon_quartz)5%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/moon_vein_index#moon_monazite)61%$(/l)$()$(li)Бериллий: $(l:tfg_ores/moon_vein_index#moon_beryllium)31%$(/l)$()$(li)Боксит: $(l:tfg_ores/moon_vein_index#moon_bauxite)36%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)20%$(/l)$()$(li)Борнит: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)15%$(/l)$()$(li)Бура: $(l:tfg_ores/moon_vein_index#moon_gypsum)20%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Галена: $(l:tfg_ores/moon_vein_index#moon_silver)28%$(/l)$()$(li)Гарниерит: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l)$()$(li)Глауконитовый песок: $(l:tfg_ores/moon_vein_index#moon_lubricant)25%$(/l)$()$(li)Графит: $(l:tfg_ores/moon_vein_index#moon_graphite)52%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/moon_vein_index#moon_manganese)37%$(/l)$()$(li)Зелёный сапфир: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l)$()$(li)Изумруд: $(l:tfg_ores/moon_vein_index#moon_beryllium)45%$(/l)$()$(li)Ильменит: $(l:tfg_ores/moon_vein_index#moon_bauxite)42%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l)$()$(li)Истинный кварц: $(l:tfg_ores/moon_vein_index#moon_quartz)45%$(/l)$()$(li)Каменная соль: $(l:tfg_ores/moon_vein_index#moon_beryllium)18%$(/l)$()$(li)Кварцит: $(l:tfg_ores/moon_vein_index#moon_quartz)20%$(/l)$()$(li)Киноварь: $(l:tfg_ores/moon_vein_index#moon_redstone)19%$(/l)$()$(li)Кобальт: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)14%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()", + "text": "$(li)Ванадий магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Вольфрамат: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Вульфенит: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()$(li)Галена: $(l:tfg_ores/moon_vein_index#moon_silver)28%$(/l)$()$(li)Гарниерит: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l)$()$(li)Гипс: $(l:tfg_ores/moon_vein_index#moon_gypsum)35%$(/l)$()$(li)Глауконитовый песок: $(l:tfg_ores/moon_vein_index#moon_lubricant)25%$(/l)$()$(li)Графит: $(l:tfg_ores/moon_vein_index#moon_graphite)52%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/moon_vein_index#moon_manganese)37%$(/l)$()$(li)Жёлтый гранат: $(l:tfg_ores/moon_vein_index#moon_garnet)14%$(/l)$()$(li)Зелёный сапфир: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)5%$(/l)$()$(li)Изумруд: $(l:tfg_ores/moon_vein_index#moon_beryllium)45%$(/l)$()$(li)Ильменит: $(l:tfg_ores/moon_vein_index#moon_bauxite)42%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l)$()$(li)Истинный кварц: $(l:tfg_ores/moon_vein_index#moon_quartz)45%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Литий: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()$(li)Магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l)$()$(li)Молибденит: $(l:tfg_ores/moon_vein_index#moon_molybdenum)33%$(/l)$()$(li)Монацит: $(l:tfg_ores/moon_vein_index#moon_monazite)30%$(/l)$()$(li)Мыльный камень: $(l:tfg_ores/moon_vein_index#moon_lubricant)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)20%$(/l)$()$(li)Незер-кварц: $(l:tfg_ores/moon_vein_index#moon_quartz)30%$(/l)$()$(li)Неодим: $(l:tfg_ores/moon_vein_index#moon_monazite)6%$(/l)$()$(li)Никель: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Оливин: $(l:tfg_ores/moon_vein_index#moon_graphite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_apatite)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_beryllium)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_molybdenum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_redstone)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_silver)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_sapphire)2%$(/l), $(l:tfg_ores/moon_vein_index#moon_monazite)1%$(/l)$()$(li)Пентландит: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_lubricant)15%$(/l)$()$(li)Пирит: $(l:tfg_ores/moon_vein_index#moon_sphalerite)35%$(/l)$()$(li)Пиролюзит: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)38%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Пироп: $(l:tfg_ores/moon_vein_index#moon_sapphire)27%$(/l)$()$(li)Пирохлор: $(l:tfg_ores/moon_vein_index#moon_apatite)38%$(/l)$()", + "text": "$(li)Кальцит: $(l:tfg_ores/moon_vein_index#moon_gypsum)25%$(/l)$()$(li)Каменная соль: $(l:tfg_ores/moon_vein_index#moon_beryllium)18%$(/l)$()$(li)Касситерит: $(l:tfg_ores/moon_vein_index#moon_cassiterite)41%$(/l)$()$(li)Кварцит: $(l:tfg_ores/moon_vein_index#moon_quartz)20%$(/l)$()$(li)Киноварь: $(l:tfg_ores/moon_vein_index#moon_redstone)19%$(/l)$()$(li)Кобальт: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)14%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Красный гранат: $(l:tfg_ores/moon_vein_index#moon_garnet)9%$(/l)$()$(li)Литий: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()$(li)Магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)20%$(/l)$()$(li)Молибденит: $(l:tfg_ores/moon_vein_index#moon_molybdenum)33%$(/l)$()$(li)Монацит: $(l:tfg_ores/moon_vein_index#moon_monazite)30%$(/l)$()$(li)Мыльный камень: $(l:tfg_ores/moon_vein_index#moon_lubricant)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)20%$(/l)$()$(li)Незер-кварц: $(l:tfg_ores/moon_vein_index#moon_quartz)30%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Платина: $(l:tfg_ores/moon_vein_index#moon_sheldonite)15%$(/l)$()$(li)Повеллит: $(l:tfg_ores/moon_vein_index#moon_molybdenum)16%$(/l)$()$(li)Поллуцит: $(l:tfg_ores/moon_vein_index#moon_mica)14%$(/l)$()$(li)Редстоун: $(l:tfg_ores/moon_vein_index#moon_redstone)42%$(/l)$()$(li)Рубин: $(l:tfg_ores/moon_vein_index#moon_redstone)33%$(/l)$()$(li)Самородная Золото: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Самородная Серебро: $(l:tfg_ores/moon_vein_index#moon_silver)42%$(/l)$()$(li)Сапфир: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)5%$(/l)$()$(li)Свинец: $(l:tfg_ores/moon_vein_index#moon_silver)23%$(/l)$()$(li)Селитра: $(l:tfg_ores/moon_vein_index#moon_saltpeter)29%$(/l)$()$(li)Синий топаз: $(l:tfg_ores/moon_vein_index#moon_topaz)35%$(/l)$()$(li)Слюда: $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Спасерит: $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/moon_vein_index#moon_sphalerite)50%$(/l)$()", + "text": "$(li)Неодим: $(l:tfg_ores/moon_vein_index#moon_monazite)6%$(/l)$()$(li)Никель: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Оливин: $(l:tfg_ores/moon_vein_index#moon_graphite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_apatite)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_beryllium)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_gypsum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_molybdenum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_redstone)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_silver)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_sapphire)2%$(/l), $(l:tfg_ores/moon_vein_index#moon_monazite)1%$(/l)$()$(li)Олово: $(l:tfg_ores/moon_vein_index#moon_cassiterite)17%$(/l)$()$(li)Опал: $(l:tfg_ores/moon_vein_index#moon_garnet)38%$(/l)$()$(li)Пентландит: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_lubricant)15%$(/l)$()$(li)Пирит: $(l:tfg_ores/moon_vein_index#moon_sphalerite)35%$(/l)$()$(li)Пиролюзит: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)38%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Пироп: $(l:tfg_ores/moon_vein_index#moon_sapphire)27%$(/l)$()$(li)Пирохлор: $(l:tfg_ores/moon_vein_index#moon_apatite)38%$(/l)$()$(li)Платина: $(l:tfg_ores/moon_vein_index#moon_sheldonite)15%$(/l)$()$(li)Повеллит: $(l:tfg_ores/moon_vein_index#moon_molybdenum)16%$(/l)$()$(li)Редстоун: $(l:tfg_ores/moon_vein_index#moon_redstone)42%$(/l)$()$(li)Рубин: $(l:tfg_ores/moon_vein_index#moon_redstone)33%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Тальк: $(l:tfg_ores/moon_vein_index#moon_lubricant)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)12%$(/l)$()$(li)Танталит: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()$(li)Топаз: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Торий: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Трикальцийфосфат: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Трона: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Халькозин: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Хромит: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l)$()$(li)Ционит: $(l:tfg_ores/moon_vein_index#moon_mica)33%$(/l)$()$(li)Шеелит: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)Шелдонит: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()$(li)Электротин: $(l:tfg_ores/moon_vein_index#moon_saltpeter)37%$(/l)$()", + "text": "$(li)Самородная Золото: $(l:tfg_ores/moon_vein_index#moon_gold)55%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Самородная Медь: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)15%$(/l)$()$(li)Самородная Серебро: $(l:tfg_ores/moon_vein_index#moon_silver)42%$(/l)$()$(li)Сапфир: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)5%$(/l)$()$(li)Свинец: $(l:tfg_ores/moon_vein_index#moon_silver)23%$(/l)$()$(li)Селитра: $(l:tfg_ores/moon_vein_index#moon_saltpeter)29%$(/l)$()$(li)Синий топаз: $(l:tfg_ores/moon_vein_index#moon_topaz)35%$(/l)$()$(li)Слюда: $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Спасерит: $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Стибнит: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)20%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/moon_vein_index#moon_sphalerite)50%$(/l)$()$(li)Тальк: $(l:tfg_ores/moon_vein_index#moon_lubricant)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)12%$(/l)$()$(li)Танталит: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()$(li)Тетраэдрит: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)40%$(/l)$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Топаз: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Торий: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Трикальцийфосфат: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Трона: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Халькозин: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/moon_vein_index#moon_cassiterite)35%$(/l)$()$(li)Хромит: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l)$()$(li)Цеолит: $(l:tfg_ores/moon_vein_index#moon_cassiterite)5%$(/l)$()$(li)Ционит: $(l:tfg_ores/moon_vein_index#moon_mica)33%$(/l)$()$(li)Шеелит: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)Шелдонит: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()$(li)Электротин: $(l:tfg_ores/moon_vein_index#moon_saltpeter)37%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_vein_index.json index 321621d68..f0c0f0daf 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/moon_vein_index.json @@ -14,12 +14,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Desh & Ilmenite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_pyrolusite)Pyrolusite and Cobalt$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Апатит и Пирохлор$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Бастнезит и Монацит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Боксит и Ильменит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Вульфенит & Молибденит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Гарниерит и Кобальтит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_graphite)Графит и Алмаз$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_beryllium)Изумруд и Бериллий$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Истинный кварц$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_manganese)Марганец и Тантал$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_lubricant)Мыльный камень, Тальк и Трона$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Редстоун, Киноварь и Рубин$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sapphire)Сапфир и Альмандин$()$()", + "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Desh & Ilmenite$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_pyrolusite)Pyrolusite and Cobalt$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnet)Аметист, Опал и гранат$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Апатит и Пирохлор$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Бастнезит и Монацит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Боксит и Ильменит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Вульфенит & Молибденит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Гарниерит и Кобальтит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_gypsum)Гипс и Кальцит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_graphite)Графит и Алмаз$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_gold)Золото и Магнетит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_beryllium)Изумруд и Бериллий$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Истинный кварц$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_cassiterite)Касситерит и Халькопирит$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_saltpeter)Селитра и Электротин$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_silver)Серебро, Галена и Свинец$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sphalerite)Сфалерит & Пирит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_topaz)Топаз и Халькозин$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_magnetite)Хромит и Магнетит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_mica)Ционит, Слюда и Боксит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_scheelite)Шеелит и Вольфрамат$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sheldonite)Шелдонит и Борнит$()$()", + "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_manganese)Марганец и Тантал$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_lubricant)Мыльный камень, Тальк и Трона$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Редстоун, Киноварь и Рубин$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sapphire)Сапфир и Альмандин$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_saltpeter)Селитра и Электротин$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_silver)Серебро, Галена и Свинец$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sphalerite)Сфалерит & Пирит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_tetrahedrite)Тетраэдрит и Халькозин$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_topaz)Топаз и Халькозин$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_magnetite)Хромит и Магнетит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_mica)Ционит, Слюда и Боксит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_scheelite)Шеелит и Вольфрамат$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sheldonite)Шелдонит и Борнит$()$()", "type": "patchouli:text" }, { @@ -211,6 +211,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Редкость$(): 230$(br)$(thing)Плотность$(): 0.35$(br)$(thing)Вид$(): дискообразная жила$(br)$(thing)Y-уровень$(): 10 — 128$(br)$(thing)Размер$(): 35$(br)$(thing)Высота$(): 7$(br)$(thing)Индикатор Max Depth$(): 20$(br2)$(thing)Виды камней$(): Андезит, Базальт, Риолит", + "title": "Аметист, Опал и гранат", + "type": "patchouli:text", + "anchor": "moon_garnet" + }, + { + "Type": "patchouli:multiblock", + "name": "Аметист", + "multiblock": { + "mapping": { + "0": "#forge:ores/amethyst" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 38%$(br)$(thing)Хромит$(): Железо$(br)$(thing)Формула$(): (SiO₂)₄Fe", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Опал", + "multiblock": { + "mapping": { + "0": "#forge:ores/opal" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 38%$(br)$(thing)Хромит$(): Кремний, Кислород$(br)$(thing)Формула$(): (SiO₂)", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Жёлтый гранат", + "multiblock": { + "mapping": { + "0": "#forge:ores/yellow_garnet" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 14%$(br)$(thing)Хромит$(): Андрадит, Гроссуляр, Уваровит", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Красный гранат", + "multiblock": { + "mapping": { + "0": "#forge:ores/red_garnet" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 9%$(br)$(thing)Хромит$(): Пироп, Альмандин, Спасерит", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Редкость$(): 250$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): 0 — 100$(br)$(thing)Размер$(): 35$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Диорит, Норит", @@ -661,6 +753,113 @@ "text": "$(thing)Процент руды$(): 14%$(br)$(thing)Плавится в$(): Кобальт$(br)$(thing)Формула$(): Co", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Редкость$(): 180$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): дискообразная жила$(br)$(thing)Y-уровень$(): 10 — 100$(br)$(thing)Размер$(): 40$(br)$(thing)Высота$(): 9$(br)$(thing)Индикатор Max Depth$(): 20$(br2)$(thing)Виды камней$(): Анортозит, Норит, Фонолит", + "title": "Гипс и Кальцит", + "type": "patchouli:text", + "anchor": "moon_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Гипс", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 35%$(br)$(thing)Используется для$(): Алебастр (можно покрасить) и его кирпичи$(br)$(thing)Формула$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Кальцит", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 25%$(br)$(thing)Хромит$(): Кальций$(br)$(thing)Формула$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Бура", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 20%$(br)$(thing)Хромит$(): Натрий, Бор$(br)$(thing)Формула$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Алунит", + "multiblock": { + "mapping": { + "0": "#forge:ores/alunite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 15%$(br)$(thing)Хромит$(): Калий, Алюминий$(br)$(thing)Формула$(): KAl₃Si₂H₆O₁₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Оливин", + "multiblock": { + "mapping": { + "0": "#forge:ores/olivine" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 5%$(br)$(thing)Хромит$(): Магний, Железо$(br)$(thing)Формула$(): Mg₂Fe(SiO₂)₂", + "type": "patchouli:multiblock" + }, { "Type": "patchouli:text", "text": "$(thing)Редкость$(): 260$(br)$(thing)Плотность$(): 0.55$(br)$(thing)Вид$(): трубчатая жила$(br)$(thing)Y-уровень$(): 0 — 120$(br)$(thing)Высота$(): 60$(br)$(thing)Радиус$(): 12$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базальт, Базальт, Габбро, Фонолит", @@ -728,6 +927,98 @@ "text": "$(thing)Процент руды$(): 10%$(br)$(thing)Хромит$(): Магний, Железо$(br)$(thing)Формула$(): Mg₂Fe(SiO₂)₂", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Редкость$(): 170$(br)$(thing)Плотность$(): 0.4$(br)$(thing)Вид$(): дискообразная жила$(br)$(thing)Y-уровень$(): 10 — 80$(br)$(thing)Размер$(): 40$(br)$(thing)Высота$(): 10$(br)$(thing)Индикатор Max Depth$(): 60$(br2)$(thing)Виды камней$(): Базальт, Гранит, Диорит", + "title": "Золото и Магнетит", + "type": "patchouli:text", + "anchor": "moon_gold" + }, + { + "Type": "patchouli:multiblock", + "name": "Самородная Золото", + "multiblock": { + "mapping": { + "0": "#forge:ores/gold" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 55%$(br)$(thing)Плавится в$(): Золото$(br)$(thing)Формула$(): Au", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Боксит", + "multiblock": { + "mapping": { + "0": "#forge:ores/bauxite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 20%$(br)$(thing)Хромит$(): Алюминий$(br)$(thing)Формула$(): Al₂O₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Магнетит", + "multiblock": { + "mapping": { + "0": "#forge:ores/magnetite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 20%$(br)$(thing)Плавится в$(): Железо$(br)$(thing)Формула$(): Fe₃O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Зелёный сапфир", + "multiblock": { + "mapping": { + "0": "#forge:ores/green_sapphire" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 5%$(br)$(thing)Хромит$(): Алюминий$(br)$(thing)Формула$(): Al₂O₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Редкость$(): 260$(br)$(thing)Плотность$(): 0.45$(br)$(thing)Вид$(): трубчатая жила$(br)$(thing)Y-уровень$(): 0 — 120$(br)$(thing)Высота$(): 70$(br)$(thing)Радиус$(): 10$(br)$(thing)Индикатор Max Depth$(): 50$(br2)$(thing)Виды камней$(): Анортозит, Базальт, Фонолит", @@ -927,6 +1218,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Редкость$(): 210$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): 10 — 128$(br)$(thing)Размер$(): 40$(br)$(thing)Индикатор Max Depth$(): 60$(br2)$(thing)Виды камней$(): Габбро, Гранит, Диорит, Норит", + "title": "Касситерит и Халькопирит", + "type": "patchouli:text", + "anchor": "moon_cassiterite" + }, + { + "Type": "patchouli:multiblock", + "name": "Касситерит", + "multiblock": { + "mapping": { + "0": "#forge:ores/cassiterite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 41%$(br)$(thing)Плавится в$(): Олово$(br)$(thing)Формула$(): SnO₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Халькопирит", + "multiblock": { + "mapping": { + "0": "#forge:ores/chalcopyrite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 35%$(br)$(thing)Плавится в$(): Медь$(br)$(thing)Формула$(): CuFeS₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Олово", + "multiblock": { + "mapping": { + "0": "#forge:ores/tin" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 17%$(br)$(thing)Плавится в$(): Олово$(br)$(thing)Формула$(): Sn", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Цеолит", + "multiblock": { + "mapping": { + "0": "#forge:ores/zeolite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 5%$(br)$(thing)Хромит$(): Алюминий, Кислород$(br)$(thing)Формула$(): NaCa₄Si₂₇Al₉(H₂O)₂₈O₇₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Редкость$(): 215$(br)$(thing)Плотность$(): 0.5$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): 5 — 80$(br)$(thing)Размер$(): 40$(br)$(thing)Индикатор Max Depth$(): 20$(br2)$(thing)Виды камней$(): Андезит, Базальт, Базальт, Габбро, Дацит, Норит", @@ -1576,6 +1959,98 @@ "text": "$(thing)Процент руды$(): 15%$(br)$(thing)Source of$(): Iron, Titanium, Nitrogen$(br)$(thing)Формула$(): (Mg₂Fe(SiO₂)₂)₂(TiO₂)N₄", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Редкость$(): 190$(br)$(thing)Плотность$(): 0.3$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): 50 — 128$(br)$(thing)Размер$(): 40$(br)$(thing)Индикатор Max Depth$(): 60$(br2)$(thing)Виды камней$(): Андезит, Дацит, Риолит, Фонолит", + "title": "Тетраэдрит и Халькозин", + "type": "patchouli:text", + "anchor": "moon_tetrahedrite" + }, + { + "Type": "patchouli:multiblock", + "name": "Тетраэдрит", + "multiblock": { + "mapping": { + "0": "#forge:ores/tetrahedrite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 40%$(br)$(thing)Плавится в$(): Медь$(br)$(thing)Формула$(): Cu₃SbS₃Fe", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Халькозин", + "multiblock": { + "mapping": { + "0": "#forge:ores/chalcocite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 25%$(br)$(thing)Хромит$(): Медь$(br)$(thing)Формула$(): Cu₂S", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Стибнит", + "multiblock": { + "mapping": { + "0": "#forge:ores/stibnite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 20%$(br)$(thing)Плавится в$(): Сурьма$(br)$(thing)Формула$(): Sb₂S₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Самородная Медь", + "multiblock": { + "mapping": { + "0": "#forge:ores/copper" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 15%$(br)$(thing)Плавится в$(): Медь$(br)$(thing)Формула$(): Cu", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Редкость$(): 210$(br)$(thing)Плотность$(): 0.5$(br)$(thing)Вид$(): дискообразная жила$(br)$(thing)Y-уровень$(): 0 — 120$(br)$(thing)Размер$(): 64$(br)$(thing)Высота$(): 25$(br)$(thing)Индикатор Max Depth$(): 20$(br2)$(thing)Виды камней$(): Андезит, Анортозит, Базальт, Габбро, Дацит, Диорит, Норит, Риолит, Фонолит", @@ -1844,10 +2319,10 @@ }, { "Type": "patchouli:multiblock", - "name": "Поллуцит", + "name": "Алюминий", "multiblock": { "mapping": { - "0": "#forge:ores/pollucite" + "0": "#forge:ores/aluminium" }, "pattern": [ [ @@ -1859,7 +2334,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Процент руды$(): 14%$(br)$(thing)Хромит$(): Цезий, Алюминий$(br)$(thing)Формула$(): Cs₂Al₂Si₄(H₂O)₂O₁₂", + "text": "$(thing)Процент руды$(): 14%$(br)$(thing)Хромит$(): Алюминий$(br)$(thing)Формула$(): Al", "type": "patchouli:multiblock" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_ore_index.json index cde28843c..300a62224 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_ore_index.json @@ -14,42 +14,42 @@ }, { "Type": "patchouli:text", - "text": "$(li)Алмаз: $(l:tfg_ores/nether_vein_index#nether_graphite)40%$(/l)$()$(li)Алунит: $(l:tfg_ores/nether_vein_index#nether_saltpeter)15%$(/l)$()$(li)Альмандин: $(l:tfg_ores/nether_vein_index#nether_sapphire)38%$(/l)$()$(li)Аметист: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Антрацит: $(l:tfg_ores/nether_vein_index#nether_anthracite)100%$(/l)$()$(li)Апатит: $(l:tfg_ores/nether_vein_index#nether_apatite)50%$(/l)$()$(li)Асбест: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Базальтовый минеральный песок: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)35%$(/l)$()$(li)Барит: $(l:tfg_ores/nether_vein_index#nether_quartz)20%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/nether_vein_index#nether_monazite)50%$(/l)$()$(li)Бентонит: $(l:tfg_ores/nether_vein_index#nether_olivine)35%$(/l)$()$(li)Бериллий: $(l:tfg_ores/nether_vein_index#nether_beryllium)33%$(/l)$()$(li)Борнит: $(l:tfg_ores/nether_vein_index#nether_sheldonite)41%$(/l), $(l:tfg_ores/nether_vein_index#nether_topaz)15%$(/l)$()$(li)Ванадий магнетит: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()", + "text": "$(li)Алмаз: $(l:tfg_ores/nether_vein_index#nether_graphite)40%$(/l)$()$(li)Алунит: $(l:tfg_ores/nether_vein_index#nether_saltpeter)15%$(/l)$()$(li)Альмандин: $(l:tfg_ores/nether_vein_index#nether_sapphire)38%$(/l)$()$(li)Аметист: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Антрацит: $(l:tfg_ores/nether_vein_index#nether_anthracite)100%$(/l)$()$(li)Апатит: $(l:tfg_ores/nether_vein_index#nether_apatite)50%$(/l)$()$(li)Асбест: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Базальтовый минеральный песок: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)35%$(/l)$()$(li)Барит: $(l:tfg_ores/nether_vein_index#nether_quartz)20%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/nether_vein_index#nether_monazite)50%$(/l)$()$(li)Бентонит: $(l:tfg_ores/nether_vein_index#nether_olivine)35%$(/l)$()$(li)Бериллий: $(l:tfg_ores/nether_vein_index#nether_beryllium)33%$(/l)$()$(li)Борнит: $(l:tfg_ores/nether_vein_index#nether_sheldonite)41%$(/l), $(l:tfg_ores/nether_vein_index#nether_topaz)15%$(/l)$()$(li)Бура: $(l:tfg_ores/nether_vein_index#nether_gypsum)20%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Вольфрамат: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Вульфенит: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l)$()$(li)Галена: $(l:tfg_ores/nether_vein_index#nether_silver)30%$(/l)$()$(li)Гарниерит: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l)$()$(li)Гематит: $(l:tfg_ores/nether_vein_index#nether_hematite)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)5%$(/l)$()$(li)Гётит: $(l:tfg_ores/nether_vein_index#nether_goethite)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Гипс: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)15%$(/l)$()$(li)Глауконитовый песок: $(l:tfg_ores/nether_vein_index#nether_lubricant)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_olivine)15%$(/l)$()$(li)Гранатовый песок: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Гранитовый минеральный песок: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)Графит: $(l:tfg_ores/nether_vein_index#nether_graphite)45%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/nether_vein_index#nether_manganese)37%$(/l)$()$(li)Диатомовый пелит: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()$(li)Жёлтый гранат: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()", + "text": "$(li)Ванадий магнетит: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()$(li)Вольфрамат: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Вульфенит: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l)$()$(li)Галена: $(l:tfg_ores/nether_vein_index#nether_silver)30%$(/l)$()$(li)Гарниерит: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l)$()$(li)Гематит: $(l:tfg_ores/nether_vein_index#nether_hematite)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)5%$(/l)$()$(li)Гётит: $(l:tfg_ores/nether_vein_index#nether_goethite)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Гипс: $(l:tfg_ores/nether_vein_index#nether_gypsum)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)15%$(/l)$()$(li)Глауконитовый песок: $(l:tfg_ores/nether_vein_index#nether_lubricant)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_olivine)15%$(/l)$()$(li)Гранатовый песок: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Гранитовый минеральный песок: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)Графит: $(l:tfg_ores/nether_vein_index#nether_graphite)45%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/nether_vein_index#nether_manganese)37%$(/l)$()$(li)Диатомовый пелит: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Жёлтый лимонит: $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Зелёный сапфир: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l)$()$(li)Изумруд: $(l:tfg_ores/nether_vein_index#nether_beryllium)47%$(/l)$()$(li)Кальцит: $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()$(li)Каменная соль: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()$(li)Касситерит: $(l:tfg_ores/nether_vein_index#nether_cassiterite)40%$(/l)$()$(li)Касситеритовый песок: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)35%$(/l)$()$(li)Кварцит: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)Киноварь: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()$(li)Кобальт: $(l:tfg_ores/nether_vein_index#nether_garnierite)14%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)Красный гранат: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)Лазурит: $(l:tfg_ores/nether_vein_index#nether_lapis)35%$(/l)$()$(li)Лазурит 2: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()", + "text": "$(li)Жёлтый гранат: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()$(li)Жёлтый лимонит: $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Зелёный сапфир: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l)$()$(li)Изумруд: $(l:tfg_ores/nether_vein_index#nether_beryllium)47%$(/l)$()$(li)Кальцит: $(l:tfg_ores/nether_vein_index#nether_gypsum)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()$(li)Каменная соль: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()$(li)Касситерит: $(l:tfg_ores/nether_vein_index#nether_cassiterite)40%$(/l)$()$(li)Касситеритовый песок: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)35%$(/l)$()$(li)Кварцит: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)Киноварь: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()$(li)Кобальт: $(l:tfg_ores/nether_vein_index#nether_garnierite)14%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)Красный гранат: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)Лазурит: $(l:tfg_ores/nether_vein_index#nether_lapis)35%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Литий: $(l:tfg_ores/nether_vein_index#nether_scheelite)20%$(/l)$()$(li)Магнезит: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Магнетит: $(l:tfg_ores/nether_vein_index#nether_magnetite)20%$(/l)$()$(li)Малахит: $(l:tfg_ores/nether_vein_index#nether_goethite)20%$(/l)$()$(li)Молибденит: $(l:tfg_ores/nether_vein_index#nether_molybdenum)31%$(/l)$()$(li)Монацит: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Мыльный камень: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)Наквада: $(l:tfg_ores/nether_vein_index#nether_naquadah)75%$(/l)$()$(li)Незер-кварц: $(l:tfg_ores/nether_vein_index#nether_quartz)54%$(/l)$()$(li)Неодим: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Никель: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l), $(l:tfg_ores/nether_vein_index#nether_sheldonite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_molybdenum)15%$(/l)$()$(li)Оливин: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Олово: $(l:tfg_ores/nether_vein_index#nether_cassiterite)60%$(/l)$()$(li)Опал: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()", + "text": "$(li)Лазурит 2: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Литий: $(l:tfg_ores/nether_vein_index#nether_scheelite)20%$(/l)$()$(li)Магнезит: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Магнетит: $(l:tfg_ores/nether_vein_index#nether_magnetite)20%$(/l)$()$(li)Малахит: $(l:tfg_ores/nether_vein_index#nether_goethite)20%$(/l)$()$(li)Молибденит: $(l:tfg_ores/nether_vein_index#nether_molybdenum)31%$(/l)$()$(li)Монацит: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Мыльный камень: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)Наквада: $(l:tfg_ores/nether_vein_index#nether_naquadah)75%$(/l)$()$(li)Незер-кварц: $(l:tfg_ores/nether_vein_index#nether_quartz)54%$(/l)$()$(li)Неодим: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Никель: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l), $(l:tfg_ores/nether_vein_index#nether_sheldonite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_molybdenum)15%$(/l)$()$(li)Оливин: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Олово: $(l:tfg_ores/nether_vein_index#nether_cassiterite)60%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Пентландит: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_lubricant)15%$(/l)$()$(li)Пирит: $(l:tfg_ores/nether_vein_index#nether_sulfur)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)10%$(/l)$()$(li)Пиролюзит: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Пироп: $(l:tfg_ores/nether_vein_index#nether_sapphire)27%$(/l)$()$(li)Пирохлор: $(l:tfg_ores/nether_vein_index#nether_apatite)15%$(/l)$()$(li)Платина: $(l:tfg_ores/nether_vein_index#nether_sheldonite)5%$(/l)$()$(li)Плутоний: $(l:tfg_ores/nether_vein_index#nether_naquadah)25%$(/l)$()$(li)Повеллит: $(l:tfg_ores/nether_vein_index#nether_molybdenum)10%$(/l)$()$(li)Поллуцит: $(l:tfg_ores/nether_vein_index#nether_mica)20%$(/l)$()$(li)Редстоун: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()$(li)Рубин: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()$(li)Самородная Золото: $(l:tfg_ores/nether_vein_index#nether_gold)75%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)5%$(/l)$()$(li)Самородная Медь: $(l:tfg_ores/nether_vein_index#nether_copper)65%$(/l), $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)30%$(/l)$()$(li)Самородная Серебро: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()", + "text": "$(li)Опал: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Пентландит: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_lubricant)15%$(/l)$()$(li)Пирит: $(l:tfg_ores/nether_vein_index#nether_sulfur)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)10%$(/l)$()$(li)Пиролюзит: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Пироп: $(l:tfg_ores/nether_vein_index#nether_sapphire)27%$(/l)$()$(li)Пирохлор: $(l:tfg_ores/nether_vein_index#nether_apatite)15%$(/l)$()$(li)Платина: $(l:tfg_ores/nether_vein_index#nether_sheldonite)5%$(/l)$()$(li)Плутоний: $(l:tfg_ores/nether_vein_index#nether_naquadah)25%$(/l)$()$(li)Повеллит: $(l:tfg_ores/nether_vein_index#nether_molybdenum)10%$(/l)$()$(li)Поллуцит: $(l:tfg_ores/nether_vein_index#nether_mica)20%$(/l)$()$(li)Редстоун: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()$(li)Рубин: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()$(li)Самородная Золото: $(l:tfg_ores/nether_vein_index#nether_gold)75%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)5%$(/l)$()$(li)Самородная Медь: $(l:tfg_ores/nether_vein_index#nether_copper)65%$(/l), $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)30%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Сапфир: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Свинец: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Селитра: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l)$()$(li)Сера: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()$(li)Сильвин: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Синий топаз: $(l:tfg_ores/nether_vein_index#nether_topaz)35%$(/l)$()$(li)Слюда: $(l:tfg_ores/nether_vein_index#nether_mica)33%$(/l)$()$(li)Смектическая глина: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)Содалит: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Спасерит: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Стибнит: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/nether_vein_index#nether_sphalerite)40%$(/l), $(l:tfg_ores/nether_vein_index#nether_sulfur)15%$(/l)$()$(li)Тальк: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Танталит: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()", + "text": "$(li)Самородная Серебро: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Сапфир: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Свинец: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Селитра: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l)$()$(li)Сера: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()$(li)Сильвин: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Синий топаз: $(l:tfg_ores/nether_vein_index#nether_topaz)35%$(/l)$()$(li)Слюда: $(l:tfg_ores/nether_vein_index#nether_mica)33%$(/l)$()$(li)Смектическая глина: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gypsum)15%$(/l)$()$(li)Содалит: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Спасерит: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Стибнит: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/nether_vein_index#nether_sphalerite)40%$(/l), $(l:tfg_ores/nether_vein_index#nether_sulfur)15%$(/l)$()$(li)Тальк: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Тетраэдрит: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Топаз: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Торий: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Трикальцийфосфат: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Трона: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Уголь: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Уранинит: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Уранит: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Халькозин: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Хромит: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Ционит: $(l:tfg_ores/nether_vein_index#nether_mica)46%$(/l)$()$(li)Шеелит: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)Шелдонит: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()", + "text": "$(li)Танталит: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Тетраэдрит: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Топаз: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Торий: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Трикальцийфосфат: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Трона: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Уголь: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Уранинит: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Уранит: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Халькозин: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Хромит: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Ционит: $(l:tfg_ores/nether_vein_index#nether_mica)46%$(/l)$()$(li)Шеелит: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Электротин: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()", + "text": "$(li)Шелдонит: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()$(li)Электротин: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_vein_index.json index 33329634b..7aacf0c1d 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/nether_vein_index.json @@ -14,17 +14,17 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_garnet)Аметист, Опал и гранат$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_anthracite)Антрацит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_apatite)Апатит и Пирохлор$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_monazite)Бастнезит и Монацит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_olivine)Бентонит и Оливин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_molybdenum)Вульфенит & Молибденит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_garnierite)Гарниерит и Кобальтит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_hematite)Гематит и Лимонит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_goethite)Гётит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_garnet_tin)Гранатовый и Касситеритовый песок$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_graphite)Графит и Алмаз$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_gold)Золото и Гематит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_beryllium)Изумруд и Бериллий$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_cassiterite)Касситерит$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_garnet)Аметист, Опал и гранат$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_anthracite)Антрацит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_apatite)Апатит и Пирохлор$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_monazite)Бастнезит и Монацит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_olivine)Бентонит и Оливин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_molybdenum)Вульфенит & Молибденит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_garnierite)Гарниерит и Кобальтит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_hematite)Гематит и Лимонит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_goethite)Гётит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_gypsum)Гипс и Кальцит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_garnet_tin)Гранатовый и Касситеритовый песок$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_graphite)Графит и Алмаз$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_gold)Золото и Гематит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_beryllium)Изумруд и Бериллий$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_lapis)Лазурит, Лазурит 2 и Содалит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_manganese)Марганец и Тантал$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_copper)Медь и Халькопирит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_basaltic_sands)Минеральные пески$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lubricant)Мыльный камень, Тальк и Трона$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_naquadah)Наквада и Плутоний$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_quartz)Незер-кварц$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_redstone)Редстоун, Киноварь и Рубин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sapphire)Сапфир и Альмандин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_saltpeter)Селитра и Электротин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sulfur)Сера и Пирит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_silver)Серебро, Галена и Свинец$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sylvite)Сильвин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sphalerite)Сфалерит & Пирит$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_cassiterite)Касситерит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lapis)Лазурит, Лазурит 2 и Содалит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_manganese)Марганец и Тантал$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_copper)Медь и Халькопирит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_basaltic_sands)Минеральные пески$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lubricant)Мыльный камень, Тальк и Трона$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_naquadah)Наквада и Плутоний$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_quartz)Незер-кварц$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_redstone)Редстоун, Киноварь и Рубин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sapphire)Сапфир и Альмандин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_saltpeter)Селитра и Электротин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sulfur)Сера и Пирит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_silver)Серебро, Галена и Свинец$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sylvite)Сильвин$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_tetrahedrite)Тетраэдрит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_topaz)Топаз и Халькозин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_pitchblende)Уранинит и Уранит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_magnetite)Хромит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_mica)Ционит, Слюда и Боксит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_scheelite)Шеелит и Вольфрамат$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sheldonite)Шелдонит и Борнит$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_sphalerite)Сфалерит & Пирит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_tetrahedrite)Тетраэдрит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_topaz)Топаз и Халькозин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_pitchblende)Уранинит и Уранит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_magnetite)Хромит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_mica)Ционит, Слюда и Боксит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_scheelite)Шеелит и Вольфрамат$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sheldonite)Шелдонит и Борнит$()$()", "type": "patchouli:text" }, { @@ -770,6 +770,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Редкость$(): 180$(br)$(thing)Плотность$(): 0.4$(br)$(thing)Вид$(): дискообразная жила$(br)$(thing)Y-уровень$(): 32 — 128$(br)$(thing)Размер$(): 40$(br)$(thing)Высота$(): 9$(br2)$(thing)Виды камней$(): Мигматит, Пироксенит, Травертин", + "title": "Гипс и Кальцит", + "type": "patchouli:text", + "anchor": "nether_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Гипс", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 35%$(br)$(thing)Используется для$(): Алебастр (можно покрасить) и его кирпичи$(br)$(thing)Формула$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Кальцит", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 30%$(br)$(thing)Хромит$(): Кальций$(br)$(thing)Формула$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Бура", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 20%$(br)$(thing)Хромит$(): Натрий, Бор$(br)$(thing)Формула$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Смектическая глина", + "multiblock": { + "mapping": { + "0": "#forge:ores/fullers_earth" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Процент руды$(): 15%$(br)$(thing)Хромит$(): Магний$(br)$(thing)Формула$(): MgSi₄H(H₂O)₄O₁₁", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Редкость$(): 270$(br)$(thing)Плотность$(): 0.35$(br)$(thing)Вид$(): кластерная жила$(br)$(thing)Y-уровень$(): 24 — 128$(br)$(thing)Размер$(): 45$(br2)$(thing)Виды камней$(): Аспидный сланец, Габбро, Гнейс, Гранит, Диорит, Мигматит, Пироксенит, Травертин", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_ore_index.json index 7b592eff5..fad37fa7e 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_ore_index.json @@ -14,17 +14,17 @@ }, { "Type": "patchouli:text", - "text": "$(li)Азбест: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_quartz)18%$(/l)$()$(li)Алмандін: $(l:tfg_ores/earth_vein_index#deep_sapphire)38%$(/l)$()$(li)Алуніт: $(l:tfg_ores/earth_vein_index#normal_saltpeter)15%$(/l)$()$(li)Аметист: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)65%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)25%$(/l)$()$(li)Апатит: $(l:tfg_ores/earth_vein_index#normal_apatite)50%$(/l)$()$(li)Базальтовий мінеральний пісок: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)35%$(/l)$()$(li)Барит: $(l:tfg_ores/earth_vein_index#normal_quartz)37%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/earth_vein_index#normal_monazite)62%$(/l)$()$(li)Бентоніт: $(l:tfg_ores/earth_vein_index#normal_olivine)35%$(/l)$()$(li)Берилій: $(l:tfg_ores/earth_vein_index#normal_beryllium)35%$(/l)$()$(li)Блакитний топаз: $(l:tfg_ores/earth_vein_index#deep_topaz)35%$(/l)$()$(li)Боксит: $(l:tfg_ores/earth_vein_index#normal_mica)25%$(/l)$()$(li)Борніт: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)Бура: $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l)$()", + "text": "$(li)Азбест: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_quartz)18%$(/l)$()$(li)Алмандін: $(l:tfg_ores/earth_vein_index#deep_sapphire)38%$(/l)$()$(li)Алуніт: $(l:tfg_ores/earth_vein_index#normal_saltpeter)15%$(/l)$()$(li)Аметист: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)65%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)25%$(/l)$()$(li)Апатит: $(l:tfg_ores/earth_vein_index#normal_apatite)50%$(/l)$()$(li)Базальтовий мінеральний пісок: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)35%$(/l)$()$(li)Барит: $(l:tfg_ores/earth_vein_index#normal_quartz)37%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/earth_vein_index#normal_monazite)62%$(/l)$()$(li)Бентоніт: $(l:tfg_ores/earth_vein_index#normal_olivine)35%$(/l)$()$(li)Берилій: $(l:tfg_ores/earth_vein_index#normal_beryllium)35%$(/l)$()$(li)Блакитний топаз: $(l:tfg_ores/earth_vein_index#deep_topaz)35%$(/l)$()$(li)Боксит: $(l:tfg_ores/earth_vein_index#normal_mica)25%$(/l)$()$(li)Борніт: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)Бура: $(l:tfg_ores/earth_vein_index#normal_gypsum)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_salt)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Ванадієвий магнетит: $(l:tfg_ores/earth_vein_index#normal_magnetite)22%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)25%$(/l)$()$(li)Вісмут: $(l:tfg_ores/earth_vein_index#surface_bismuthinite)90%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)80%$(/l)$()$(li)Вольфрам: $(l:tfg_ores/earth_vein_index#deep_scheelite)35%$(/l)$()$(li)Вугілля: $(l:tfg_ores/earth_vein_index#normal_coal)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_graphite)30%$(/l)$()$(li)Вульфеніт: $(l:tfg_ores/earth_vein_index#deep_molybdenum)47%$(/l)$()$(li)Галена: $(l:tfg_ores/earth_vein_index#normal_silver)30%$(/l)$()$(li)Гарнієрит: $(l:tfg_ores/earth_vein_index#normal_garnierite)30%$(/l)$()$(li)Гематит: $(l:tfg_ores/earth_vein_index#normal_hematite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)5%$(/l)$()$(li)Гетит: $(l:tfg_ores/earth_vein_index#deep_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)5%$(/l)$()$(li)Гіпс: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)15%$(/l)$()$(li)Главконітний пісок: $(l:tfg_ores/earth_vein_index#normal_lubricant)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_olivine)15%$(/l)$()$(li)Гранатовий пісок: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l)$()$(li)Гранітний мінеральний пісок: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Графіт: $(l:tfg_ores/earth_vein_index#normal_graphite)45%$(/l)$()", + "text": "$(li)Ванадієвий магнетит: $(l:tfg_ores/earth_vein_index#normal_magnetite)22%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)25%$(/l)$()$(li)Вісмут: $(l:tfg_ores/earth_vein_index#surface_bismuthinite)90%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)80%$(/l)$()$(li)Вольфрам: $(l:tfg_ores/earth_vein_index#deep_scheelite)35%$(/l)$()$(li)Вугілля: $(l:tfg_ores/earth_vein_index#normal_coal)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_graphite)30%$(/l)$()$(li)Вульфеніт: $(l:tfg_ores/earth_vein_index#deep_molybdenum)47%$(/l)$()$(li)Галена: $(l:tfg_ores/earth_vein_index#normal_silver)30%$(/l)$()$(li)Гарнієрит: $(l:tfg_ores/earth_vein_index#normal_garnierite)30%$(/l)$()$(li)Гематит: $(l:tfg_ores/earth_vein_index#normal_hematite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)5%$(/l)$()$(li)Гетит: $(l:tfg_ores/earth_vein_index#deep_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#normal_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)5%$(/l)$()$(li)Гіпс: $(l:tfg_ores/earth_vein_index#normal_gypsum)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)15%$(/l)$()$(li)Главконітний пісок: $(l:tfg_ores/earth_vein_index#normal_lubricant)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_olivine)15%$(/l)$()$(li)Гранатовий пісок: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)25%$(/l)$()$(li)Гранітний мінеральний пісок: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Графіт: $(l:tfg_ores/earth_vein_index#normal_graphite)45%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Гроссуляр: $(l:tfg_ores/earth_vein_index#normal_manganese)37%$(/l)$()$(li)Діамант: $(l:tfg_ores/earth_vein_index#normal_graphite)25%$(/l)$()$(li)Діатомітн: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_garnet_tin)15%$(/l)$()$(li)Електротин: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l)$()$(li)Жовтий гранат: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)15%$(/l)$()$(li)Жовтий лимоніт: $(l:tfg_ores/earth_vein_index#normal_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l)$()$(li)Зелений сапфір: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l)$()$(li)Земля Фуллера: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l)$()$(li)Кальцит: $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)Кам’яна сіль: $(l:tfg_ores/earth_vein_index#normal_salt)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)20%$(/l)$()$(li)Каситерит: $(l:tfg_ores/earth_vein_index#surface_cassiterite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_copper)5%$(/l)$()$(li)Каситеритові піски: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)35%$(/l)$()$(li)Кварцит: $(l:tfg_ores/earth_vein_index#normal_quartz)43%$(/l)$()$(li)Кіаніт: $(l:tfg_ores/earth_vein_index#normal_mica)35%$(/l)$()", + "text": "$(li)Гроссуляр: $(l:tfg_ores/earth_vein_index#normal_manganese)37%$(/l)$()$(li)Діамант: $(l:tfg_ores/earth_vein_index#normal_graphite)25%$(/l)$()$(li)Діатомітн: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_garnet_tin)15%$(/l)$()$(li)Електротин: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l)$()$(li)Жовтий гранат: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)15%$(/l)$()$(li)Жовтий лимоніт: $(l:tfg_ores/earth_vein_index#normal_limonite)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_hematite)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_gold)20%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_limonite)15%$(/l), $(l:tfg_ores/earth_vein_index#deep_gold)5%$(/l)$()$(li)Зелений сапфір: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l)$()$(li)Земля Фуллера: $(l:tfg_ores/earth_vein_index#normal_basaltic_sands)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_gypsum)15%$(/l)$()$(li)Кальцит: $(l:tfg_ores/earth_vein_index#normal_gypsum)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)Кам’яна сіль: $(l:tfg_ores/earth_vein_index#normal_salt)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)20%$(/l)$()$(li)Каситерит: $(l:tfg_ores/earth_vein_index#surface_cassiterite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_copper)5%$(/l)$()$(li)Каситеритові піски: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)35%$(/l)$()$(li)Кварцит: $(l:tfg_ores/earth_vein_index#normal_quartz)43%$(/l)$()$(li)Кіаніт: $(l:tfg_ores/earth_vein_index#normal_mica)35%$(/l)$()", "type": "patchouli:text" }, { diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_vein_index.json index c697c4f35..312cbcd35 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/earth_vein_index.json @@ -14,22 +14,22 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)Аметист і Гранат$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_apatite)Апатит і Пірохлор$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_monazite)Бастнезит і Монацит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_olivine)Бентоніт та Олівін$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_bismuthinite)Вісмут (Звичайний)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_bismuthinite)Вісмут (Поверхня)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_coal)Вугілля$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Вульфеніт і Молібденіт$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Гарнієрит і Кобальтит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Гематит та Лімоніт$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Гематит, Гетит і Рубін$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Гетит і Малахіт$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Гранат і Каситеритові піски$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Графіт і Діамант$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)Аметист і Гранат$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_apatite)Апатит і Пірохлор$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_monazite)Бастнезит і Монацит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_olivine)Бентоніт та Олівін$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_bismuthinite)Вісмут (Звичайний)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_bismuthinite)Вісмут (Поверхня)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_coal)Вугілля$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_molybdenum)Вульфеніт і Молібденіт$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnierite)Гарнієрит і Кобальтит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_hematite)Гематит та Лімоніт$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_hematite)Гематит, Гетит і Рубін$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_limonite)Гетит і Малахіт$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gypsum)Гіпс і Кальцит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_garnet_tin)Гранат і Каситеритові піски$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Золото (Глибоке)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Золото, Лімоніт та Гематит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_cassiterite)Каситерит (Звичайний)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_cassiterite)Каситерит (Поверхнивий)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Кварц$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)Кіаніт, Слюда та Боксити$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Лапіс, Лазурит та Содаліт$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Лімоніт$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Магнетит і Ванадій$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Марганець і Тантал$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_copper)Мідь та Халькопірит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)Мінеральні піски$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)Нафтові піски$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Опал і Гранат$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_graphite)Графіт і Діамант$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_gold)Золото (Глибоке)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_gold)Золото, Лімоніт та Гематит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_cassiterite)Каситерит (Звичайний)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_cassiterite)Каситерит (Поверхнивий)$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_quartz)Кварц$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_mica)Кіаніт, Слюда та Боксити$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lapis)Лапіс, Лазурит та Содаліт$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_limonite)Лімоніт$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_magnetite)Магнетит і Ванадій$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_manganese)Марганець і Тантал$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_copper)Мідь та Халькопірит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_basaltic_sands)Мінеральні піски$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_oilsands)Нафтові піски$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Редстоун, Кіновар і Рубін$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Сапфір і Альмадін$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Селітра та Електротин$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Сірка та Пірит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)Смарагд і Берилій$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Солі та Бура$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Сподумен та Лепідоліт$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Срібло, Гален і Свинець$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Стеатит, Тальк і Трона$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Сфалерит і Пірит$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Сфалерит і Сірка$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Тетраедрит (Звичайний)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Тетраедрит (Поверхня)$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Топаз і Халькоцит$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_garnet_opal)Опал і Гранат$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_redstone)Редстоун, Кіновар і Рубін$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sapphire)Сапфір і Альмадін$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_saltpeter)Селітра та Електротин$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sulfur)Сірка та Пірит$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_beryllium)Смарагд і Берилій$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_salt)Солі та Бура$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_spodumene)Сподумен та Лепідоліт$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_silver)Срібло, Гален і Свинець$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_lubricant)Стеатит, Тальк і Трона$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_sphalerite)Сфалерит і Пірит$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_sphalerite)Сфалерит і Сірка$()$()$(li)$(l:tfg_ores/earth_vein_index#normal_tetrahedrite)Тетраедрит (Звичайний)$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_tetrahedrite)Тетраедрит (Поверхня)$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Ураніт & Пітчбленд$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_copper)Халькопірит та Реальгар$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)Хроміт і Магнетит$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Шеєліт та Вольфрам$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)Шелдоніт і Борніт$()$()", + "text": "$(li)$(l:tfg_ores/earth_vein_index#deep_topaz)Топаз і Халькоцит$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_pitchblende)Ураніт & Пітчбленд$()$()$(li)$(l:tfg_ores/earth_vein_index#surface_copper)Халькопірит та Реальгар$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_magnetite)Хроміт і Магнетит$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_scheelite)Шеєліт та Вольфрам$()$()$(li)$(l:tfg_ores/earth_vein_index#deep_sheldonite)Шелдоніт і Борніт$()$()", "type": "patchouli:text" }, { @@ -981,6 +981,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Рідкість$(): 180$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Дискова вена$(br)$(thing)Y$(): -32 — 60$(br)$(thing)Розмір$(): 40$(br)$(thing)Висота$(): 9$(br)$(thing)Індикатор Max Depth$(): 20$(br2)$(thing)Типи каменю$(): Аргиліт, Вапняк, Глинистий сланець, Доломіт, Конгломерат, Крейда, Кременистий сланець", + "title": "Гіпс і Кальцит", + "type": "patchouli:text", + "anchor": "normal_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Гіпс", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 35%$(br)$(thing)Використовується для$(): Алебастрової (фарбованої) цегли$(br)$(thing)Формула$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Кальцит", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 30%$(br)$(thing)Джерело$(): Кальцію$(br)$(thing)Формула$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Бура", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 20%$(br)$(thing)Джерело$(): Натрію, Бору$(br)$(thing)Формула$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Земля Фуллера", + "multiblock": { + "mapping": { + "0": "#forge:ores/fullers_earth" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 15%$(br)$(thing)Джерело$(): Магнезії$(br)$(thing)Формула$(): MgSi₄H(H₂O)₄O₁₁", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Рідкість$(): 270$(br)$(thing)Щільність$(): 0.25$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -40 — 64$(br)$(thing)Розмір$(): 40$(br)$(thing)Індикатор Max Depth$(): 60$(br2)$(thing)Типи каменю$(): Андезит, Аргиліт, Аспідний сланець, Базальт, Вапняк, Габро, Глинистий сланець, Гнейс, Граніт, Дацит, Діорит, Доломіт, Кварцит, Конгломерат, Крейда, Кременистий сланець, Мармур, Ріоліт, Філіт, Шиферний сланець", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_ore_index.json new file mode 100644 index 000000000..f6aab2f2c --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_ore_index.json @@ -0,0 +1,22 @@ +{ + "__credits__": "This page was automatically generated by OresToFieldGuide.", + "name": "Mars Ore Index", + "icon": "tfc:ore/normal_hematite", + "category": "tfc:tfg_ores", + "read_by_default": true, + "secret": false, + "pages": [ + { + "Type": "patchouli:text", + "text": "Це $(thing)Індекс руд$() для $(thing)Mars$(). Усі руди відсортовані в алфавітному порядку, а потім — від найбагатших до найбідніших жил. Ви можете натиснути на них, щоб дізнатися більше про кожну жилу.", + "title": "Mars Ore Index", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Гематит: $(l:tfg_ores/mars_vein_index#mars_hematite)100%$(/l)$()", + "type": "patchouli:text" + } + ], + "sortnum": 6 +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_vein_index.json new file mode 100644 index 000000000..7151068ee --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/mars_vein_index.json @@ -0,0 +1,49 @@ +{ + "__credits__": "This page was automatically generated by OresToFieldGuide.", + "name": "Mars Vein Index", + "icon": "gtceu:mars_stone_hematite_ore", + "category": "tfc:tfg_ores", + "read_by_default": true, + "secret": false, + "pages": [ + { + "Type": "patchouli:text", + "text": "Це $(thing)Індекс жил$() для $(thing)Mars$(). Кожна жила містить інформацію про її рідкісність, щільність, тип, висоту залягання, розміри, породи, в яких вона з’являється, та інше.", + "title": "Mars Vein Index", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)$(l:tfg_ores/mars_vein_index#mars_hematite)(Placeholder Vein)$()$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(thing)Рідкість$(): 210$(br)$(thing)Щільність$(): 0.4$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): -16 — 100$(br)$(thing)Розмір$(): 40$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Red Granite, Аргиліт, Аргіліт, Базальт, Вапняк, Габро, Глинистий сланець, Граніт, Дацит, Діорит, Доломіт, Конгломерат, Крейда, Кременистий сланець, Трахіт", + "title": "(Placeholder Vein)", + "type": "patchouli:text", + "anchor": "mars_hematite" + }, + { + "Type": "patchouli:multiblock", + "name": "Гематит", + "multiblock": { + "mapping": { + "0": "#forge:ores/hematite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 100%$(br)$(thing)Розплавляється в$(): Чавун$(br)$(thing)Формула$(): Fe₂O₃", + "type": "patchouli:multiblock" + } + ], + "sortnum": 7 +} \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_ore_index.json index 4a4f9eb83..1f690bd55 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_ore_index.json @@ -14,27 +14,32 @@ }, { "Type": "patchouli:text", - "text": "$(li)Алмандін: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Алюмінію: $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l)$()$(li)Апатит: $(l:tfg_ores/moon_vein_index#moon_apatite)23%$(/l)$()$(li)Армолколіт: $(l:tfg_ores/moon_vein_index#moon_bauxite)21%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Барит: $(l:tfg_ores/moon_vein_index#moon_quartz)5%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/moon_vein_index#moon_monazite)61%$(/l)$()$(li)Берилій: $(l:tfg_ores/moon_vein_index#moon_beryllium)31%$(/l)$()$(li)Блакитний топаз: $(l:tfg_ores/moon_vein_index#moon_topaz)35%$(/l)$()$(li)Боксит: $(l:tfg_ores/moon_vein_index#moon_bauxite)36%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Борніт: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)15%$(/l)$()$(li)Ванадієвий магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Вольфрам: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Вульфеніт: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()$(li)Галена: $(l:tfg_ores/moon_vein_index#moon_silver)28%$(/l)$()", + "text": "$(li)Алмандін: $(l:tfg_ores/moon_vein_index#moon_sapphire)38%$(/l)$()$(li)Алуніт: $(l:tfg_ores/moon_vein_index#moon_gypsum)15%$(/l)$()$(li)Алюмінію: $(l:tfg_ores/moon_vein_index#moon_desh)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)14%$(/l)$()$(li)Аметист: $(l:tfg_ores/moon_vein_index#moon_garnet)38%$(/l)$()$(li)Апатит: $(l:tfg_ores/moon_vein_index#moon_apatite)23%$(/l)$()$(li)Армолколіт: $(l:tfg_ores/moon_vein_index#moon_bauxite)21%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)15%$(/l)$()$(li)Барит: $(l:tfg_ores/moon_vein_index#moon_quartz)5%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/moon_vein_index#moon_monazite)61%$(/l)$()$(li)Берилій: $(l:tfg_ores/moon_vein_index#moon_beryllium)31%$(/l)$()$(li)Блакитний топаз: $(l:tfg_ores/moon_vein_index#moon_topaz)35%$(/l)$()$(li)Боксит: $(l:tfg_ores/moon_vein_index#moon_bauxite)36%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)20%$(/l)$()$(li)Борніт: $(l:tfg_ores/moon_vein_index#moon_sheldonite)35%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)15%$(/l)$()$(li)Бура: $(l:tfg_ores/moon_vein_index#moon_gypsum)20%$(/l)$()$(li)Ванадієвий магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Гарнієрит: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l)$()$(li)Главконітний пісок: $(l:tfg_ores/moon_vein_index#moon_lubricant)25%$(/l)$()$(li)Графіт: $(l:tfg_ores/moon_vein_index#moon_graphite)52%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/moon_vein_index#moon_manganese)37%$(/l)$()$(li)Деш: $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_sphalerite)15%$(/l)$()$(li)Діамант: $(l:tfg_ores/moon_vein_index#moon_graphite)36%$(/l)$()$(li)Електротин: $(l:tfg_ores/moon_vein_index#moon_saltpeter)37%$(/l)$()$(li)Зелений сапфір: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l)$()$(li)Ільменіт: $(l:tfg_ores/moon_vein_index#moon_bauxite)42%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l)$()$(li)Кам’яна сіль: $(l:tfg_ores/moon_vein_index#moon_beryllium)18%$(/l)$()$(li)Кварц Нижнього Світу: $(l:tfg_ores/moon_vein_index#moon_quartz)30%$(/l)$()$(li)Кварцит: $(l:tfg_ores/moon_vein_index#moon_quartz)20%$(/l)$()$(li)Кіаніт: $(l:tfg_ores/moon_vein_index#moon_mica)33%$(/l)$()$(li)Кіновар: $(l:tfg_ores/moon_vein_index#moon_redstone)19%$(/l)$()", + "text": "$(li)Вольфрам: $(l:tfg_ores/moon_vein_index#moon_scheelite)50%$(/l)$()$(li)Вульфеніт: $(l:tfg_ores/moon_vein_index#moon_molybdenum)44%$(/l)$()$(li)Галена: $(l:tfg_ores/moon_vein_index#moon_silver)28%$(/l)$()$(li)Гарнієрит: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l)$()$(li)Гіпс: $(l:tfg_ores/moon_vein_index#moon_gypsum)35%$(/l)$()$(li)Главконітний пісок: $(l:tfg_ores/moon_vein_index#moon_lubricant)25%$(/l)$()$(li)Графіт: $(l:tfg_ores/moon_vein_index#moon_graphite)52%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/moon_vein_index#moon_manganese)37%$(/l)$()$(li)Деш: $(l:tfg_ores/moon_vein_index#moon_desh)40%$(/l), $(l:tfg_ores/moon_vein_index#moon_sphalerite)15%$(/l)$()$(li)Діамант: $(l:tfg_ores/moon_vein_index#moon_graphite)36%$(/l)$()$(li)Електротин: $(l:tfg_ores/moon_vein_index#moon_saltpeter)37%$(/l)$()$(li)Жовтий гранат: $(l:tfg_ores/moon_vein_index#moon_garnet)14%$(/l)$()$(li)Зелений сапфір: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)5%$(/l)$()$(li)Ільменіт: $(l:tfg_ores/moon_vein_index#moon_bauxite)42%$(/l), $(l:tfg_ores/moon_vein_index#moon_desh)25%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Кобальт: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)14%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Літій: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()$(li)Магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l)$()$(li)Молібденіт: $(l:tfg_ores/moon_vein_index#moon_molybdenum)33%$(/l)$()$(li)Монацит: $(l:tfg_ores/moon_vein_index#moon_monazite)30%$(/l)$()$(li)Неодим: $(l:tfg_ores/moon_vein_index#moon_monazite)6%$(/l)$()$(li)Нікель: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Нітрат калію: $(l:tfg_ores/moon_vein_index#moon_saltpeter)29%$(/l)$()$(li)Оливін: $(l:tfg_ores/moon_vein_index#moon_graphite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_apatite)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_beryllium)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_molybdenum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_redstone)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_silver)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_sapphire)2%$(/l), $(l:tfg_ores/moon_vein_index#moon_monazite)1%$(/l)$()$(li)Пентландит: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_lubricant)15%$(/l)$()$(li)Пірит: $(l:tfg_ores/moon_vein_index#moon_sphalerite)35%$(/l)$()$(li)Піролюзит: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)38%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Піроп: $(l:tfg_ores/moon_vein_index#moon_sapphire)27%$(/l)$()", + "text": "$(li)Кальцит: $(l:tfg_ores/moon_vein_index#moon_gypsum)25%$(/l)$()$(li)Кам’яна сіль: $(l:tfg_ores/moon_vein_index#moon_beryllium)18%$(/l)$()$(li)Каситерит: $(l:tfg_ores/moon_vein_index#moon_cassiterite)41%$(/l)$()$(li)Кварц Нижнього Світу: $(l:tfg_ores/moon_vein_index#moon_quartz)30%$(/l)$()$(li)Кварцит: $(l:tfg_ores/moon_vein_index#moon_quartz)20%$(/l)$()$(li)Кіаніт: $(l:tfg_ores/moon_vein_index#moon_mica)33%$(/l)$()$(li)Кіновар: $(l:tfg_ores/moon_vein_index#moon_redstone)19%$(/l)$()$(li)Кобальт: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)14%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Літій: $(l:tfg_ores/moon_vein_index#moon_scheelite)10%$(/l)$()$(li)Магнетит: $(l:tfg_ores/moon_vein_index#moon_magnetite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_gold)20%$(/l)$()$(li)Молібденіт: $(l:tfg_ores/moon_vein_index#moon_molybdenum)33%$(/l)$()$(li)Монацит: $(l:tfg_ores/moon_vein_index#moon_monazite)30%$(/l)$()$(li)Неодим: $(l:tfg_ores/moon_vein_index#moon_monazite)6%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Пірохлор: $(l:tfg_ores/moon_vein_index#moon_apatite)38%$(/l)$()$(li)Платина: $(l:tfg_ores/moon_vein_index#moon_sheldonite)15%$(/l)$()$(li)Повеліт: $(l:tfg_ores/moon_vein_index#moon_molybdenum)16%$(/l)$()$(li)Поклади Істинного Кварцу: $(l:tfg_ores/moon_vein_index#moon_quartz)45%$(/l)$()$(li)Полюцит: $(l:tfg_ores/moon_vein_index#moon_mica)14%$(/l)$()$(li)Редстоун: $(l:tfg_ores/moon_vein_index#moon_redstone)42%$(/l)$()$(li)Рубін: $(l:tfg_ores/moon_vein_index#moon_redstone)33%$(/l)$()$(li)Самородна Золото: $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Самородна Срібла: $(l:tfg_ores/moon_vein_index#moon_silver)42%$(/l)$()$(li)Сапфір: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)5%$(/l)$()$(li)Свинець: $(l:tfg_ores/moon_vein_index#moon_silver)23%$(/l)$()$(li)Слюда: $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Смарагд: $(l:tfg_ores/moon_vein_index#moon_beryllium)45%$(/l)$()$(li)Соапостон: $(l:tfg_ores/moon_vein_index#moon_lubricant)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)20%$(/l)$()", + "text": "$(li)Нікель: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_garnierite)19%$(/l)$()$(li)Нітрат калію: $(l:tfg_ores/moon_vein_index#moon_saltpeter)29%$(/l)$()$(li)Оливін: $(l:tfg_ores/moon_vein_index#moon_graphite)10%$(/l), $(l:tfg_ores/moon_vein_index#moon_apatite)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_beryllium)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_gypsum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_mica)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_molybdenum)5%$(/l), $(l:tfg_ores/moon_vein_index#moon_redstone)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_silver)4%$(/l), $(l:tfg_ores/moon_vein_index#moon_sapphire)2%$(/l), $(l:tfg_ores/moon_vein_index#moon_monazite)1%$(/l)$()$(li)Олово: $(l:tfg_ores/moon_vein_index#moon_cassiterite)17%$(/l)$()$(li)Опал: $(l:tfg_ores/moon_vein_index#moon_garnet)38%$(/l)$()$(li)Пентландит: $(l:tfg_ores/moon_vein_index#moon_garnierite)23%$(/l), $(l:tfg_ores/moon_vein_index#moon_lubricant)15%$(/l)$()$(li)Пірит: $(l:tfg_ores/moon_vein_index#moon_sphalerite)35%$(/l)$()$(li)Піролюзит: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)38%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Піроп: $(l:tfg_ores/moon_vein_index#moon_sapphire)27%$(/l)$()$(li)Пірохлор: $(l:tfg_ores/moon_vein_index#moon_apatite)38%$(/l)$()$(li)Платина: $(l:tfg_ores/moon_vein_index#moon_sheldonite)15%$(/l)$()$(li)Повеліт: $(l:tfg_ores/moon_vein_index#moon_molybdenum)16%$(/l)$()$(li)Поклади Істинного Кварцу: $(l:tfg_ores/moon_vein_index#moon_quartz)45%$(/l)$()$(li)Редстоун: $(l:tfg_ores/moon_vein_index#moon_redstone)42%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Спесартін: $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/moon_vein_index#moon_sphalerite)50%$(/l)$()$(li)Тальк: $(l:tfg_ores/moon_vein_index#moon_lubricant)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)12%$(/l)$()$(li)Танталіт: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()$(li)Топаз: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Торій: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Трикальційфосфат: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Трона: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Халькоцит: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Хроміт: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l)$()$(li)Шеєліт: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)Шелдонітн: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()", + "text": "$(li)Рубін: $(l:tfg_ores/moon_vein_index#moon_redstone)33%$(/l)$()$(li)Самородна Золото: $(l:tfg_ores/moon_vein_index#moon_gold)55%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)15%$(/l)$()$(li)Самородна Мідь: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)15%$(/l)$()$(li)Самородна Срібла: $(l:tfg_ores/moon_vein_index#moon_silver)42%$(/l)$()$(li)Сапфір: $(l:tfg_ores/moon_vein_index#moon_sapphire)16%$(/l), $(l:tfg_ores/moon_vein_index#moon_magnetite)5%$(/l)$()$(li)Свинець: $(l:tfg_ores/moon_vein_index#moon_silver)23%$(/l)$()$(li)Слюда: $(l:tfg_ores/moon_vein_index#moon_mica)23%$(/l)$()$(li)Смарагд: $(l:tfg_ores/moon_vein_index#moon_beryllium)45%$(/l)$()$(li)Соапостон: $(l:tfg_ores/moon_vein_index#moon_lubricant)30%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)20%$(/l)$()$(li)Спесартін: $(l:tfg_ores/moon_vein_index#moon_manganese)25%$(/l)$()$(li)Стибніт: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)20%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/moon_vein_index#moon_sphalerite)50%$(/l)$()$(li)Тальк: $(l:tfg_ores/moon_vein_index#moon_lubricant)20%$(/l), $(l:tfg_ores/moon_vein_index#moon_saltpeter)12%$(/l)$()$(li)Танталіт: $(l:tfg_ores/moon_vein_index#moon_pyrolusite)14%$(/l), $(l:tfg_ores/moon_vein_index#moon_manganese)12%$(/l)$()", + "type": "patchouli:text" + }, + { + "Type": "patchouli:text", + "text": "$(li)Тетраедрит: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)40%$(/l)$()$(li)Топаз: $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Торій: $(l:tfg_ores/moon_vein_index#moon_beryllium)0%$(/l)$()$(li)Трикальційфосфат: $(l:tfg_ores/moon_vein_index#moon_apatite)33%$(/l)$()$(li)Трона: $(l:tfg_ores/moon_vein_index#moon_lubricant)10%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/moon_vein_index#moon_cassiterite)35%$(/l)$()$(li)Халькоцит: $(l:tfg_ores/moon_vein_index#moon_tetrahedrite)25%$(/l), $(l:tfg_ores/moon_vein_index#moon_topaz)25%$(/l)$()$(li)Хроміт: $(l:tfg_ores/moon_vein_index#moon_magnetite)40%$(/l)$()$(li)Цеоліт: $(l:tfg_ores/moon_vein_index#moon_cassiterite)5%$(/l)$()$(li)Червоний гранат: $(l:tfg_ores/moon_vein_index#moon_garnet)9%$(/l)$()$(li)Шеєліт: $(l:tfg_ores/moon_vein_index#moon_scheelite)40%$(/l)$()$(li)Шелдонітн: $(l:tfg_ores/moon_vein_index#moon_sheldonite)25%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_vein_index.json index 2418dc197..2b294db35 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/moon_vein_index.json @@ -14,12 +14,12 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Апатит і Пірохлор$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Бастнезит і Монацит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Боксит і Ільменіт$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Вульфеніт і Молібденіт$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Гарнієрит і Кобальтит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_graphite)Графіт і Діамант$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Деш і Ільменіт$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Істинний Кварц$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_mica)Кіаніт, Слюда та Боксити$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_manganese)Марганець і Тантал$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_pyrolusite)Піролюзит і Кобальт$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Редстоун, Кіновар і Рубін$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sapphire)Сапфір і Альмадін$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_saltpeter)Селітра та Електротин$()$()", + "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_garnet)Аметист, Опал і Гранат$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_apatite)Апатит і Пірохлор$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_monazite)Бастнезит і Монацит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_bauxite)Боксит і Ільменіт$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_molybdenum)Вульфеніт і Молібденіт$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_garnierite)Гарнієрит і Кобальтит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_gypsum)Гіпс і Кальцит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_graphite)Графіт і Діамант$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_desh)Деш і Ільменіт$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_gold)Золото і Магнетит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_quartz)Істинний Кварц$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_cassiterite)Каситерит і Халькопірит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_mica)Кіаніт, Слюда та Боксити$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_manganese)Марганець і Тантал$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_beryllium)Смарагд і Берилій$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_silver)Срібло, Гален і Свинець$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_lubricant)Стеатит, Тальк і Трона$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sphalerite)Сфалерит і Пірит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_topaz)Топаз і Халькоцит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_magnetite)Хроміт і Магнетит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_scheelite)Шеєліт та Вольфрам$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sheldonite)Шелдоніт і Борніт$()$()", + "text": "$(li)$(l:tfg_ores/moon_vein_index#moon_pyrolusite)Піролюзит і Кобальт$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_redstone)Редстоун, Кіновар і Рубін$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sapphire)Сапфір і Альмадін$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_saltpeter)Селітра та Електротин$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_beryllium)Смарагд і Берилій$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_silver)Срібло, Гален і Свинець$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_lubricant)Стеатит, Тальк і Трона$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sphalerite)Сфалерит і Пірит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_tetrahedrite)Тетраедрит і Халькоцит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_topaz)Топаз і Халькоцит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_magnetite)Хроміт і Магнетит$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_scheelite)Шеєліт та Вольфрам$()$()$(li)$(l:tfg_ores/moon_vein_index#moon_sheldonite)Шелдоніт і Борніт$()$()", "type": "patchouli:text" }, { @@ -27,6 +27,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Рідкість$(): 230$(br)$(thing)Щільність$(): 0.35$(br)$(thing)Тип$(): Дискова вена$(br)$(thing)Y$(): 10 — 128$(br)$(thing)Розмір$(): 35$(br)$(thing)Висота$(): 7$(br)$(thing)Індикатор Max Depth$(): 20$(br2)$(thing)Типи каменю$(): Андезит, Базальт, Ріоліт", + "title": "Аметист, Опал і Гранат", + "type": "patchouli:text", + "anchor": "moon_garnet" + }, + { + "Type": "patchouli:multiblock", + "name": "Аметист", + "multiblock": { + "mapping": { + "0": "#forge:ores/amethyst" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 38%$(br)$(thing)Джерело$(): Залізо$(br)$(thing)Формула$(): (SiO₂)₄Fe", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Опал", + "multiblock": { + "mapping": { + "0": "#forge:ores/opal" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 38%$(br)$(thing)Джерело$(): Кремнію, Кисню$(br)$(thing)Формула$(): (SiO₂)", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Жовтий гранат", + "multiblock": { + "mapping": { + "0": "#forge:ores/yellow_garnet" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 14%$(br)$(thing)Джерело$(): Андрадиту, Гросулару, Уваровіту", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Червоний гранат", + "multiblock": { + "mapping": { + "0": "#forge:ores/red_garnet" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 9%$(br)$(thing)Джерело$(): Піроп, Алмадін, Спесартін", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Рідкість$(): 250$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 0 — 100$(br)$(thing)Розмір$(): 35$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Діорит, Норит", @@ -477,6 +569,113 @@ "text": "$(thing)Відсоток$(): 14%$(br)$(thing)Розплавляється в$(): Кобальту$(br)$(thing)Формула$(): Co", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Рідкість$(): 180$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Дискова вена$(br)$(thing)Y$(): 10 — 100$(br)$(thing)Розмір$(): 40$(br)$(thing)Висота$(): 9$(br)$(thing)Індикатор Max Depth$(): 20$(br2)$(thing)Типи каменю$(): Анортозит, Норит, Фоноліт", + "title": "Гіпс і Кальцит", + "type": "patchouli:text", + "anchor": "moon_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Гіпс", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 35%$(br)$(thing)Використовується для$(): Алебастрової (фарбованої) цегли$(br)$(thing)Формула$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Кальцит", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 25%$(br)$(thing)Джерело$(): Кальцію$(br)$(thing)Формула$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Бура", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 20%$(br)$(thing)Джерело$(): Натрію, Бору$(br)$(thing)Формула$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Алуніт", + "multiblock": { + "mapping": { + "0": "#forge:ores/alunite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 15%$(br)$(thing)Джерело$(): Калію, Алюмінію$(br)$(thing)Формула$(): KAl₃Si₂H₆O₁₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Оливін", + "multiblock": { + "mapping": { + "0": "#forge:ores/olivine" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 5%$(br)$(thing)Джерело$(): Магнію, Залізо$(br)$(thing)Формула$(): Mg₂Fe(SiO₂)₂", + "type": "patchouli:multiblock" + }, { "Type": "patchouli:text", "text": "$(thing)Рідкість$(): 260$(br)$(thing)Щільність$(): 0.55$(br)$(thing)Тип$(): Трубна вена$(br)$(thing)Y$(): 0 — 120$(br)$(thing)Висота$(): 60$(br)$(thing)Радіус$(): 12$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Базальт, Базальт, Габро, Фоноліт", @@ -636,6 +835,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Рідкість$(): 170$(br)$(thing)Щільність$(): 0.4$(br)$(thing)Тип$(): Дискова вена$(br)$(thing)Y$(): 10 — 80$(br)$(thing)Розмір$(): 40$(br)$(thing)Висота$(): 10$(br)$(thing)Індикатор Max Depth$(): 60$(br2)$(thing)Типи каменю$(): Базальт, Граніт, Діорит", + "title": "Золото і Магнетит", + "type": "patchouli:text", + "anchor": "moon_gold" + }, + { + "Type": "patchouli:multiblock", + "name": "Самородна Золото", + "multiblock": { + "mapping": { + "0": "#forge:ores/gold" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 55%$(br)$(thing)Розплавляється в$(): Золото$(br)$(thing)Формула$(): Au", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Боксит", + "multiblock": { + "mapping": { + "0": "#forge:ores/bauxite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 20%$(br)$(thing)Джерело$(): Алюмінію$(br)$(thing)Формула$(): Al₂O₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Магнетит", + "multiblock": { + "mapping": { + "0": "#forge:ores/magnetite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 20%$(br)$(thing)Розплавляється в$(): Чавун$(br)$(thing)Формула$(): Fe₃O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Зелений сапфір", + "multiblock": { + "mapping": { + "0": "#forge:ores/green_sapphire" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 5%$(br)$(thing)Джерело$(): Алюмінію$(br)$(thing)Формула$(): Al₂O₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Рідкість$(): 230$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 10 — 100$(br)$(thing)Розмір$(): 60$(br)$(thing)Індикатор Max Depth$(): 80$(br2)$(thing)Типи каменю$(): Андезит, Анортозит, Базальт, Габро, Дацит, Діорит, Норит, Ріоліт, Фоноліт", @@ -728,6 +1019,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Рідкість$(): 210$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 10 — 128$(br)$(thing)Розмір$(): 40$(br)$(thing)Індикатор Max Depth$(): 60$(br2)$(thing)Типи каменю$(): Габро, Граніт, Діорит, Норит", + "title": "Каситерит і Халькопірит", + "type": "patchouli:text", + "anchor": "moon_cassiterite" + }, + { + "Type": "patchouli:multiblock", + "name": "Каситерит", + "multiblock": { + "mapping": { + "0": "#forge:ores/cassiterite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 41%$(br)$(thing)Розплавляється в$(): Олово$(br)$(thing)Формула$(): SnO₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Халькопирит", + "multiblock": { + "mapping": { + "0": "#forge:ores/chalcopyrite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 35%$(br)$(thing)Розплавляється в$(): Мідь$(br)$(thing)Формула$(): CuFeS₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Олово", + "multiblock": { + "mapping": { + "0": "#forge:ores/tin" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 17%$(br)$(thing)Розплавляється в$(): Олово$(br)$(thing)Формула$(): Sn", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Цеоліт", + "multiblock": { + "mapping": { + "0": "#forge:ores/zeolite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 5%$(br)$(thing)Джерело$(): Алюмінію, Кисню$(br)$(thing)Формула$(): NaCa₄Si₂₇Al₉(H₂O)₂₈O₇₂", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Рідкість$(): 250$(br)$(thing)Щільність$(): 0.25$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 0 — 120$(br)$(thing)Розмір$(): 35$(br)$(thing)Індикатор Max Depth$(): 50$(br2)$(thing)Типи каменю$(): Анортозит, Габро, Діорит, Норит", @@ -797,10 +1180,10 @@ }, { "Type": "patchouli:multiblock", - "name": "Полюцит", + "name": "Алюмінію", "multiblock": { "mapping": { - "0": "#forge:ores/pollucite" + "0": "#forge:ores/aluminium" }, "pattern": [ [ @@ -812,7 +1195,7 @@ ] }, "enable_visualize": false, - "text": "$(thing)Відсоток$(): 14%$(br)$(thing)Джерело$(): Цезій, Алюмінію$(br)$(thing)Формула$(): Cs₂Al₂Si₄(H₂O)₂O₁₂", + "text": "$(thing)Відсоток$(): 14%$(br)$(thing)Джерело$(): Алюмінію$(br)$(thing)Формула$(): Al", "type": "patchouli:multiblock" }, { @@ -1683,6 +2066,98 @@ "text": "$(thing)Відсоток$(): 15%$(br)$(thing)Джерело$(): Заліза, Титану, Азоту$(br)$(thing)Формула$(): (Mg₂Fe(SiO₂)₂)₂(TiO₂)N₄", "type": "patchouli:multiblock" }, + { + "Type": "patchouli:text", + "text": "$(thing)Рідкість$(): 190$(br)$(thing)Щільність$(): 0.3$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 50 — 128$(br)$(thing)Розмір$(): 40$(br)$(thing)Індикатор Max Depth$(): 60$(br2)$(thing)Типи каменю$(): Андезит, Дацит, Ріоліт, Фоноліт", + "title": "Тетраедрит і Халькоцит", + "type": "patchouli:text", + "anchor": "moon_tetrahedrite" + }, + { + "Type": "patchouli:multiblock", + "name": "Тетраедрит", + "multiblock": { + "mapping": { + "0": "#forge:ores/tetrahedrite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 40%$(br)$(thing)Розплавляється в$(): Мідь$(br)$(thing)Формула$(): Cu₃SbS₃Fe", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Халькоцит", + "multiblock": { + "mapping": { + "0": "#forge:ores/chalcocite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 25%$(br)$(thing)Джерело$(): Міді$(br)$(thing)Формула$(): Cu₂S", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Стибніт", + "multiblock": { + "mapping": { + "0": "#forge:ores/stibnite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 20%$(br)$(thing)Розплавляється в$(): Сурму$(br)$(thing)Формула$(): Sb₂S₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Самородна Мідь", + "multiblock": { + "mapping": { + "0": "#forge:ores/copper" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 15%$(br)$(thing)Розплавляється в$(): Мідь$(br)$(thing)Формула$(): Cu", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Рідкість$(): 210$(br)$(thing)Щільність$(): 0.5$(br)$(thing)Тип$(): Дискова вена$(br)$(thing)Y$(): 0 — 120$(br)$(thing)Розмір$(): 64$(br)$(thing)Висота$(): 25$(br)$(thing)Індикатор Max Depth$(): 20$(br2)$(thing)Типи каменю$(): Андезит, Анортозит, Базальт, Габро, Дацит, Діорит, Норит, Ріоліт, Фоноліт", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_ore_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_ore_index.json index 2521afd64..ed2408ff2 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_ore_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_ore_index.json @@ -14,42 +14,42 @@ }, { "Type": "patchouli:text", - "text": "$(li)Азбест: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Алмандін: $(l:tfg_ores/nether_vein_index#nether_sapphire)38%$(/l)$()$(li)Алуніт: $(l:tfg_ores/nether_vein_index#nether_saltpeter)15%$(/l)$()$(li)Аметист: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Антрацит: $(l:tfg_ores/nether_vein_index#nether_anthracite)100%$(/l)$()$(li)Апатит: $(l:tfg_ores/nether_vein_index#nether_apatite)50%$(/l)$()$(li)Базальтовий мінеральний пісок: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)35%$(/l)$()$(li)Барит: $(l:tfg_ores/nether_vein_index#nether_quartz)20%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/nether_vein_index#nether_monazite)50%$(/l)$()$(li)Бентоніт: $(l:tfg_ores/nether_vein_index#nether_olivine)35%$(/l)$()$(li)Берилій: $(l:tfg_ores/nether_vein_index#nether_beryllium)33%$(/l)$()$(li)Блакитний топаз: $(l:tfg_ores/nether_vein_index#nether_topaz)35%$(/l)$()$(li)Борніт: $(l:tfg_ores/nether_vein_index#nether_sheldonite)41%$(/l), $(l:tfg_ores/nether_vein_index#nether_topaz)15%$(/l)$()$(li)Ванадієвий магнетит: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()", + "text": "$(li)Азбест: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Алмандін: $(l:tfg_ores/nether_vein_index#nether_sapphire)38%$(/l)$()$(li)Алуніт: $(l:tfg_ores/nether_vein_index#nether_saltpeter)15%$(/l)$()$(li)Аметист: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Антрацит: $(l:tfg_ores/nether_vein_index#nether_anthracite)100%$(/l)$()$(li)Апатит: $(l:tfg_ores/nether_vein_index#nether_apatite)50%$(/l)$()$(li)Базальтовий мінеральний пісок: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)35%$(/l)$()$(li)Барит: $(l:tfg_ores/nether_vein_index#nether_quartz)20%$(/l)$()$(li)Бастнезит: $(l:tfg_ores/nether_vein_index#nether_monazite)50%$(/l)$()$(li)Бентоніт: $(l:tfg_ores/nether_vein_index#nether_olivine)35%$(/l)$()$(li)Берилій: $(l:tfg_ores/nether_vein_index#nether_beryllium)33%$(/l)$()$(li)Блакитний топаз: $(l:tfg_ores/nether_vein_index#nether_topaz)35%$(/l)$()$(li)Борніт: $(l:tfg_ores/nether_vein_index#nether_sheldonite)41%$(/l), $(l:tfg_ores/nether_vein_index#nether_topaz)15%$(/l)$()$(li)Бура: $(l:tfg_ores/nether_vein_index#nether_gypsum)20%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Вольфрам: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Вугілля: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Вульфеніт: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l)$()$(li)Галена: $(l:tfg_ores/nether_vein_index#nether_silver)30%$(/l)$()$(li)Гарнієрит: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l)$()$(li)Гематит: $(l:tfg_ores/nether_vein_index#nether_hematite)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)5%$(/l)$()$(li)Гетит: $(l:tfg_ores/nether_vein_index#nether_goethite)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Гіпс: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)15%$(/l)$()$(li)Главконітний пісок: $(l:tfg_ores/nether_vein_index#nether_lubricant)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_olivine)15%$(/l)$()$(li)Гранатовий пісок: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Гранітний мінеральний пісок: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)Графіт: $(l:tfg_ores/nether_vein_index#nether_graphite)45%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/nether_vein_index#nether_manganese)37%$(/l)$()$(li)Діамант: $(l:tfg_ores/nether_vein_index#nether_graphite)40%$(/l)$()", + "text": "$(li)Ванадієвий магнетит: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()$(li)Вольфрам: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Вугілля: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Вульфеніт: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l)$()$(li)Галена: $(l:tfg_ores/nether_vein_index#nether_silver)30%$(/l)$()$(li)Гарнієрит: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l)$()$(li)Гематит: $(l:tfg_ores/nether_vein_index#nether_hematite)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)5%$(/l)$()$(li)Гетит: $(l:tfg_ores/nether_vein_index#nether_goethite)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Гіпс: $(l:tfg_ores/nether_vein_index#nether_gypsum)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)15%$(/l)$()$(li)Главконітний пісок: $(l:tfg_ores/nether_vein_index#nether_lubricant)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_olivine)15%$(/l)$()$(li)Гранатовий пісок: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)25%$(/l)$()$(li)Гранітний мінеральний пісок: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)Графіт: $(l:tfg_ores/nether_vein_index#nether_graphite)45%$(/l)$()$(li)Гроссуляр: $(l:tfg_ores/nether_vein_index#nether_manganese)37%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Діатомітн: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()$(li)Електротин: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()$(li)Жовтий гранат: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()$(li)Жовтий лимоніт: $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Зелений сапфір: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l)$()$(li)Земля Фуллера: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l)$()$(li)Кальцит: $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()$(li)Кам’яна сіль: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()$(li)Каситерит: $(l:tfg_ores/nether_vein_index#nether_cassiterite)40%$(/l)$()$(li)Каситеритові піски: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)35%$(/l)$()$(li)Кварц Нижнього Світу: $(l:tfg_ores/nether_vein_index#nether_quartz)54%$(/l)$()$(li)Кварцит: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)Кіаніт: $(l:tfg_ores/nether_vein_index#nether_mica)46%$(/l)$()$(li)Кіновар: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()", + "text": "$(li)Діамант: $(l:tfg_ores/nether_vein_index#nether_graphite)40%$(/l)$()$(li)Діатомітн: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()$(li)Електротин: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()$(li)Жовтий гранат: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()$(li)Жовтий лимоніт: $(l:tfg_ores/nether_vein_index#nether_goethite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)15%$(/l), $(l:tfg_ores/nether_vein_index#nether_gold)5%$(/l)$()$(li)Зелений сапфір: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l)$()$(li)Земля Фуллера: $(l:tfg_ores/nether_vein_index#nether_basaltic_sands)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_gypsum)15%$(/l)$()$(li)Кальцит: $(l:tfg_ores/nether_vein_index#nether_gypsum)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()$(li)Кам’яна сіль: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()$(li)Каситерит: $(l:tfg_ores/nether_vein_index#nether_cassiterite)40%$(/l)$()$(li)Каситеритові піски: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)35%$(/l)$()$(li)Кварц Нижнього Світу: $(l:tfg_ores/nether_vein_index#nether_quartz)54%$(/l)$()$(li)Кварцит: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)Кіаніт: $(l:tfg_ores/nether_vein_index#nether_mica)46%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Кобальт: $(l:tfg_ores/nether_vein_index#nether_garnierite)14%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)Лазурит: $(l:tfg_ores/nether_vein_index#nether_lapis)35%$(/l)$()$(li)Лапіс: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Літій: $(l:tfg_ores/nether_vein_index#nether_scheelite)20%$(/l)$()$(li)Магнезит: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Магнетит: $(l:tfg_ores/nether_vein_index#nether_magnetite)20%$(/l)$()$(li)Малахіт: $(l:tfg_ores/nether_vein_index#nether_goethite)20%$(/l)$()$(li)Молібденіт: $(l:tfg_ores/nether_vein_index#nether_molybdenum)31%$(/l)$()$(li)Монацит: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Наквадак: $(l:tfg_ores/nether_vein_index#nether_naquadah)75%$(/l)$()$(li)Неодим: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Нікель: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l), $(l:tfg_ores/nether_vein_index#nether_sheldonite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_molybdenum)15%$(/l)$()$(li)Нітрат калію: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l)$()", + "text": "$(li)Кіновар: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()$(li)Кобальт: $(l:tfg_ores/nether_vein_index#nether_garnierite)14%$(/l)$()$(li)Кобальтит: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)Лазурит: $(l:tfg_ores/nether_vein_index#nether_lapis)35%$(/l)$()$(li)Лапіс: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Літій: $(l:tfg_ores/nether_vein_index#nether_scheelite)20%$(/l)$()$(li)Магнезит: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Магнетит: $(l:tfg_ores/nether_vein_index#nether_magnetite)20%$(/l)$()$(li)Малахіт: $(l:tfg_ores/nether_vein_index#nether_goethite)20%$(/l)$()$(li)Молібденіт: $(l:tfg_ores/nether_vein_index#nether_molybdenum)31%$(/l)$()$(li)Монацит: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Наквадак: $(l:tfg_ores/nether_vein_index#nether_naquadah)75%$(/l)$()$(li)Неодим: $(l:tfg_ores/nether_vein_index#nether_monazite)25%$(/l)$()$(li)Нікель: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l), $(l:tfg_ores/nether_vein_index#nether_sheldonite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_molybdenum)15%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Оливін: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Олово: $(l:tfg_ores/nether_vein_index#nether_cassiterite)60%$(/l)$()$(li)Опал: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Пентландит: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_lubricant)15%$(/l)$()$(li)Пірит: $(l:tfg_ores/nether_vein_index#nether_sulfur)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)10%$(/l)$()$(li)Піролюзит: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Піроп: $(l:tfg_ores/nether_vein_index#nether_sapphire)27%$(/l)$()$(li)Пірохлор: $(l:tfg_ores/nether_vein_index#nether_apatite)15%$(/l)$()$(li)Платина: $(l:tfg_ores/nether_vein_index#nether_sheldonite)5%$(/l)$()$(li)Плутоній: $(l:tfg_ores/nether_vein_index#nether_naquadah)25%$(/l)$()$(li)Повеліт: $(l:tfg_ores/nether_vein_index#nether_molybdenum)10%$(/l)$()$(li)Полюцит: $(l:tfg_ores/nether_vein_index#nether_mica)20%$(/l)$()$(li)Редстоун: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()$(li)Рубін: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()", + "text": "$(li)Нітрат калію: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l)$()$(li)Оливін: $(l:tfg_ores/nether_vein_index#nether_olivine)25%$(/l)$()$(li)Олово: $(l:tfg_ores/nether_vein_index#nether_cassiterite)60%$(/l)$()$(li)Опал: $(l:tfg_ores/nether_vein_index#nether_garnet)38%$(/l)$()$(li)Пентландит: $(l:tfg_ores/nether_vein_index#nether_garnierite)23%$(/l), $(l:tfg_ores/nether_vein_index#nether_lubricant)15%$(/l)$()$(li)Пірит: $(l:tfg_ores/nether_vein_index#nether_sulfur)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_copper)10%$(/l)$()$(li)Піролюзит: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Піроп: $(l:tfg_ores/nether_vein_index#nether_sapphire)27%$(/l)$()$(li)Пірохлор: $(l:tfg_ores/nether_vein_index#nether_apatite)15%$(/l)$()$(li)Платина: $(l:tfg_ores/nether_vein_index#nether_sheldonite)5%$(/l)$()$(li)Плутоній: $(l:tfg_ores/nether_vein_index#nether_naquadah)25%$(/l)$()$(li)Повеліт: $(l:tfg_ores/nether_vein_index#nether_molybdenum)10%$(/l)$()$(li)Полюцит: $(l:tfg_ores/nether_vein_index#nether_mica)20%$(/l)$()$(li)Редстоун: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Самородна Золото: $(l:tfg_ores/nether_vein_index#nether_gold)75%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)5%$(/l)$()$(li)Самородна Мідь: $(l:tfg_ores/nether_vein_index#nether_copper)65%$(/l), $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)30%$(/l)$()$(li)Самородна Срібла: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Сапфір: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Свинець: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Сильвін: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Сірка: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()$(li)Слюда: $(l:tfg_ores/nether_vein_index#nether_mica)33%$(/l)$()$(li)Смарагд: $(l:tfg_ores/nether_vein_index#nether_beryllium)47%$(/l)$()$(li)Соапостон: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)Содаліт: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Спесартін: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Стибніт: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()$(li)Сфалерит: $(l:tfg_ores/nether_vein_index#nether_sphalerite)40%$(/l), $(l:tfg_ores/nether_vein_index#nether_sulfur)15%$(/l)$()", + "text": "$(li)Рубін: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()$(li)Самородна Золото: $(l:tfg_ores/nether_vein_index#nether_gold)75%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)5%$(/l)$()$(li)Самородна Мідь: $(l:tfg_ores/nether_vein_index#nether_copper)65%$(/l), $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)30%$(/l)$()$(li)Самородна Срібла: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Сапфір: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Свинець: $(l:tfg_ores/nether_vein_index#nether_silver)35%$(/l)$()$(li)Сильвін: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Сірка: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()$(li)Слюда: $(l:tfg_ores/nether_vein_index#nether_mica)33%$(/l)$()$(li)Смарагд: $(l:tfg_ores/nether_vein_index#nether_beryllium)47%$(/l)$()$(li)Соапостон: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)Содаліт: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Спесартін: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Стибніт: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Тальк: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Танталіт: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Тетраедрит: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Топаз: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Торій: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Трикальційфосфат: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Трона: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Уранит: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Ураніт: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Халькоцит: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Хроміт: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Червоний гранат: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)Шеєліт: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()", + "text": "$(li)Сфалерит: $(l:tfg_ores/nether_vein_index#nether_sphalerite)40%$(/l), $(l:tfg_ores/nether_vein_index#nether_sulfur)15%$(/l)$()$(li)Тальк: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Танталіт: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Тетраедрит: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Топаз: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Торій: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Трикальційфосфат: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Трона: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Уранит: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Ураніт: $(l:tfg_ores/nether_vein_index#nether_pitchblende)50%$(/l)$()$(li)Халькопирит: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Халькоцит: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Хроміт: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Червоний гранат: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)Шелдонітн: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()", + "text": "$(li)Шеєліт: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)Шелдонітн: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()", "type": "patchouli:text" } ], diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_vein_index.json index e27414b26..2f5c672b0 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/nether_vein_index.json @@ -14,17 +14,17 @@ }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_garnet)Аметист, Опал і Гранат$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_anthracite)Антрацит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_apatite)Апатит і Пірохлор$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_monazite)Бастнезит і Монацит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_olivine)Бентоніт та Олівін$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_molybdenum)Вульфеніт і Молібденіт$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_garnierite)Гарнієрит і Кобальтит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_hematite)Гематит та Лімоніт$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_goethite)Гетит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_garnet_tin)Гранат і Каситеритові піски$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_graphite)Графіт і Діамант$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_gold)Золото та Гематит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_cassiterite)Каситерит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_quartz)Кварц Нижнього Світу$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_garnet)Аметист, Опал і Гранат$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_anthracite)Антрацит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_apatite)Апатит і Пірохлор$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_monazite)Бастнезит і Монацит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_olivine)Бентоніт та Олівін$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_molybdenum)Вульфеніт і Молібденіт$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_garnierite)Гарнієрит і Кобальтит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_hematite)Гематит та Лімоніт$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_goethite)Гетит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_gypsum)Гіпс і Кальцит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_garnet_tin)Гранат і Каситеритові піски$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_graphite)Графіт і Діамант$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_gold)Золото та Гематит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_cassiterite)Каситерит$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_mica)Кіаніт, Слюда та Боксити$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lapis)Лапіс, Лазурит та Содаліт$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_manganese)Марганець і Тантал$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_copper)Мідь та Халькопірит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_basaltic_sands)Мінеральні піски$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_naquadah)Наквадак і Плутоній$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_redstone)Редстоун, Кіновар і Рубін$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sapphire)Сапфір і Альмадін$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_saltpeter)Селітра та Електротин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sylvite)Сильвін$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sulfur)Сірка та Пірит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_beryllium)Смарагд і Берилій$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_silver)Срібло, Гален і Свинець$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lubricant)Стеатит, Тальк і Трона$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_quartz)Кварц Нижнього Світу$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_mica)Кіаніт, Слюда та Боксити$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_lapis)Лапіс, Лазурит та Содаліт$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_manganese)Марганець і Тантал$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_copper)Мідь та Халькопірит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_basaltic_sands)Мінеральні піски$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_naquadah)Наквадак і Плутоній$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_redstone)Редстоун, Кіновар і Рубін$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sapphire)Сапфір і Альмадін$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_saltpeter)Селітра та Електротин$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sylvite)Сильвін$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sulfur)Сірка та Пірит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_beryllium)Смарагд і Берилій$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_silver)Срібло, Гален і Свинець$()$()", "type": "patchouli:text" }, { "Type": "patchouli:text", - "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_sphalerite)Сфалерит і Пірит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_tetrahedrite)Тетраедрит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_topaz)Топаз і Халькоцит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_pitchblende)Ураніт & Пітчбленд$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_magnetite)Хроміт$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_scheelite)Шеєліт та Вольфрам$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sheldonite)Шелдоніт і Борніт$()$()", + "text": "$(li)$(l:tfg_ores/nether_vein_index#nether_lubricant)Стеатит, Тальк і Трона$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sphalerite)Сфалерит і Пірит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_tetrahedrite)Тетраедрит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_topaz)Топаз і Халькоцит$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_pitchblende)Ураніт & Пітчбленд$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_magnetite)Хроміт$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_scheelite)Шеєліт та Вольфрам$()$()$(li)$(l:tfg_ores/nether_vein_index#nether_sheldonite)Шелдоніт і Борніт$()$()", "type": "patchouli:text" }, { @@ -770,6 +770,98 @@ "draw_filler": true, "type": "patchouli:empty" }, + { + "Type": "patchouli:text", + "text": "$(thing)Рідкість$(): 180$(br)$(thing)Щільність$(): 0.4$(br)$(thing)Тип$(): Дискова вена$(br)$(thing)Y$(): 32 — 128$(br)$(thing)Розмір$(): 40$(br)$(thing)Висота$(): 9$(br2)$(thing)Типи каменю$(): Мігматит, Піроксеніти, Травертин", + "title": "Гіпс і Кальцит", + "type": "patchouli:text", + "anchor": "nether_gypsum" + }, + { + "Type": "patchouli:multiblock", + "name": "Гіпс", + "multiblock": { + "mapping": { + "0": "#forge:ores/gypsum" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 35%$(br)$(thing)Використовується для$(): Алебастрової (фарбованої) цегли$(br)$(thing)Формула$(): CaS(H₂O)₂O₄", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Кальцит", + "multiblock": { + "mapping": { + "0": "#forge:ores/calcite" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 30%$(br)$(thing)Джерело$(): Кальцію$(br)$(thing)Формула$(): CaCO₃", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Бура", + "multiblock": { + "mapping": { + "0": "#forge:ores/borax" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 20%$(br)$(thing)Джерело$(): Натрію, Бору$(br)$(thing)Формула$(): Na₂B₄(H₂O)₁₀O₇", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:multiblock", + "name": "Земля Фуллера", + "multiblock": { + "mapping": { + "0": "#forge:ores/fullers_earth" + }, + "pattern": [ + [ + "0" + ], + [ + " " + ] + ] + }, + "enable_visualize": false, + "text": "$(thing)Відсоток$(): 15%$(br)$(thing)Джерело$(): Магнезії$(br)$(thing)Формула$(): MgSi₄H(H₂O)₄O₁₁", + "type": "patchouli:multiblock" + }, + { + "Type": "patchouli:empty", + "draw_filler": true, + "type": "patchouli:empty" + }, { "Type": "patchouli:text", "text": "$(thing)Рідкість$(): 270$(br)$(thing)Щільність$(): 0.35$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 24 — 128$(br)$(thing)Розмір$(): 45$(br2)$(thing)Типи каменю$(): Аспідний сланець, Габро, Гнейс, Граніт, Діорит, Мігматит, Піроксеніти, Травертин", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index d999d8baf..6cb99987b 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -686,6 +686,7 @@ "ore_vein.tfg.normal_garnierite": "Garnierite & Cobaltite", "ore_vein.tfg.normal_gold": "Gold, Limonite, & Hematite", "ore_vein.tfg.normal_graphite": "Graphite & Diamond", + "ore_vein.tfg.normal_gypsum": "Gypsum & Calcite", "ore_vein.tfg.normal_hematite": "Hematite & Limonite", "ore_vein.tfg.normal_lapis": "Lapis, Lazurite, & Sodalite", "ore_vein.tfg.normal_limonite": "Limonite", @@ -710,12 +711,17 @@ "ore_vein.tfg.surface_copper": "Chalcopyrite & Realgar", "ore_vein.tfg.surface_sphalerite": "Sphalerite & Sulfur", "ore_vein.tfg.surface_tetrahedrite": "Tetrahedrite (Surface)", + "ore_vein.tfg.mars_hematite": "(Placeholder Vein)", "ore_vein.tfg.moon_apatite": "Apatite & Pyrochlore", "ore_vein.tfg.moon_bauxite": "Bauxite & Ilmenite", "ore_vein.tfg.moon_beryllium": "Emerald & Beryllium", + "ore_vein.tfg.moon_cassiterite": "Cassiterite & Chalcopyrite", "ore_vein.tfg.moon_desh": "Desh & Ilmenite", + "ore_vein.tfg.moon_garnet": "Amethyst, Opal, & Garnet", "ore_vein.tfg.moon_garnierite": "Garnierite & Cobaltite", + "ore_vein.tfg.moon_gold": "Gold & Magnetite", "ore_vein.tfg.moon_graphite": "Graphite & Diamond", + "ore_vein.tfg.moon_gypsum": "Gypsum & Calcite", "ore_vein.tfg.moon_lubricant": "Soapstone, Talc, & Trona", "ore_vein.tfg.moon_magnetite": "Chromite & Magnetite", "ore_vein.tfg.moon_manganese": "Manganese & Tantalum", @@ -731,6 +737,7 @@ "ore_vein.tfg.moon_sheldonite": "Cooperite & Bornite", "ore_vein.tfg.moon_silver": "Silver, Galena, & Lead", "ore_vein.tfg.moon_sphalerite": "Sphalerite & Pyrite", + "ore_vein.tfg.moon_tetrahedrite": "Tetrahedrite & Chalcocite", "ore_vein.tfg.moon_topaz": "Topaz & Chalcocite", "ore_vein.tfg.nether_anthracite": "Anthracite", "ore_vein.tfg.nether_apatite": "Apatite & Pyrochlore", @@ -744,6 +751,7 @@ "ore_vein.tfg.nether_goethite": "Goethite", "ore_vein.tfg.nether_gold": "Gold & Hematite", "ore_vein.tfg.nether_graphite": "Graphite & Diamond", + "ore_vein.tfg.nether_gypsum": "Gypsum & Calcite", "ore_vein.tfg.nether_hematite": "Hematite & Limonite", "ore_vein.tfg.nether_lapis": "Lapis, Lazurite, & Sodalite", "ore_vein.tfg.nether_lubricant": "Soapstone, Talc, & Trona", diff --git a/kubejs/assets/tfg/lang/pt_br.json b/kubejs/assets/tfg/lang/pt_br.json index 7cfc20e32..786ba4dc3 100644 --- a/kubejs/assets/tfg/lang/pt_br.json +++ b/kubejs/assets/tfg/lang/pt_br.json @@ -326,6 +326,7 @@ "ore_vein.tfg.normal_garnierite": "Garnierita e Cobaltita", "ore_vein.tfg.normal_gold": "Ouro, Limonita e Hematita", "ore_vein.tfg.normal_graphite": "Grafite e Diamante", + "ore_vein.tfg.normal_gypsum": "Gipsita e Calcita", "ore_vein.tfg.normal_hematite": "Hematita e Limonita", "ore_vein.tfg.normal_lapis": "Lápis-lazúri, Lazurita e Sodalita", "ore_vein.tfg.normal_limonite": "Limonita", @@ -350,12 +351,17 @@ "ore_vein.tfg.surface_copper": "Calcopirita e Realgar", "ore_vein.tfg.surface_sphalerite": "Esfalerita e Enxofre", "ore_vein.tfg.surface_tetrahedrite": "Tetraedrita (Superfície)", + "ore_vein.tfg.mars_hematite": "(Placeholder Vein)", "ore_vein.tfg.moon_apatite": "Apatita e Pirocloro", "ore_vein.tfg.moon_bauxite": "Bauxita e Ilmenita", "ore_vein.tfg.moon_beryllium": "Esmeralda e Berílio", + "ore_vein.tfg.moon_cassiterite": "Cassiterita e Calcopirita", "ore_vein.tfg.moon_desh": "Desh e Ilmenita", + "ore_vein.tfg.moon_garnet": "Ametista, Opala e Granada", "ore_vein.tfg.moon_garnierite": "Garnierita e Cobaltita", + "ore_vein.tfg.moon_gold": "Ouro e Magnetita", "ore_vein.tfg.moon_graphite": "Grafite e Diamante", + "ore_vein.tfg.moon_gypsum": "Gipsita e Calcita", "ore_vein.tfg.moon_lubricant": "Pedra-sabão, Talco e Trona", "ore_vein.tfg.moon_magnetite": "Cromita e Magnetita", "ore_vein.tfg.moon_manganese": "Manganês e Tântalo", @@ -371,6 +377,7 @@ "ore_vein.tfg.moon_sheldonite": "Cooperita e Bornita", "ore_vein.tfg.moon_silver": "Prata, Galena e Chumbo", "ore_vein.tfg.moon_sphalerite": "Esfalerita e Pirita", + "ore_vein.tfg.moon_tetrahedrite": "Tetraedrita e Calcocita", "ore_vein.tfg.moon_topaz": "Topázio e Calcosita", "ore_vein.tfg.nether_anthracite": "Antracito", "ore_vein.tfg.nether_apatite": "Apatita e Pirocloro", @@ -384,6 +391,7 @@ "ore_vein.tfg.nether_goethite": "Goethita", "ore_vein.tfg.nether_gold": "Ouro e Hematita", "ore_vein.tfg.nether_graphite": "Grafite e Diamante", + "ore_vein.tfg.nether_gypsum": "Gipsita e Calcita", "ore_vein.tfg.nether_hematite": "Hematita e Limonita", "ore_vein.tfg.nether_lapis": "Lápis-lazúri, Lazurita e Sodalita", "ore_vein.tfg.nether_lubricant": "Pedra-sabão, Talco e Trona", diff --git a/kubejs/assets/tfg/lang/ru_ru.json b/kubejs/assets/tfg/lang/ru_ru.json index bbd6f8230..612e31d9f 100644 --- a/kubejs/assets/tfg/lang/ru_ru.json +++ b/kubejs/assets/tfg/lang/ru_ru.json @@ -134,6 +134,7 @@ "ore_vein.tfg.normal_garnierite": "Гарниерит и Кобальтит", "ore_vein.tfg.normal_gold": "Золото, Лимонит и Гематит", "ore_vein.tfg.normal_graphite": "Графит и Алмаз", + "ore_vein.tfg.normal_gypsum": "Гипс и Кальцит", "ore_vein.tfg.normal_hematite": "Гематит и Лимонит", "ore_vein.tfg.normal_lapis": "Лазурит, Лазурит 2 и Содалит", "ore_vein.tfg.normal_limonite": "Лимонит", @@ -158,12 +159,17 @@ "ore_vein.tfg.surface_copper": "Халькопирит и Реальгар", "ore_vein.tfg.surface_sphalerite": "Сфалерит и Сера", "ore_vein.tfg.surface_tetrahedrite": "Тетраэдрит (Поверхностный)", + "ore_vein.tfg.mars_hematite": "(Placeholder Vein)", "ore_vein.tfg.moon_apatite": "Апатит и Пирохлор", "ore_vein.tfg.moon_bauxite": "Боксит и Ильменит", "ore_vein.tfg.moon_beryllium": "Изумруд и Бериллий", + "ore_vein.tfg.moon_cassiterite": "Касситерит и Халькопирит", "ore_vein.tfg.moon_desh": "Desh & Ilmenite", + "ore_vein.tfg.moon_garnet": "Аметист, Опал и гранат", "ore_vein.tfg.moon_garnierite": "Гарниерит и Кобальтит", + "ore_vein.tfg.moon_gold": "Золото и Магнетит", "ore_vein.tfg.moon_graphite": "Графит и Алмаз", + "ore_vein.tfg.moon_gypsum": "Гипс и Кальцит", "ore_vein.tfg.moon_lubricant": "Мыльный камень, Тальк и Трона", "ore_vein.tfg.moon_magnetite": "Хромит и Магнетит", "ore_vein.tfg.moon_manganese": "Марганец и Тантал", @@ -179,6 +185,7 @@ "ore_vein.tfg.moon_sheldonite": "Шелдонит и Борнит", "ore_vein.tfg.moon_silver": "Серебро, Галена и Свинец", "ore_vein.tfg.moon_sphalerite": "Сфалерит & Пирит", + "ore_vein.tfg.moon_tetrahedrite": "Тетраэдрит и Халькозин", "ore_vein.tfg.moon_topaz": "Топаз и Халькозин", "ore_vein.tfg.nether_anthracite": "Антрацит", "ore_vein.tfg.nether_apatite": "Апатит и Пирохлор", @@ -192,6 +199,7 @@ "ore_vein.tfg.nether_goethite": "Гётит", "ore_vein.tfg.nether_gold": "Золото и Гематит", "ore_vein.tfg.nether_graphite": "Графит и Алмаз", + "ore_vein.tfg.nether_gypsum": "Гипс и Кальцит", "ore_vein.tfg.nether_hematite": "Гематит и Лимонит", "ore_vein.tfg.nether_lapis": "Лазурит, Лазурит 2 и Содалит", "ore_vein.tfg.nether_lubricant": "Мыльный камень, Тальк и Трона", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index 2c29801b2..cfb3c8cda 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -668,23 +668,24 @@ "ore_vein.tfg.deep_pitchblende": "Ураніт & Пітчбленд", "ore_vein.tfg.deep_sapphire": "Сапфір і Альмадін", "ore_vein.tfg.deep_scheelite": "Шеєліт та Вольфрам", - "ore_vein.tfg.deep_sheldonite": "Куперит і Борніт", + "ore_vein.tfg.deep_sheldonite": "Шелдоніт і Борніт", "ore_vein.tfg.deep_topaz": "Топаз і Халькоцит", "ore_vein.tfg.normal_apatite": "Апатит і Пірохлор", "ore_vein.tfg.normal_basaltic_sands": "Мінеральні піски", "ore_vein.tfg.normal_beryllium": "Смарагд і Берилій", - "ore_vein.tfg.normal_bismuthinite": "Бісмут (Звичайний)", - "ore_vein.tfg.normal_cassiterite": "Каситерит (звичайний)", + "ore_vein.tfg.normal_bismuthinite": "Вісмут (Звичайний)", + "ore_vein.tfg.normal_cassiterite": "Каситерит (Звичайний)", "ore_vein.tfg.normal_coal": "Вугілля", "ore_vein.tfg.normal_copper": "Мідь та Халькопірит", "ore_vein.tfg.normal_garnet_tin": "Гранат і Каситеритові піски", "ore_vein.tfg.normal_garnierite": "Гарнієрит і Кобальтит", "ore_vein.tfg.normal_gold": "Золото, Лімоніт та Гематит", "ore_vein.tfg.normal_graphite": "Графіт і Діамант", + "ore_vein.tfg.normal_gypsum": "Гіпс і Кальцит", "ore_vein.tfg.normal_hematite": "Гематит та Лімоніт", "ore_vein.tfg.normal_lapis": "Лапіс, Лазурит та Содаліт", "ore_vein.tfg.normal_limonite": "Лімоніт", - "ore_vein.tfg.normal_lubricant": "Соапостон, Тальк і Трона", + "ore_vein.tfg.normal_lubricant": "Стеатит, Тальк і Трона", "ore_vein.tfg.normal_magnetite": "Магнетит і Ванадій", "ore_vein.tfg.normal_manganese": "Марганець і Тантал", "ore_vein.tfg.normal_mica": "Кіаніт, Слюда та Боксити", @@ -700,62 +701,69 @@ "ore_vein.tfg.normal_spodumene": "Сподумен та Лепідоліт", "ore_vein.tfg.normal_sulfur": "Сірка та Пірит", "ore_vein.tfg.normal_tetrahedrite": "Тетраедрит (Звичайний)", - "ore_vein.tfg.surface_bismuthinite": "Вісмут (Поверхневий)", - "ore_vein.tfg.surface_cassiterite": "Каситерит (Поверхневий)", + "ore_vein.tfg.surface_bismuthinite": "Вісмут (Поверхня)", + "ore_vein.tfg.surface_cassiterite": "Каситерит (Поверхнивий)", "ore_vein.tfg.surface_copper": "Халькопірит та Реальгар", "ore_vein.tfg.surface_sphalerite": "Сфалерит і Сірка", - "ore_vein.tfg.surface_tetrahedrite": "Тетраедрит (Поверхневий)", + "ore_vein.tfg.surface_tetrahedrite": "Тетраедрит (Поверхня)", + "ore_vein.tfg.mars_hematite": "(Placeholder Vein)", "ore_vein.tfg.moon_apatite": "Апатит і Пірохлор", "ore_vein.tfg.moon_bauxite": "Боксит і Ільменіт", "ore_vein.tfg.moon_beryllium": "Смарагд і Берилій", + "ore_vein.tfg.moon_cassiterite": "Каситерит і Халькопірит", "ore_vein.tfg.moon_desh": "Деш і Ільменіт", + "ore_vein.tfg.moon_garnet": "Аметист, Опал і Гранат", "ore_vein.tfg.moon_garnierite": "Гарнієрит і Кобальтит", + "ore_vein.tfg.moon_gold": "Золото і Магнетит", "ore_vein.tfg.moon_graphite": "Графіт і Діамант", - "ore_vein.tfg.moon_lubricant": "Соапостон, Тальк і Трона", + "ore_vein.tfg.moon_gypsum": "Гіпс і Кальцит", + "ore_vein.tfg.moon_lubricant": "Стеатит, Тальк і Трона", "ore_vein.tfg.moon_magnetite": "Хроміт і Магнетит", "ore_vein.tfg.moon_manganese": "Марганець і Тантал", "ore_vein.tfg.moon_mica": "Кіаніт, Слюда та Боксити", "ore_vein.tfg.moon_molybdenum": "Вульфеніт і Молібденіт", "ore_vein.tfg.moon_monazite": "Бастнезит і Монацит", "ore_vein.tfg.moon_pyrolusite": "Піролюзит і Кобальт", - "ore_vein.tfg.moon_quartz": "Істинний кварц", + "ore_vein.tfg.moon_quartz": "Істинний Кварц", "ore_vein.tfg.moon_redstone": "Редстоун, Кіновар і Рубін", "ore_vein.tfg.moon_saltpeter": "Селітра та Електротин", "ore_vein.tfg.moon_sapphire": "Сапфір і Альмадін", "ore_vein.tfg.moon_scheelite": "Шеєліт та Вольфрам", - "ore_vein.tfg.moon_sheldonite": "Куперит і Борніт", + "ore_vein.tfg.moon_sheldonite": "Шелдоніт і Борніт", "ore_vein.tfg.moon_silver": "Срібло, Гален і Свинець", "ore_vein.tfg.moon_sphalerite": "Сфалерит і Пірит", + "ore_vein.tfg.moon_tetrahedrite": "Тетраедрит і Халькоцит", "ore_vein.tfg.moon_topaz": "Топаз і Халькоцит", "ore_vein.tfg.nether_anthracite": "Антрацит", "ore_vein.tfg.nether_apatite": "Апатит і Пірохлор", "ore_vein.tfg.nether_basaltic_sands": "Мінеральні піски", "ore_vein.tfg.nether_beryllium": "Смарагд і Берилій", - "ore_vein.tfg.nether_cassiterite": "Касетерит", + "ore_vein.tfg.nether_cassiterite": "Каситерит", "ore_vein.tfg.nether_copper": "Мідь та Халькопірит", "ore_vein.tfg.nether_garnet": "Аметист, Опал і Гранат", "ore_vein.tfg.nether_garnet_tin": "Гранат і Каситеритові піски", "ore_vein.tfg.nether_garnierite": "Гарнієрит і Кобальтит", "ore_vein.tfg.nether_goethite": "Гетит", - "ore_vein.tfg.nether_gold": "Золото і Гематит", + "ore_vein.tfg.nether_gold": "Золото та Гематит", "ore_vein.tfg.nether_graphite": "Графіт і Діамант", + "ore_vein.tfg.nether_gypsum": "Гіпс і Кальцит", "ore_vein.tfg.nether_hematite": "Гематит та Лімоніт", "ore_vein.tfg.nether_lapis": "Лапіс, Лазурит та Содаліт", - "ore_vein.tfg.nether_lubricant": "Соапостон, Тальк і Трона", + "ore_vein.tfg.nether_lubricant": "Стеатит, Тальк і Трона", "ore_vein.tfg.nether_magnetite": "Хроміт", "ore_vein.tfg.nether_manganese": "Марганець і Тантал", "ore_vein.tfg.nether_mica": "Кіаніт, Слюда та Боксити", "ore_vein.tfg.nether_molybdenum": "Вульфеніт і Молібденіт", "ore_vein.tfg.nether_monazite": "Бастнезит і Монацит", - "ore_vein.tfg.nether_naquadah": "Наквада і Плутоній", + "ore_vein.tfg.nether_naquadah": "Наквадак і Плутоній", "ore_vein.tfg.nether_olivine": "Бентоніт та Олівін", "ore_vein.tfg.nether_pitchblende": "Ураніт & Пітчбленд", - "ore_vein.tfg.nether_quartz": "Незерський кварц", + "ore_vein.tfg.nether_quartz": "Кварц Нижнього Світу", "ore_vein.tfg.nether_redstone": "Редстоун, Кіновар і Рубін", "ore_vein.tfg.nether_saltpeter": "Селітра та Електротин", "ore_vein.tfg.nether_sapphire": "Сапфір і Альмадін", "ore_vein.tfg.nether_scheelite": "Шеєліт та Вольфрам", - "ore_vein.tfg.nether_sheldonite": "Куперит і Борніт", + "ore_vein.tfg.nether_sheldonite": "Шелдоніт і Борніт", "ore_vein.tfg.nether_silver": "Срібло, Гален і Свинець", "ore_vein.tfg.nether_sphalerite": "Сфалерит і Пірит", "ore_vein.tfg.nether_sulfur": "Сірка та Пірит", diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_garnet_opal.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_garnet_opal.json index 2e91fad6c..3d4d8f5b8 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_garnet_opal.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_garnet_opal.json @@ -47,8 +47,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_gold.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_gold.json index 24d21b7ae..ec13a657d 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_gold.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_gold.json @@ -42,8 +42,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_hematite.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_hematite.json index dbbcb2f17..f173f7850 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_hematite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_hematite.json @@ -50,8 +50,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_molybdenum.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_molybdenum.json index dd06853dd..aad5cabf3 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_molybdenum.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_molybdenum.json @@ -38,8 +38,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_sapphire.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_sapphire.json index 31bfc9eb2..1e8917ce4 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_sapphire.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/deep_sapphire.json @@ -43,8 +43,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_basaltic_sands.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_basaltic_sands.json index b5cc3d0bd..9e61f6ca7 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_basaltic_sands.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_basaltic_sands.json @@ -35,8 +35,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_beryllium.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_beryllium.json index 1f76cc062..645616ae0 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_beryllium.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_beryllium.json @@ -36,8 +36,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_copper.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_copper.json index 7d27df5ef..91bd65cf9 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_copper.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_copper.json @@ -38,8 +38,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_garnet_tin.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_garnet_tin.json index f8a3b27d5..f5c7da369 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_garnet_tin.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_garnet_tin.json @@ -34,8 +34,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_gold.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_gold.json index dace25d0e..220a19c23 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_gold.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_gold.json @@ -39,8 +39,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json index 6b74d783e..bd03ebf27 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_graphite.json @@ -240,8 +240,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_gypsum.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_gypsum.json new file mode 100644 index 000000000..3d7ec74c7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_gypsum.json @@ -0,0 +1,200 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "type": "tfc:disc_vein", + "config": { + "height": 9, + "size": 40, + "rarity": 180, + "density": 0.3, + "min_y": -32, + "max_y": 60, + "random_name": "normal_gypsum", + "blocks": [ + { + "replace": [ + "tfc:rock/raw/shale" + ], + "with": [ + { + "block": "gtceu:shale_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:shale_calcite_ore", + "weight": 30 + }, + { + "block": "gtceu:shale_fullers_earth_ore", + "weight": 15 + }, + { + "block": "gtceu:shale_gypsum_ore", + "weight": 35 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/claystone" + ], + "with": [ + { + "block": "gtceu:claystone_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:claystone_calcite_ore", + "weight": 30 + }, + { + "block": "gtceu:claystone_fullers_earth_ore", + "weight": 15 + }, + { + "block": "gtceu:claystone_gypsum_ore", + "weight": 35 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/limestone" + ], + "with": [ + { + "block": "gtceu:limestone_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:limestone_calcite_ore", + "weight": 30 + }, + { + "block": "gtceu:limestone_fullers_earth_ore", + "weight": 15 + }, + { + "block": "gtceu:limestone_gypsum_ore", + "weight": 35 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/conglomerate" + ], + "with": [ + { + "block": "gtceu:conglomerate_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:conglomerate_calcite_ore", + "weight": 30 + }, + { + "block": "gtceu:conglomerate_fullers_earth_ore", + "weight": 15 + }, + { + "block": "gtceu:conglomerate_gypsum_ore", + "weight": 35 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/dolomite" + ], + "with": [ + { + "block": "gtceu:dolomite_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:dolomite_calcite_ore", + "weight": 30 + }, + { + "block": "gtceu:dolomite_fullers_earth_ore", + "weight": 15 + }, + { + "block": "gtceu:dolomite_gypsum_ore", + "weight": 35 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/chert" + ], + "with": [ + { + "block": "gtceu:chert_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:chert_calcite_ore", + "weight": 30 + }, + { + "block": "gtceu:chert_fullers_earth_ore", + "weight": 15 + }, + { + "block": "gtceu:chert_gypsum_ore", + "weight": 35 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/chalk" + ], + "with": [ + { + "block": "gtceu:chalk_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:chalk_calcite_ore", + "weight": 30 + }, + { + "block": "gtceu:chalk_fullers_earth_ore", + "weight": 15 + }, + { + "block": "gtceu:chalk_gypsum_ore", + "weight": 35 + } + ] + } + ], + "indicator": { + "rarity": 15, + "depth": 20, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:borax_indicator", + "weight": 20 + }, + { + "block": "gtceu:calcite_indicator", + "weight": 30 + }, + { + "block": "gtceu:fullers_earth_indicator", + "weight": 15 + }, + { + "block": "gtceu:gypsum_indicator", + "weight": 35 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_hematite.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_hematite.json index 492ec069d..59cc1a505 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_hematite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_hematite.json @@ -38,8 +38,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_manganese.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_manganese.json index 396c0301b..608ce5b8f 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_manganese.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_manganese.json @@ -34,8 +34,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_olivine.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_olivine.json index 98d8a9584..ef1b2720e 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_olivine.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_olivine.json @@ -34,8 +34,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_sphalerite.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_sphalerite.json index 81af3111e..ddc49afb4 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_sphalerite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_sphalerite.json @@ -34,8 +34,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_sulfur.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_sulfur.json index 8f99aadaa..7b71c24ca 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_sulfur.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/normal_sulfur.json @@ -34,8 +34,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/surface_copper.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/surface_copper.json index f66f372cf..1e3d56b6b 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/surface_copper.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/surface_copper.json @@ -34,8 +34,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/surface_sphalerite.json b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/surface_sphalerite.json index a1d76e307..729a85601 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/earth/vein/surface_sphalerite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/vein/surface_sphalerite.json @@ -30,8 +30,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_hematite.json b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_hematite.json new file mode 100644 index 000000000..9caaf4d83 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/vein/mars_hematite.json @@ -0,0 +1,252 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "type": "tfc:cluster_vein", + "config": { + "size": 40, + "rarity": 210, + "density": 0.4, + "min_y": -16, + "max_y": 100, + "random_name": "mars_hematite", + "blocks": [ + { + "replace": [ + "ad_astra:mars_stone" + ], + "with": [ + { + "block": "gtceu:mars_stone_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "ad_astra:venus_stone" + ], + "with": [ + { + "block": "gtceu:venus_stone_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "gtceu:red_granite" + ], + "with": [ + { + "block": "gtceu:red_granite_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/granite" + ], + "with": [ + { + "block": "gtceu:granite_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/diorite" + ], + "with": [ + { + "block": "gtceu:diorite_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/gabbro" + ], + "with": [ + { + "block": "gtceu:gabbro_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/shale" + ], + "with": [ + { + "block": "gtceu:shale_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/claystone" + ], + "with": [ + { + "block": "gtceu:claystone_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/limestone" + ], + "with": [ + { + "block": "gtceu:limestone_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/conglomerate" + ], + "with": [ + { + "block": "gtceu:conglomerate_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/dolomite" + ], + "with": [ + { + "block": "gtceu:dolomite_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/chert" + ], + "with": [ + { + "block": "gtceu:chert_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/chalk" + ], + "with": [ + { + "block": "gtceu:chalk_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/basalt", + "minecraft:basalt" + ], + "with": [ + { + "block": "gtceu:basalt_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/dacite" + ], + "with": [ + { + "block": "gtceu:dacite_hematite_ore", + "weight": 100 + }, + { + "block": "gtceu:raw_hematite_block", + "weight": 1 + } + ] + } + ], + "indicator": { + "rarity": 12, + "depth": 50, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "tfc:ore/small_hematite", + "weight": 100 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_bauxite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_bauxite.json index df5055889..19f60ccaa 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_bauxite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_bauxite.json @@ -11,18 +11,26 @@ "blocks": [ { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { "block": "gtceu:basalt_bauxite_ore", "weight": 35 }, + { + "block": "gtceu:raw_bauxite_block", + "weight": 1 + }, { "block": "gtceu:basalt_ilmenite_ore", "weight": 40 }, + { + "block": "gtceu:raw_ilmenite_block", + "weight": 1 + }, { "block": "gtceu:basalt_armalcolite_ore", "weight": 20 @@ -38,10 +46,18 @@ "block": "gtceu:moon_stone_bauxite_ore", "weight": 35 }, + { + "block": "gtceu:raw_bauxite_block", + "weight": 1 + }, { "block": "gtceu:moon_stone_ilmenite_ore", "weight": 40 }, + { + "block": "gtceu:raw_ilmenite_block", + "weight": 1 + }, { "block": "gtceu:moon_stone_armalcolite_ore", "weight": 20 @@ -57,10 +73,18 @@ "block": "gtceu:moon_deepslate_bauxite_ore", "weight": 35 }, + { + "block": "gtceu:raw_bauxite_block", + "weight": 1 + }, { "block": "gtceu:moon_deepslate_ilmenite_ore", "weight": 40 }, + { + "block": "gtceu:raw_ilmenite_block", + "weight": 1 + }, { "block": "gtceu:moon_deepslate_armalcolite_ore", "weight": 20 @@ -76,10 +100,18 @@ "block": "gtceu:glacio_stone_bauxite_ore", "weight": 35 }, + { + "block": "gtceu:raw_bauxite_block", + "weight": 1 + }, { "block": "gtceu:glacio_stone_ilmenite_ore", "weight": 40 }, + { + "block": "gtceu:raw_ilmenite_block", + "weight": 1 + }, { "block": "gtceu:glacio_stone_armalcolite_ore", "weight": 20 @@ -95,10 +127,18 @@ "block": "gtceu:diorite_bauxite_ore", "weight": 35 }, + { + "block": "gtceu:raw_bauxite_block", + "weight": 1 + }, { "block": "gtceu:diorite_ilmenite_ore", "weight": 40 }, + { + "block": "gtceu:raw_ilmenite_block", + "weight": 1 + }, { "block": "gtceu:diorite_armalcolite_ore", "weight": 20 @@ -114,10 +154,18 @@ "block": "gtceu:rhyolite_bauxite_ore", "weight": 35 }, + { + "block": "gtceu:raw_bauxite_block", + "weight": 1 + }, { "block": "gtceu:rhyolite_ilmenite_ore", "weight": 40 }, + { + "block": "gtceu:raw_ilmenite_block", + "weight": 1 + }, { "block": "gtceu:rhyolite_armalcolite_ore", "weight": 20 diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_beryllium.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_beryllium.json index fa207b3ba..97a0a2192 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_beryllium.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_beryllium.json @@ -17,8 +17,8 @@ "blocks": [ { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_cassiterite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_cassiterite.json new file mode 100644 index 000000000..7fe3826ca --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_cassiterite.json @@ -0,0 +1,158 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "type": "tfc:cluster_vein", + "config": { + "size": 40, + "rarity": 210, + "density": 0.3, + "min_y": 10, + "max_y": 128, + "random_name": "moon_cassiterite", + "blocks": [ + { + "replace": [ + "tfc:rock/raw/granite" + ], + "with": [ + { + "block": "gtceu:granite_chalcopyrite_ore", + "weight": 30 + }, + { + "block": "gtceu:raw_chalcopyrite_block", + "weight": 1 + }, + { + "block": "gtceu:granite_zeolite_ore", + "weight": 5 + }, + { + "block": "gtceu:granite_cassiterite_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_cassiterite_block", + "weight": 1 + }, + { + "block": "gtceu:granite_tin_ore", + "weight": 15 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/diorite" + ], + "with": [ + { + "block": "gtceu:diorite_chalcopyrite_ore", + "weight": 30 + }, + { + "block": "gtceu:raw_chalcopyrite_block", + "weight": 1 + }, + { + "block": "gtceu:diorite_zeolite_ore", + "weight": 5 + }, + { + "block": "gtceu:diorite_cassiterite_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_cassiterite_block", + "weight": 1 + }, + { + "block": "gtceu:diorite_tin_ore", + "weight": 15 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/gabbro" + ], + "with": [ + { + "block": "gtceu:gabbro_chalcopyrite_ore", + "weight": 30 + }, + { + "block": "gtceu:raw_chalcopyrite_block", + "weight": 1 + }, + { + "block": "gtceu:gabbro_zeolite_ore", + "weight": 5 + }, + { + "block": "gtceu:gabbro_cassiterite_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_cassiterite_block", + "weight": 1 + }, + { + "block": "gtceu:gabbro_tin_ore", + "weight": 15 + } + ] + }, + { + "replace": [ + "ad_astra:moon_deepslate" + ], + "with": [ + { + "block": "gtceu:moon_deepslate_chalcopyrite_ore", + "weight": 30 + }, + { + "block": "gtceu:raw_chalcopyrite_block", + "weight": 1 + }, + { + "block": "gtceu:moon_deepslate_zeolite_ore", + "weight": 5 + }, + { + "block": "gtceu:moon_deepslate_cassiterite_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_cassiterite_block", + "weight": 1 + }, + { + "block": "gtceu:moon_deepslate_tin_ore", + "weight": 15 + } + ] + } + ], + "indicator": { + "rarity": 12, + "depth": 60, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "tfc:ore/small_cassiterite", + "weight": 50 + }, + { + "block": "gtceu:zeolite_indicator", + "weight": 5 + }, + { + "block": "gtceu:chalcopyrite_indicator", + "weight": 30 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_desh.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_desh.json index 65ce7f852..07f6d4ca7 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_desh.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_desh.json @@ -104,8 +104,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_garnet.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_garnet.json new file mode 100644 index 000000000..3e8c7c63b --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_garnet.json @@ -0,0 +1,133 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "type": "tfc:disc_vein", + "config": { + "height": 7, + "size": 35, + "rarity": 230, + "density": 0.35, + "min_y": 10, + "max_y": 128, + "random_name": "moon_garnet", + "blocks": [ + { + "replace": [ + "tfc:rock/raw/rhyolite" + ], + "with": [ + { + "block": "gtceu:rhyolite_red_garnet_ore", + "weight": 10 + }, + { + "block": "gtceu:rhyolite_yellow_garnet_ore", + "weight": 15 + }, + { + "block": "gtceu:rhyolite_amethyst_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_amethyst_block", + "weight": 1 + }, + { + "block": "gtceu:rhyolite_opal_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_opal_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/basalt", + "minecraft:basalt" + ], + "with": [ + { + "block": "gtceu:basalt_red_garnet_ore", + "weight": 10 + }, + { + "block": "gtceu:basalt_yellow_garnet_ore", + "weight": 15 + }, + { + "block": "gtceu:basalt_amethyst_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_amethyst_block", + "weight": 1 + }, + { + "block": "gtceu:basalt_opal_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_opal_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/andesite" + ], + "with": [ + { + "block": "gtceu:andesite_red_garnet_ore", + "weight": 10 + }, + { + "block": "gtceu:andesite_yellow_garnet_ore", + "weight": 15 + }, + { + "block": "gtceu:andesite_amethyst_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_amethyst_block", + "weight": 1 + }, + { + "block": "gtceu:andesite_opal_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_opal_block", + "weight": 1 + } + ] + } + ], + "indicator": { + "rarity": 15, + "depth": 20, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:red_garnet_bud_indicator", + "weight": 10 + }, + { + "block": "gtceu:yellow_garnet_bud_indicator", + "weight": 15 + }, + { + "block": "gtceu:amethyst_bud_indicator", + "weight": 40 + }, + { + "block": "gtceu:opal_bud_indicator", + "weight": 40 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_gold.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_gold.json new file mode 100644 index 000000000..0bfffb9a6 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_gold.json @@ -0,0 +1,121 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "type": "tfc:disc_vein", + "config": { + "height": 10, + "size": 40, + "rarity": 170, + "density": 0.4, + "min_y": 10, + "max_y": 80, + "random_name": "moon_gold", + "blocks": [ + { + "replace": [ + "tfc:rock/raw/basalt", + "minecraft:basalt" + ], + "with": [ + { + "block": "gtceu:basalt_green_sapphire_ore", + "weight": 5 + }, + { + "block": "gtceu:basalt_bauxite_ore", + "weight": 20 + }, + { + "block": "gtceu:basalt_magnetite_ore", + "weight": 20 + }, + { + "block": "gtceu:basalt_gold_ore", + "weight": 55 + }, + { + "block": "minecraft:raw_gold_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/granite" + ], + "with": [ + { + "block": "gtceu:granite_green_sapphire_ore", + "weight": 5 + }, + { + "block": "gtceu:granite_bauxite_ore", + "weight": 20 + }, + { + "block": "gtceu:granite_magnetite_ore", + "weight": 20 + }, + { + "block": "gtceu:granite_gold_ore", + "weight": 55 + }, + { + "block": "minecraft:raw_gold_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/diorite" + ], + "with": [ + { + "block": "gtceu:diorite_green_sapphire_ore", + "weight": 5 + }, + { + "block": "gtceu:diorite_bauxite_ore", + "weight": 20 + }, + { + "block": "gtceu:diorite_magnetite_ore", + "weight": 20 + }, + { + "block": "gtceu:diorite_gold_ore", + "weight": 55 + }, + { + "block": "minecraft:raw_gold_block", + "weight": 1 + } + ] + } + ], + "indicator": { + "rarity": 12, + "depth": 60, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:green_sapphire_bud_indicator", + "weight": 5 + }, + { + "block": "gtceu:bauxite_indicator", + "weight": 20 + }, + { + "block": "tfc:ore/small_magnetite", + "weight": 20 + }, + { + "block": "tfc:ore/small_native_gold", + "weight": 55 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_graphite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_graphite.json index fa3ab8267..a971dfefb 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_graphite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_graphite.json @@ -17,8 +17,8 @@ "blocks": [ { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { @@ -110,8 +110,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_gypsum.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_gypsum.json new file mode 100644 index 000000000..bad9a40c4 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_gypsum.json @@ -0,0 +1,136 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "type": "tfc:disc_vein", + "config": { + "height": 9, + "size": 40, + "rarity": 180, + "density": 0.3, + "min_y": 10, + "max_y": 100, + "random_name": "moon_gypsum", + "blocks": [ + { + "replace": [ + "ad_astra:moon_stone" + ], + "with": [ + { + "block": "gtceu:moon_stone_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:moon_stone_calcite_ore", + "weight": 25 + }, + { + "block": "gtceu:moon_stone_alunite_ore", + "weight": 15 + }, + { + "block": "gtceu:moon_stone_gypsum_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_gypsum_block", + "weight": 1 + }, + { + "block": "gtceu:moon_stone_olivine_ore", + "weight": 5 + } + ] + }, + { + "replace": [ + "ad_astra:glacio_stone" + ], + "with": [ + { + "block": "gtceu:glacio_stone_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:glacio_stone_calcite_ore", + "weight": 25 + }, + { + "block": "gtceu:glacio_stone_alunite_ore", + "weight": 15 + }, + { + "block": "gtceu:glacio_stone_gypsum_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_gypsum_block", + "weight": 1 + }, + { + "block": "gtceu:glacio_stone_olivine_ore", + "weight": 5 + } + ] + }, + { + "replace": [ + "ad_astra:moon_deepslate" + ], + "with": [ + { + "block": "gtceu:moon_deepslate_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:moon_deepslate_calcite_ore", + "weight": 25 + }, + { + "block": "gtceu:moon_deepslate_alunite_ore", + "weight": 15 + }, + { + "block": "gtceu:moon_deepslate_gypsum_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_gypsum_block", + "weight": 1 + }, + { + "block": "gtceu:moon_deepslate_olivine_ore", + "weight": 5 + } + ] + } + ], + "indicator": { + "rarity": 15, + "depth": 20, + "underground_rarity": 40, + "underground_count": 200, + "blocks": [ + { + "block": "gtceu:borax_indicator", + "weight": 20 + }, + { + "block": "gtceu:calcite_indicator", + "weight": 25 + }, + { + "block": "gtceu:alunite_indicator", + "weight": 15 + }, + { + "block": "gtceu:gypsum_indicator", + "weight": 35 + }, + { + "block": "gtceu:olivine_bud_indicator", + "weight": 5 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_lubricant.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_lubricant.json index 22be29ee3..4e29c67f3 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_lubricant.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_lubricant.json @@ -119,8 +119,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_manganese.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_manganese.json index 33d12a989..3f73c02b9 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_manganese.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_manganese.json @@ -34,8 +34,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { @@ -104,8 +104,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_mica.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_mica.json index 93e8e6043..8cc248a86 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_mica.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_mica.json @@ -31,7 +31,7 @@ "weight": 25 }, { - "block": "gtceu:diorite_pollucite_ore", + "block": "gtceu:diorite_aluminium_ore", "weight": 15 }, { @@ -62,7 +62,7 @@ "weight": 25 }, { - "block": "gtceu:gabbro_pollucite_ore", + "block": "gtceu:gabbro_aluminium_ore", "weight": 15 }, { @@ -93,7 +93,7 @@ "weight": 25 }, { - "block": "gtceu:moon_stone_pollucite_ore", + "block": "gtceu:moon_stone_aluminium_ore", "weight": 15 }, { @@ -124,7 +124,7 @@ "weight": 25 }, { - "block": "gtceu:moon_deepslate_pollucite_ore", + "block": "gtceu:moon_deepslate_aluminium_ore", "weight": 15 }, { @@ -153,7 +153,7 @@ "weight": 25 }, { - "block": "gtceu:pollucite_indicator", + "block": "gtceu:aluminium_indicator", "weight": 15 }, { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_molybdenum.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_molybdenum.json index cd9cd5282..064d537e8 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_molybdenum.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_molybdenum.json @@ -11,8 +11,8 @@ "blocks": [ { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_pyrolusite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_pyrolusite.json index 6d53962ff..e9f14a9aa 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_pyrolusite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_pyrolusite.json @@ -38,8 +38,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_quartz.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_quartz.json index 833754174..3ecb7b7bf 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_quartz.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_quartz.json @@ -11,8 +11,8 @@ "blocks": [ { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sapphire.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sapphire.json index 137fc6888..ccdf61301 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sapphire.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sapphire.json @@ -12,8 +12,8 @@ "blocks": [ { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sheldonite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sheldonite.json index de8075c4e..afdba374b 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sheldonite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sheldonite.json @@ -11,8 +11,8 @@ "blocks": [ { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sphalerite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sphalerite.json index 6919f3e71..f07416a4c 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sphalerite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_sphalerite.json @@ -11,8 +11,8 @@ "blocks": [ { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_tetrahedrite.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_tetrahedrite.json new file mode 100644 index 000000000..1be920439 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_tetrahedrite.json @@ -0,0 +1,146 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "type": "tfc:cluster_vein", + "config": { + "size": 40, + "rarity": 190, + "density": 0.3, + "min_y": 50, + "max_y": 128, + "random_name": "moon_tetrahedrite", + "blocks": [ + { + "replace": [ + "tfc:rock/raw/dacite" + ], + "with": [ + { + "block": "gtceu:dacite_tetrahedrite_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_tetrahedrite_block", + "weight": 1 + }, + { + "block": "gtceu:dacite_copper_ore", + "weight": 15 + }, + { + "block": "gtceu:dacite_stibnite_ore", + "weight": 20 + }, + { + "block": "gtceu:dacite_chalcocite_ore", + "weight": 25 + } + ] + }, + { + "replace": [ + "ad_astra:glacio_stone" + ], + "with": [ + { + "block": "gtceu:glacio_stone_tetrahedrite_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_tetrahedrite_block", + "weight": 1 + }, + { + "block": "gtceu:glacio_stone_copper_ore", + "weight": 15 + }, + { + "block": "gtceu:glacio_stone_stibnite_ore", + "weight": 20 + }, + { + "block": "gtceu:glacio_stone_chalcocite_ore", + "weight": 25 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/andesite" + ], + "with": [ + { + "block": "gtceu:andesite_tetrahedrite_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_tetrahedrite_block", + "weight": 1 + }, + { + "block": "gtceu:andesite_copper_ore", + "weight": 15 + }, + { + "block": "gtceu:andesite_stibnite_ore", + "weight": 20 + }, + { + "block": "gtceu:andesite_chalcocite_ore", + "weight": 25 + } + ] + }, + { + "replace": [ + "tfc:rock/raw/rhyolite" + ], + "with": [ + { + "block": "gtceu:rhyolite_tetrahedrite_ore", + "weight": 40 + }, + { + "block": "gtceu:raw_tetrahedrite_block", + "weight": 1 + }, + { + "block": "gtceu:rhyolite_copper_ore", + "weight": 15 + }, + { + "block": "gtceu:rhyolite_stibnite_ore", + "weight": 20 + }, + { + "block": "gtceu:rhyolite_chalcocite_ore", + "weight": 25 + } + ] + } + ], + "indicator": { + "rarity": 12, + "depth": 60, + "underground_rarity": 1, + "underground_count": 1, + "blocks": [ + { + "block": "tfc:ore/small_tetrahedrite", + "weight": 40 + }, + { + "block": "tfc:ore/small_native_copper", + "weight": 15 + }, + { + "block": "gtceu:stibnite_indicator", + "weight": 20 + }, + { + "block": "gtceu:chalcocite_indicator", + "weight": 25 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_topaz.json b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_topaz.json index d399fb653..56fe0531a 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_topaz.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/vein/moon_topaz.json @@ -12,8 +12,8 @@ "blocks": [ { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_basaltic_sands.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_basaltic_sands.json index 09470d9cf..cccbd7c71 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_basaltic_sands.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_basaltic_sands.json @@ -47,8 +47,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_beryllium.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_beryllium.json index 25cd317b0..80c57d36c 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_beryllium.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_beryllium.json @@ -86,8 +86,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_copper.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_copper.json index d6975cd48..de500d4d1 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_copper.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_copper.json @@ -88,8 +88,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_garnet.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_garnet.json index 0dbc417eb..cdb99b60b 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_garnet.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_garnet.json @@ -97,8 +97,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_goethite.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_goethite.json index da563d976..3558dc62a 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_goethite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_goethite.json @@ -96,8 +96,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_gypsum.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_gypsum.json new file mode 100644 index 000000000..bba1bc626 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_gypsum.json @@ -0,0 +1,151 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "type": "tfc:disc_vein", + "config": { + "height": 9, + "size": 40, + "rarity": 180, + "density": 0.4, + "min_y": 32, + "max_y": 128, + "random_name": "nether_gypsum", + "blocks": [ + { + "replace": [ + "minecraft:deepslate", + "tfc:mud/silty_loam", + "beneath:soul_clay", + "tfc:dirt/loam", + "tfc:mud/loam", + "tfc:peat", + "tfc:dirt/silty_loam" + ], + "with": [ + { + "block": "gtceu:deepslate_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:raw_borax_block", + "weight": 1 + }, + { + "block": "gtceu:deepslate_calcite_ore", + "weight": 30 + }, + { + "block": "gtceu:raw_calcite_block", + "weight": 1 + }, + { + "block": "gtceu:deepslate_fullers_earth_ore", + "weight": 15 + }, + { + "block": "gtceu:deepslate_gypsum_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_gypsum_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "minecraft:dripstone_block" + ], + "with": [ + { + "block": "gtceu:dripstone_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:raw_borax_block", + "weight": 1 + }, + { + "block": "gtceu:dripstone_calcite_ore", + "weight": 30 + }, + { + "block": "gtceu:raw_calcite_block", + "weight": 1 + }, + { + "block": "gtceu:dripstone_fullers_earth_ore", + "weight": 15 + }, + { + "block": "gtceu:dripstone_gypsum_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_gypsum_block", + "weight": 1 + } + ] + }, + { + "replace": [ + "minecraft:blackstone", + "minecraft:magma_block" + ], + "with": [ + { + "block": "gtceu:pyroxenite_borax_ore", + "weight": 20 + }, + { + "block": "gtceu:raw_borax_block", + "weight": 1 + }, + { + "block": "gtceu:pyroxenite_calcite_ore", + "weight": 30 + }, + { + "block": "gtceu:raw_calcite_block", + "weight": 1 + }, + { + "block": "gtceu:pyroxenite_fullers_earth_ore", + "weight": 15 + }, + { + "block": "gtceu:pyroxenite_gypsum_ore", + "weight": 35 + }, + { + "block": "gtceu:raw_gypsum_block", + "weight": 1 + } + ] + } + ], + "indicator": { + "rarity": 15, + "depth": 1, + "underground_rarity": 40, + "underground_count": 150, + "blocks": [ + { + "block": "gtceu:borax_indicator", + "weight": 20 + }, + { + "block": "gtceu:calcite_indicator", + "weight": 30 + }, + { + "block": "gtceu:fullers_earth_indicator", + "weight": 15 + }, + { + "block": "gtceu:gypsum_indicator", + "weight": 35 + } + ] + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_hematite.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_hematite.json index 48b653d6c..0a9d6d30c 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_hematite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_hematite.json @@ -96,8 +96,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_magnetite.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_magnetite.json index 0f02e4e67..0a0c8309e 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_magnetite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_magnetite.json @@ -88,8 +88,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_manganese.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_manganese.json index b1122ee7d..3143155bd 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_manganese.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_manganese.json @@ -52,8 +52,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_naquadah.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_naquadah.json index 4f59be363..b29158861 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_naquadah.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_naquadah.json @@ -35,8 +35,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_olivine.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_olivine.json index 5662185ca..dee894d86 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_olivine.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_olivine.json @@ -52,8 +52,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_quartz.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_quartz.json index 5b618a691..9405766c9 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_quartz.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_quartz.json @@ -72,8 +72,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sheldonite.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sheldonite.json index 5480ee655..d47865f85 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sheldonite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sheldonite.json @@ -88,8 +88,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sphalerite.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sphalerite.json index 974dba7fa..b363c5829 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sphalerite.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sphalerite.json @@ -48,8 +48,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sulfur.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sulfur.json index b6e10b202..ef7aba206 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sulfur.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_sulfur.json @@ -42,8 +42,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_topaz.json b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_topaz.json index 64607724c..a80881e8d 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_topaz.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/vein/nether_topaz.json @@ -89,8 +89,8 @@ }, { "replace": [ - "minecraft:basalt", - "tfc:rock/raw/basalt" + "tfc:rock/raw/basalt", + "minecraft:basalt" ], "with": [ { diff --git a/kubejs/data/tfg/worldgen/placed_feature/earth/vein/normal_gypsum.json b/kubejs/data/tfg/worldgen/placed_feature/earth/vein/normal_gypsum.json new file mode 100644 index 000000000..d01339c11 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/earth/vein/normal_gypsum.json @@ -0,0 +1,5 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "feature": "tfg:earth/vein/normal_gypsum", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/vein/mars_hematite.json b/kubejs/data/tfg/worldgen/placed_feature/mars/vein/mars_hematite.json new file mode 100644 index 000000000..dde0de71c --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/vein/mars_hematite.json @@ -0,0 +1,5 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "feature": "tfg:mars/vein/mars_hematite", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_cassiterite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_cassiterite.json new file mode 100644 index 000000000..1afc3113b --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_cassiterite.json @@ -0,0 +1,5 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "feature": "tfg:moon/vein/moon_cassiterite", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_garnet.json b/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_garnet.json new file mode 100644 index 000000000..1b3f77aec --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_garnet.json @@ -0,0 +1,5 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "feature": "tfg:moon/vein/moon_garnet", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_gold.json b/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_gold.json new file mode 100644 index 000000000..165774ba0 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_gold.json @@ -0,0 +1,5 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "feature": "tfg:moon/vein/moon_gold", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_gypsum.json b/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_gypsum.json new file mode 100644 index 000000000..86b586876 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_gypsum.json @@ -0,0 +1,5 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "feature": "tfg:moon/vein/moon_gypsum", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_tetrahedrite.json b/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_tetrahedrite.json new file mode 100644 index 000000000..8d59dab39 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/vein/moon_tetrahedrite.json @@ -0,0 +1,5 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "feature": "tfg:moon/vein/moon_tetrahedrite", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/nether/vein/nether_gypsum.json b/kubejs/data/tfg/worldgen/placed_feature/nether/vein/nether_gypsum.json new file mode 100644 index 000000000..9818e5b08 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/nether/vein/nether_gypsum.json @@ -0,0 +1,5 @@ +{ + "__credits__": "This vein was automatically generated by OresToFieldGuide.", + "feature": "tfg:nether/vein/nether_gypsum", + "placement": [] +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/tags.veins.js b/kubejs/server_scripts/tfg/tags.veins.js index edac64ca6..da310cfa2 100644 --- a/kubejs/server_scripts/tfg/tags.veins.js +++ b/kubejs/server_scripts/tfg/tags.veins.js @@ -29,6 +29,7 @@ const registerTFGOreVeinFeatures = (event) => { event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_garnierite') event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_gold') event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_graphite') + event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_gypsum') event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_hematite') event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_lapis') event.add('tfc:in_biome/veins', 'tfg:earth/vein/normal_limonite') @@ -57,14 +58,25 @@ const registerTFGOreVeinFeatures = (event) => { // #endregion + // #region mars ores + + event.add('tfg:mars_veins', 'tfg:mars/vein/mars_hematite') + + // #endregion + + // #region moon ores event.add('tfg:moon_veins', 'tfg:moon/vein/moon_apatite') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_bauxite') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_beryllium') + event.add('tfg:moon_veins', 'tfg:moon/vein/moon_cassiterite') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_desh') + event.add('tfg:moon_veins', 'tfg:moon/vein/moon_garnet') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_garnierite') + event.add('tfg:moon_veins', 'tfg:moon/vein/moon_gold') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_graphite') + event.add('tfg:moon_veins', 'tfg:moon/vein/moon_gypsum') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_lubricant') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_magnetite') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_manganese') @@ -80,6 +92,7 @@ const registerTFGOreVeinFeatures = (event) => { event.add('tfg:moon_veins', 'tfg:moon/vein/moon_sheldonite') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_silver') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_sphalerite') + event.add('tfg:moon_veins', 'tfg:moon/vein/moon_tetrahedrite') event.add('tfg:moon_veins', 'tfg:moon/vein/moon_topaz') // #endregion @@ -99,6 +112,7 @@ const registerTFGOreVeinFeatures = (event) => { event.add('tfg:nether_veins', 'tfg:nether/vein/nether_goethite') event.add('tfg:nether_veins', 'tfg:nether/vein/nether_gold') event.add('tfg:nether_veins', 'tfg:nether/vein/nether_graphite') + event.add('tfg:nether_veins', 'tfg:nether/vein/nether_gypsum') event.add('tfg:nether_veins', 'tfg:nether/vein/nether_hematite') event.add('tfg:nether_veins', 'tfg:nether/vein/nether_lapis') event.add('tfg:nether_veins', 'tfg:nether/vein/nether_lubricant') From 3329a4904936caaf12bd53e95906a81474d4ea5f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 22:40:54 +0100 Subject: [PATCH 122/158] missing hematitic sand tag --- kubejs/server_scripts/minecraft/tags.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index 57861a2b4..e949b3aa3 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -86,6 +86,8 @@ const registerMinecraftItemTags = (event) => { event.add('tfc:compost_greens', 'minecraft:warped_wart_block') event.add('forge:dyes/black', 'minecraft:ink_sac') + + event.add('tfc:hematitic_sand', 'minecraft:red_sand') } const registerMinecraftBlockTags = (event) => { From 3bcbcf6d060b4286cdbfac6aa770cd7f917720fd Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 22:47:32 +0100 Subject: [PATCH 123/158] added recipe for new hypertube thing --- .../create_hypertube/recipes.js | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/kubejs/server_scripts/create_hypertube/recipes.js b/kubejs/server_scripts/create_hypertube/recipes.js index 71ceca392..5088c2364 100644 --- a/kubejs/server_scripts/create_hypertube/recipes.js +++ b/kubejs/server_scripts/create_hypertube/recipes.js @@ -6,18 +6,34 @@ function registerCreateHypertubeRecipes(event) { event.recipes.gtceu.assembler('create_hypertube:hypertube') .itemInputs('2x #forge:plates/stainless_steel', '4x ae2:quartz_glass') .itemOutputs('8x create_hypertube:hypertube') - .EUt(512) - .duration(40) + .EUt(GTValues.VA[GTValues.HV]) + .duration(50) + event.recipes.gtceu.assembler('create_hypertube:entrance') .itemInputs('4x #forge:plates/stainless_steel','create:smart_chute' ,'greate:stainless_steel_cogwheel', 'ae2:charged_certus_quartz_crystal') .itemOutputs('create_hypertube:hypertube_entrance') .inputFluids(Fluid.of('gtceu:silicone_rubber', 288)) - .EUt(512) - .duration(80) + .EUt(GTValues.VA[GTValues.HV]) + .duration(100) + event.recipes.gtceu.assembler('create_hypertube:entrance_sbr') .itemInputs('4x #forge:plates/stainless_steel','create:smart_chute' ,'greate:stainless_steel_cogwheel', 'ae2:charged_certus_quartz_crystal') .itemOutputs('create_hypertube:hypertube_entrance') .inputFluids(Fluid.of('gtceu:styrene_butadiene_rubber', 144)) - .EUt(512) - .duration(80) + .EUt(GTValues.VA[GTValues.HV]) + .duration(100) + + event.recipes.gtceu.assembler('create_hypertube:accelerator') + .itemInputs('2x #forge:plates/stainless_steel', 'greate:stainless_steel_cogwheel', 'ae2:fluix_crystal') + .itemOutputs('create_hypertube:hypertube_accelerator') + .inputFluids(Fluid.of('gtceu:silicone_rubber', 288)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(100) + + event.recipes.gtceu.assembler('create_hypertube:accelerator_sbr') + .itemInputs('2x #forge:plates/stainless_steel', 'greate:stainless_steel_cogwheel', 'ae2:fluix_crystal') + .itemOutputs('create_hypertube:hypertube_accelerator') + .inputFluids(Fluid.of('gtceu:styrene_butadiene_rubber', 144)) + .EUt(GTValues.VA[GTValues.HV]) + .duration(100) } From d41827abdc9bd4118ec107c7a05786fdd1e7454a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 22:56:06 +0100 Subject: [PATCH 124/158] oh you can just change this in the config! that's cool. Also changed the infinity wand recipe --- CHANGELOG.md | 1 + defaultconfigs/constructionwand-server.toml | 6 +++--- .../server_scripts/constructionwand/recipes.js | 5 ++--- .../constructionwand/modifications.js | 17 ----------------- kubejs/startup_scripts/main_startup_script.js | 1 - 5 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 kubejs/startup_scripts/constructionwand/modifications.js diff --git a/CHANGELOG.md b/CHANGELOG.md index cd8841714..1bdaf1a25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Alabaster is now renewable via rock breaker @gustovafing - Added a new ore vein to all dimensions for gypsum, calcite, borax, and fuller's earth @Pyritie - Added some more moon ore veins for copper, tin, gold, aluminium.. nothing exciting @Pyritie +- Changed the recipe for the infinity construction wand @Pyritie ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop diff --git a/defaultconfigs/constructionwand-server.toml b/defaultconfigs/constructionwand-server.toml index 220eb0a35..cec3045fc 100644 --- a/defaultconfigs/constructionwand-server.toml +++ b/defaultconfigs/constructionwand-server.toml @@ -8,7 +8,7 @@ [stone_wand] #Wand durability #Range: > 1 - durability = 131 + durability = 791 #Wand block limit #Range: > 1 limit = 9 @@ -24,7 +24,7 @@ [iron_wand] #Wand durability #Range: > 1 - durability = 250 + durability = 2303 #Wand block limit #Range: > 1 limit = 27 @@ -40,7 +40,7 @@ [diamond_wand] #Wand durability #Range: > 1 - durability = 1561 + durability = 12286 #Wand block limit #Range: > 1 limit = 128 diff --git a/kubejs/server_scripts/constructionwand/recipes.js b/kubejs/server_scripts/constructionwand/recipes.js index 4cb343b04..735911c33 100644 --- a/kubejs/server_scripts/constructionwand/recipes.js +++ b/kubejs/server_scripts/constructionwand/recipes.js @@ -45,13 +45,12 @@ function registerConstructionwandRecipes(event) { event.shaped('1x constructionwand:infinity_wand', [ ' EB', ' C ', - 'AD ' + 'A ' ], { A: '#forge:rods/polytetrafluoroethylene', C: '#forge:rods/long/aluminium', B: '#forge:double_plates/titanium', - D: '#gtceu:circuits/iv', - E: 'minecraft:nether_star', + E: 'ae2:charged_certus_quartz_crystal', }).id('constructionwand:shaped/infinity_wand') event.shaped('1x constructionwand:core_angel', [ diff --git a/kubejs/startup_scripts/constructionwand/modifications.js b/kubejs/startup_scripts/constructionwand/modifications.js deleted file mode 100644 index 89426c237..000000000 --- a/kubejs/startup_scripts/constructionwand/modifications.js +++ /dev/null @@ -1,17 +0,0 @@ -// priority: 0 -"use strict"; - -function registerConstructionWandsItemModifications(event) { - - // Increase durability of all construction wands - - event.modify('constructionwand:stone_wand', item => { - item.maxDamage = 791 - }) - event.modify('constructionwand:iron_wand', item => { - item.maxDamage = 2303 - }) - event.modify('constructionwand:diamond_wand', item => { - item.maxDamage = 12286 - }) -} \ No newline at end of file diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index 49568b2de..89d4001af 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -23,7 +23,6 @@ BlockEvents.modification(event => { ItemEvents.modification(event => { registerBeneathItemModifications(event) - registerConstructionWandsItemModifications(event) registerCreateItemModifications(event) registerFirmalifeItemModifications(event) registerGTCEuItemModifications(event) From 941a0e2d0c6523ef1d62a882a9d9e2b0f5c6e5b7 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 22:59:56 +0100 Subject: [PATCH 125/158] tags to hide the sand piles from jei --- kubejs/server_scripts/tfg/tags.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 1e47a216e..bb62dbb3f 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -12,6 +12,19 @@ const registerTFGItemTags = (event) => { event.add('tfc:compost_greens_high', 'tfg:sunflower_product') event.add('tfg:water_breathing_ingredients', 'tfg:rapeseed_product') event.add('tfg:night_vision_ingredients', 'tfg:sunflower_product') + + event.add('c:hidden_from_recipe_viewers', 'tfg:ash_pile') + event.add('c:hidden_from_recipe_viewers', 'tfg:pile/black_sand') + event.add('c:hidden_from_recipe_viewers', 'tfg:pile/brown_sand') + event.add('c:hidden_from_recipe_viewers', 'tfg:pile/green_sand') + event.add('c:hidden_from_recipe_viewers', 'tfg:pile/pink_sand') + event.add('c:hidden_from_recipe_viewers', 'tfg:pile/red_sand') + event.add('c:hidden_from_recipe_viewers', 'tfg:pile/white_sand') + event.add('c:hidden_from_recipe_viewers', 'tfg:pile/yellow_sand') + event.add('c:hidden_from_recipe_viewers', 'tfg:pile/mars_sand') + event.add('c:hidden_from_recipe_viewers', 'tfg:pile/moon_sand') + event.add('c:hidden_from_recipe_viewers', 'tfg:pile/venus_sand') + //temporary hidden items event.add('c:hidden_from_recipe_viewers', 'tfg:geyser_source_small') event.add('c:hidden_from_recipe_viewers', 'tfg:geyser_source') From b87c42be06e87decef9ef84ba28062bf5d40c36c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 23:11:35 +0100 Subject: [PATCH 126/158] langs --- kubejs/assets/gtceu/lang/en_us.json | 1 + kubejs/assets/tfg/lang/en_us.json | 2 ++ 2 files changed, 3 insertions(+) diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 203ad05e9..57b015c45 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -180,6 +180,7 @@ "tagprefix.double_ingot": "%s Double Ingot", "tagprefix.poor_raw": "Poor Raw %s", "tagprefix.rich_raw": "Rich Raw %s", + "tagprefix.dusty_raw": "Dusty Raw %s", "tagprefix.gabbro": "Gabbro %s Ore", "tagprefix.shale": "Shale %s Ore", "tagprefix.claystone": "Claystone %s Ore", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 6cb99987b..a5aa37396 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -281,6 +281,8 @@ "block.tfg.rapeseed_dead": "Dead Canola", "block.tfg.casings.machine_casing_iron_desh": "Desh Machine Casing", "block.tfg.casings.machine_casing_stainless_evaporation": "Stainless Evaporation Machine Casing", + "block.tfg.casings.machine_casing_vacuum_engine_intake": "Vacuum Engine Intake Machine Casing", + "block.tfg.casings.machine_casing_mars": "Robust Dust-Proof Machine Casing", "block.tfg.casings.machine_casing_blue_solar_panel": "Basic Solar Panel Casing", "block.tfg.casings.machine_casing_green_solar_panel": "Advanced Solar Panel Casing", "block.tfg.casings.machine_casing_red_solar_panel": "Elite Solar Panel Casing", From bd379e106fef4e8e9c6e8b3399e944e634603fd6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 23:19:48 +0100 Subject: [PATCH 127/158] buffed these guys some more because goddamn the ae2 guns shred them --- defaultconfigs/wan_ancient_beasts-server.toml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/defaultconfigs/wan_ancient_beasts-server.toml b/defaultconfigs/wan_ancient_beasts-server.toml index f33c39ee8..272020a11 100644 --- a/defaultconfigs/wan_ancient_beasts-server.toml +++ b/defaultconfigs/wan_ancient_beasts-server.toml @@ -3,7 +3,7 @@ [sniffer] #Sniffer health [default: 75] #Range: 1.0 ~ 1024.0 - health = 75.0 + health = 150.0 #Sniffer armor [default: 3] #Range: 0.0 ~ 30.0 armor = 3.0 @@ -15,7 +15,7 @@ [eater] #Eater health [default: 100] #Range: 1.0 ~ 1024.0 - health = 200.0 + health = 400.0 #Eater attack damage [default: 30] #Range: 0.0 ~ 1024.0 damage = 30.0 @@ -30,7 +30,7 @@ [walker] #Walker health [default: 200] #Range: 1.0 ~ 1024.0 - health = 400.0 + health = 600.0 #Walker armor [default: 5] #Range: 0.0 ~ 30.0 armor = 14.0 @@ -42,28 +42,28 @@ [crusher] #Crusher health [default: 50] #Range: 1.0 ~ 1024.0 - health = 100.0 + health = 200.0 #Crusher attack damage [default: 10] #Range: 0.0 ~ 1024.0 damage = 10.0 #Crusher armor [default: 20] #Range: 0.0 ~ 30.0 - armor = 25.0 + armor = 35.0 #Crusher armor toughness [default: 4] #Range: 0.0 ~ 20.0 - armorToughness = 5.0 + armorToughness = 6.0 #Glider Attributes [glider] #Glider health [default: 25] #Range: 1.0 ~ 1024.0 - health = 50.0 + health = 150.0 #Soarer Attributes [soarer] #Soarer health [default: 40] #Range: 1.0 ~ 1024.0 - health = 80.0 + health = 250.0 #Soarer attack damage [default: 15] #Range: 0.0 ~ 1024.0 damage = 25.0 @@ -72,5 +72,5 @@ [surfer] #Surfer health [default: 30] #Range: 1.0 ~ 1024.0 - health = 30.0 + health = 150.0 From 1b8cec25ff53c48df50a50bedcf691e2be49070e Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 22 Aug 2025 23:44:08 +0100 Subject: [PATCH 128/158] some new quests --- .../chapters/applied_energistics_2.snbt | 3 ++ .../quests/chapters/hv__high_voltage.snbt | 48 +++++++++++++++++++ .../quests/chapters/questsmetallurgy.snbt | 9 ++++ kubejs/assets/tfg/lang/en_us.json | 9 ++++ 4 files changed, 69 insertions(+) diff --git a/config/ftbquests/quests/chapters/applied_energistics_2.snbt b/config/ftbquests/quests/chapters/applied_energistics_2.snbt index 69f3360bf..f7a7c7e05 100644 --- a/config/ftbquests/quests/chapters/applied_energistics_2.snbt +++ b/config/ftbquests/quests/chapters/applied_energistics_2.snbt @@ -1233,12 +1233,15 @@ } { dependencies: ["378E2294EFD85C65"] + description: ["{quests.ae2.programmed_circuit_card.desc}"] id: "51B34B3E51B6ECDD" + subtitle: "{quests.ae2.programmed_circuit_card.subtitle}" tasks: [{ id: "295980339E1FE027" item: "pccard:card_programmed_circuit" type: "item" }] + title: "{quests.ae2.programmed_circuit_card.title}" x: 1.0d y: -10.5d } diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index 0b4a4cdeb..0b20e09a8 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -1314,6 +1314,54 @@ x: 13.0d y: 1.5d } + { + dependencies: ["396E85A39FF414CF"] + description: ["{quests.high_voltage.hypertubes.desc}"] + icon: "create_hypertube:hypertube_entrance" + id: "194AB090A96CBC26" + optional: true + shape: "heart" + subtitle: "{quests.high_voltage.hypertubes.subtitle}" + tasks: [ + { + id: "284047DB1B1C022E" + item: "create_hypertube:hypertube_entrance" + type: "item" + } + { + disable_toast: true + id: "794148B8FFC9B001" + item: "create_hypertube:hypertube" + optional_task: true + type: "item" + } + ] + title: "{quests.high_voltage.hypertubes.title}" + x: 11.5d + y: -7.5d + } + { + dependencies: ["396E85A39FF414CF"] + description: ["{quests.high_voltage.wand.desc}"] + id: "6E370A161895A91B" + optional: true + shape: "heart" + subtitle: "{quests.high_voltage.wand.subtitle}" + tasks: [{ + id: "2311849F50A36265" + item: { + Count: 1 + id: "constructionwand:infinity_wand" + tag: { + wand_options: { } + } + } + type: "item" + }] + title: "{quests.high_voltage.wand.title}" + x: 13.0d + y: -8.0d + } ] subtitle: ["{quests.high_voltage.subtitle}"] title: "{quests.high_voltage}" diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt index ae7f936e9..9d65ba8ec 100644 --- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt +++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt @@ -308,6 +308,7 @@ } id: "tfc:kaolin_clay" } + match_nbt: false type: "item" weak_nbt_match: true }] @@ -966,7 +967,9 @@ } id: "tfc:metal/ingot/weak_red_steel" } + match_nbt: false type: "item" + weak_nbt_match: true } { id: "2A068958F7451FFB" @@ -980,7 +983,9 @@ } id: "tfc:metal/ingot/black_steel" } + match_nbt: false type: "item" + weak_nbt_match: true } ] title: "{quests.metal_age.highcarb_red_steel.title}" @@ -1157,7 +1162,9 @@ } id: "tfc:metal/ingot/weak_blue_steel" } + match_nbt: false type: "item" + weak_nbt_match: true } { id: "2755C292E4E19530" @@ -1171,7 +1178,9 @@ } id: "tfc:metal/ingot/black_steel" } + match_nbt: false type: "item" + weak_nbt_match: true } ] title: "{quests.metal_age.highcarb_blu_steel.title}" diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index a5aa37396..aeeb9ec16 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1118,6 +1118,9 @@ "quests.ae2.ae_guide.title": "Welcome to AE2", "quests.ae2.ae_guide.subtitle": "Another free book for your collection!", "quests.ae2.ae_guide.desc": "Here you are, ready to begin your &bAE2&r infrastructure!\n\nThis chapter will mainly guide you through what you can and cannot craft yet.\nWe’ll also highlight the most important items you should focus on.\n\nHowever, to fully understand Applied Energistics 2, we strongly recommend using the &bG&r keybind (similar to Create's Ponder system) or open the &bME Guide&r we provide as a reward from this quest. It’s the best in-game tutorial for AE2.\nAlternatively, watch some online videos about AE2 on &61.20.1&r for more detailed explanations — AE2 is a very popular mod, so there's a ton of tutorials out there!\n\n&dPro tip&r: Many &bAE2&r recipes have alternative Moon recipes that are much cheaper. Once again, investing in your Moon base will greatly reward you throughout the entire game.", + "quests.ae2.programmed_circuit_card.title": "Programmed Circuit Card", + "quests.ae2.programmed_circuit_card.subtitle": "An essential upgrade", + "quests.ae2.programmed_circuit_card.desc": "Insert one of these into your Pattern Providers, and if your recipe has a programmed circuit, the attached GregTech machine will automatically change its circuit to the one in the recipe. How useful is that?!", "quests.tasktype.checkmark": "Click here to complete this quest/task", "quests.tasktype.item.any": "Any Item of type:", "quests.tasktype.lookat": "Look at a:", @@ -1570,6 +1573,12 @@ "quests.high_voltage.space_survival.title": "Home away from home", "quests.high_voltage.space_survival.subtitle": "More than just a mining dimension", "quests.high_voltage.space_survival.desc": "If you haven't already, be sure to check out the &3Tips - Space Survival&r quest chapter! It contains all the information you'll need to establish a proper moon colony.", + "quests.high_voltage.hypertubes.title": "Hypertubes", + "quests.high_voltage.hypertubes.subtitle": "The future is now, old man", + "quests.high_voltage.hypertubes.desc": "Looking for a cooler way to quickly get around your base? Try &3Hypertubes&r! Just stand near one end and you'll be sucked up and transported to the other, and they can go in any direction too!\n\nThese do require Stress Units to power, but if you don't have a Create setup any more, you can turn EU into SU with a GregTech Energy Converter and an Electric Motor from &9&oCreate Crafts & Additions&r.", + "quests.high_voltage.wand.title": "Infinity Construction Wand", + "quests.high_voltage.wand.subtitle": "Ultimate skyblock tool", + "quests.high_voltage.wand.desc": "This wand does exactly the same thing as the other wands, except with &3no durability&r. Do you like building lots of tall buildings or paving over acres of pristine grassland? This is the tool for you!\n\nKeep in mind that Building Gadgets is available soon in &5EV&r, which provides even more powerful tools for avid builders.", "quests.low_voltage": "&7LV&r - Low Voltage", "quests.low_voltage.subtitle": "Tame electricity and begin your GregTech journey", "quests.low_voltage.lv_machine_hull.title": "Your second machine hull", From df9e90efa6430c2e9ab89e62ad180b383b790260 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 12:26:39 +0100 Subject: [PATCH 129/158] fix brick recipe conflict --- CHANGELOG.md | 1 + kubejs/server_scripts/createdeco/recipes.js | 1 + kubejs/server_scripts/minecraft/recipes.js | 7 ------- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bdaf1a25..b35cb1cf7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,7 @@ - Added more missing food processor recipes (#1632, #1638) @Pyritie - Fixed a few stuck quests (#1667, #1666) @Wicpar - Fixed inconsistent quern and macerator recipes for small tfc ores (#1672) @Pyritie +- Fixed recipe conflict with ceramic bricks and create deco colored bricks @Pyritie ## [0.10.9] - 10-08-2025 ### Changes diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index f51252196..1b43e3787 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -165,6 +165,7 @@ const registerCreatedecoRecipes = (event) => { .itemInputs('5x minecraft:brick', powder) .inputFluids(Fluid.of('gtceu:concrete', 144)) .itemOutputs(`4x createdeco:${type}_bricks`) + .circuit(3) .duration(50) .EUt(7) }); diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 16a2df8f5..5b96b8489 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -797,13 +797,6 @@ const registerMinecraftRecipes = (event) => { B: 'minecraft:brick' }).id('tfc:crafting/bricks') - event.recipes.gtceu.assembler('minecraft:bricks') - .itemInputs('5x minecraft:brick') - .inputFluids(Fluid.of('gtceu:concrete', 144)) - .itemOutputs(`4x minecraft:bricks`) - .duration(50) - .EUt(7) - //#endregion //#region Выход: Элитра From ca8ac9d727297cedba7e0a796d32c6b8229f56e6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 12:37:53 +0100 Subject: [PATCH 130/158] added some more vanilla blocks to the forge/bloomery insulation tag #1673 --- kubejs/server_scripts/minecraft/tags.js | 19 +++++++++++++++++++ kubejs/server_scripts/tfc/tags.js | 1 - 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index e949b3aa3..94fc5ed0d 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -157,6 +157,25 @@ const registerMinecraftBlockTags = (event) => { event.add('tfg:brick_stairs', 'minecraft:blackstone_stairs') event.add('tfg:brick_slabs', 'minecraft:blackstone_slab') event.add('tfg:brick_walls', 'minecraft:blackstone_wall') + + event.add('tfc:bloomery_insulation', 'minecraft:polished_deepslate'); + event.add('tfc:forge_insulation', 'minecraft:polished_deepslate'); + event.add('tfc:bloomery_insulation', 'minecraft:polished_blackstone'); + event.add('tfc:forge_insulation', 'minecraft:polished_blackstone'); + event.add('tfc:bloomery_insulation', 'minecraft:deepslate_tiles'); + event.add('tfc:forge_insulation', 'minecraft:deepslate_tiles'); + event.add('tfc:bloomery_insulation', 'minecraft:cracked_deepslate_tiles'); + event.add('tfc:forge_insulation', 'minecraft:cracked_deepslate_tiles'); + event.add('tfc:bloomery_insulation', 'minecraft:chiseled_deepslate'); + event.add('tfc:forge_insulation', 'minecraft:chiseled_deepslate'); + event.add('tfc:bloomery_insulation', 'minecraft:chiseled_polished_blackstone'); + event.add('tfc:forge_insulation', 'minecraft:chiseled_polished_blackstone'); + event.add('tfc:bloomery_insulation', 'minecraft:gilded_blackstone'); + event.add('tfc:forge_insulation', 'minecraft:gilded_blackstone'); + event.add('tfc:bloomery_insulation', 'minecraft:basalt'); + event.add('tfc:forge_insulation', 'minecraft:basalt'); + event.add('tfc:bloomery_insulation', 'minecraft:smooth_basalt'); + event.add('tfc:forge_insulation', 'minecraft:smooth_basalt'); //#region diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 42227aa1f..1d8b81b14 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -130,7 +130,6 @@ const registerTFCItemTags = (event) => { event.add('tfc:steam_bloomery_basic_fuels', 'minecraft:coal') event.add('tfc:steam_bloomery_basic_fuels', 'minecraft:charcoal') event.add('tfc:steam_bloomery_basic_fuels', 'gtceu:rich_raw_coal') - event.add('tfc:steam_bloomery_basic_fuels', 'gtceu:rich_raw_coal') event.add('tfc:steam_bloomery_basic_fuels', 'gtceu:raw_coal') event.add('tfc:steam_bloomery_basic_fuels', 'gtceu:poor_raw_coal') event.add('tfc:steam_bloomery_basic_fuels', 'gtceu:coal_dust') From 912bf72277e65d31adfe810b1c17fcd5182dc143 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 12:54:57 +0100 Subject: [PATCH 131/158] moved the lye to sodium hydroxide to the vacuumizer instead --- kubejs/server_scripts/tfc/recipes.js | 6 ------ .../vintage_improvements/recipes.js | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 3a5fadb02..4539c2c63 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -208,12 +208,6 @@ const registerTFCRecipes = (event) => { generateMixerRecipe(event, '#forge:dusts/sodium_hydroxide', "#tfg:clean_water 1000", [], null, Fluid.of('tfc:lye', 1000), 100, 2, 64, 'lye_from_sodium_hydroxide') - event.recipes.firmalife.vat() - .inputFluid(Fluid.of('tfc:lye', 1000)) - .outputItem('gtceu:sodium_hydroxide_dust') - .length(100) - .temperature(80) - event.recipes.gtceu.distillery('lye_to_sodium_hydroxide') .inputFluids('tfc:lye 1000') .itemOutputs('gtceu:sodium_hydroxide_dust') diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 10bd2cfb2..737505d4a 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -542,6 +542,9 @@ function registerVintageImprovementsRecipes(event) { // #region Vacuum + // Item to fluids: vacuumizing + // Fluids to item: pressurizing + event.custom({ type: 'vintageimprovements:vacuumizing', ingredients: [{ item: 'tfc:glue' }], @@ -621,11 +624,12 @@ function registerVintageImprovementsRecipes(event) { // Vulc. latex to raw rubber pulp event.custom({ - type: 'vintageimprovements:vacuumizing', + type: 'vintageimprovements:pressurizing', ingredients: [{ fluid: 'tfg:vulcanized_latex', amount: 250 }], results: [{ item: 'gtceu:raw_rubber_dust' }], + heatRequirement: "heated", processingTime: 120 - }).id('tfg:vi/vacuumizing/vulcanized_latex_to_raw_rubber') + }).id('tfg:vi/pressurizing/vulcanized_latex_to_raw_rubber') // Seed oils event.custom({ @@ -649,6 +653,14 @@ function registerVintageImprovementsRecipes(event) { processingTime: 100 }).id('tfg:vi/vacuumizing/seed_oil') + event.custom({ + type: 'vintageimprovements:pressurizing', + ingredients: [{ fluid: 'tfc:lye', amount: 1000 }], + results: [{ item: 'gtceu:sodium_hydroxide_dust' }], + heatRequirement: "heated", + processingTime: 300 + }).id('tfg:vi/pressurizing/lye') + // #endregion // #region Coiling From a3f91930013e44defc2649014e3a12ac2481f889 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 13:01:49 +0100 Subject: [PATCH 132/158] changed steel mech saw back to cobalt brass since you can craft it much more easily now --- kubejs/server_scripts/greate/recipes.js | 4 ++-- kubejs/server_scripts/greate/recipes.recycling.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index c82bbbdc5..122eb5c9e 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -414,7 +414,7 @@ function registerGreateRecipes(event) { 'FE ' ], { A: '#gtceu:circuits/ulv', - B: 'gtceu:black_steel_buzz_saw_blade', + B: 'gtceu:cobalt_brass_buzz_saw_blade', C: 'greate:steel_cogwheel', D: 'gtceu:ulv_machine_hull', E: 'greate:steel_shaft', @@ -422,7 +422,7 @@ function registerGreateRecipes(event) { }).id('greate:shaped/steel_mechanical_saw') event.recipes.gtceu.assembler('greate:steel_mechanical_saw') - .itemInputs('gtceu:ulv_machine_hull', 'greate:steel_shaft', '2x #gtceu:circuits/ulv', 'gtceu:black_steel_buzz_saw_blade', '2x greate:steel_cogwheel') + .itemInputs('gtceu:ulv_machine_hull', 'greate:steel_shaft', '2x #gtceu:circuits/ulv', 'gtceu:cobalt_brass_buzz_saw_blade', '2x greate:steel_cogwheel') .itemOutputs('greate:steel_mechanical_saw') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) diff --git a/kubejs/server_scripts/greate/recipes.recycling.js b/kubejs/server_scripts/greate/recipes.recycling.js index 5f5c66785..a42c8e9de 100644 --- a/kubejs/server_scripts/greate/recipes.recycling.js +++ b/kubejs/server_scripts/greate/recipes.recycling.js @@ -381,7 +381,7 @@ function registerGreateRecyclingRecipes(event) { .itemInputs('greate:steel_mechanical_saw') .itemOutputs( ChemicalHelper.get(TagPrefix.dust, GTMaterials.WroughtIron, 8), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.BlackSteel, 2), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.CobaltBrass, 2), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Copper, 4)) .duration(GTMaterials.CobaltBrass.getMass() * 16) .category(GTRecipeCategories.MACERATOR_RECYCLING) @@ -391,7 +391,7 @@ function registerGreateRecyclingRecipes(event) { .itemInputs('greate:steel_mechanical_saw') .itemOutputs( ChemicalHelper.get(TagPrefix.ingot, GTMaterials.WroughtIron, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BlackSteel, 2), + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.CobaltBrass, 2), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.AnnealedCopper, 4)) .duration(GTMaterials.CobaltBrass.getMass() * 16) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) From 3b57773792b3206f0841fc514f4d66952726be59 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 13:03:23 +0100 Subject: [PATCH 133/158] langs --- kubejs/assets/tfg/lang/en_us.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index aeeb9ec16..ac4041a6e 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1772,7 +1772,7 @@ "quests.low_voltage.lv_glue.desc": "You can now &3centrifuge&r &aSticky Resin&r, which will give you &aGlue&r in fluid form (and the less useful Plantball, &6for now&r).\n\nGive yourself a headstart and get on producing Glue. You can use it to make &6cheaper Resistors&r, as well as &6cheaper Circuit Boards&r in the &3Assembler&r (and it is especially useful &oin the near future&r).\n\n&eNote:&r You can also centrifuge TFC's &aGlue&r or &aConifer Rosin&r, whichever's easiest!", "quests.low_voltage.lv_cutter.title": "Basic Cutter", "quests.low_voltage.lv_cutter.subtitle": "The Cutter... cuts...", - "quests.low_voltage.lv_cutter.desc": "For now, you should use &9Water&r for its recipes instead of trying to acquire Lubricant.\n\nThe &3Cutting Machine&r additionally unlocks converting &6Rods into four Bolts&r.\n\nThis machine is the only way to obtain &dGem Plates&r, which are needed to craft Filters, and by extension, the &3Gas Collector&r.", + "quests.low_voltage.lv_cutter.desc": "For now, you should use &9Water&r for its recipes instead of trying to acquire Lubricant.\n\nIf you don't have one yet, this machine will also cut &6Rods into four Bolts&r.\n\nThis machine is the only way to obtain &dGem Plates&r, which are needed to craft Filters, and by extension, the &3Gas Collector&r.", "quests.low_voltage.lv_cutter.task": "Any cutter", "quests.low_voltage.lv_gas_collector.title": "Basic Gas Collector", "quests.low_voltage.lv_gas_collector.subtitle": "It'll take your breath away", @@ -2454,7 +2454,7 @@ "quests.steam_age.mechanical_harvester.desc": "Too lazy to harvest and replant your crops? These will do it for you! Place them on a spinning contraption and watch them go. These won't work on crops planted inside a greenhouse though.\n\nProtip: It's always a constant 15°C down at bedrock level, so it's a cool location for a farm that can grow crops all year round!", "quests.steam_age.mechanical_saw.title": "Mechanical Saw", "quests.steam_age.mechanical_saw.subtitle": "Efficient cutting of wood, stone, and your fingers", - "quests.steam_age.mechanical_saw.desc": "Tired of chopping trees? These will do it for you! Place them on a spinning contraption and watch them go. Unfortunately, you'll still have to replant the saplings them yourself until you get access to a Deployer.\n\nA Mechanical Saw can also double as a stonecutter, giving easier access to various forms of masonry. Using it to chop logs into lumber is also more efficient!", + "quests.steam_age.mechanical_saw.desc": "Tired of chopping trees? These will do it for you! Place them on a spinning contraption and watch them go. Unfortunately, you'll still have to replant the saplings them yourself until you get access to a Deployer.\n\nA Mechanical Saw can also double as a stonecutter, giving easier access to various forms of masonry. Using it to chop logs into lumber is also more efficient!\n\nYou can also use it to cut Rods into four Bolts!", "quests.steam_age.chute.title": "Early Logistics", "quests.steam_age.chute.subtitle": "Public infrastructure for your items", "quests.steam_age.chute.desc": "You now have access to ways to move your items around! Chutes are similar to hoppers and are cheaper, but can only move items downwards. Both of these can also push items from container into Item Pipes.\n\nFunnels are similar but are best paired with Belts instead of Item Pipes.", @@ -2603,7 +2603,7 @@ "quests.steam_age.lathe.desc": "The &3Lathe&r can automatically turn a single ingot into two rods, and single bolts into screws. If you're making a lot of those, and you will be, this machine will be a good investment.", "quests.steam_age.steel_saw.title": "Steel Mechanical Saw", "quests.steam_age.steel_saw.subtitle": "A stonecutter and LV Cutter in one!", - "quests.steam_age.steel_saw.desc": "It's an upgrade to your Basic Mechanical Saw that can also process some metal recipes, like turning rods into four bolts, and cutting blocks into plates. These recipes will all require a fluid to work, but you can just use water for now.\n\nYou can get a little Aluminium for the Cobalt Brass from ore processing byproducts! Check out that quest chapter for more information.", + "quests.steam_age.steel_saw.desc": "It's an upgrade to your Basic Mechanical Saw that can also process some metal recipes, like turning rods into four bolts, and cutting blocks into plates. These recipes will all require a fluid to work, but you can just use water for now.\n\nYou can also use this for cheaper Rubber Sheets, if you first use an Alloy Smelter to turn your pulp into a block.", "quests.steam_age.rolling_mill.title": "Rolling Mill", "quests.steam_age.rolling_mill.subtitle": "The other half of the LV Bender", "quests.steam_age.rolling_mill.desc.1": "Of all the steam age machines you could make, the &3Rolling Mill&r is one of the best, for the simple reason that it makes single plates out of single ingots. It can also make thin sheets cheaper than by hand, as a bonus!", From 8335dcc19a61a3d69e0448b210a6f5b84303fb9f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 15:01:12 +0100 Subject: [PATCH 134/158] pakku --- pakku-lock.json | 180 ++++++++++++++++++++++++------------------------ 1 file changed, 89 insertions(+), 91 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index 8af7380b2..368c0d9b9 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -749,7 +749,7 @@ "files": [ { "type": "curseforge", - "file_name": "alltheleaks-1.0.0+1.20.1-forge.jar", + "file_name": "alltheleaks-1.0.1+1.20.1-forge.jar", "mc_versions": [ "1.20.1" ], @@ -757,16 +757,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6874/194/alltheleaks-1.0.0+1.20.1-forge.jar", - "id": "6874194", + "url": "https://edge.forgecdn.net/files/6916/160/alltheleaks-1.0.1+1.20.1-forge.jar", + "id": "6916160", "parent_id": "1091339", "hashes": { - "sha1": "24e32ff985ceac5ef964d49b76764ed6c700ac2e", - "md5": "baa29b8a4c714ea6bbc23a6cfd36c778" + "sha1": "13dda9865bb6ecff4f9cbea148f71215172ebe73", + "md5": "3f02888ca792a2daae94d68ba71edb18" }, "required_dependencies": [], - "size": 1134422, - "date_published": "2025-08-11T09:03:47.890Z" + "size": 1134589, + "date_published": "2025-08-22T19:39:22.777Z" } ] }, @@ -8483,9 +8483,31 @@ "modrinth": "EltpO5cN" }, "files": [ + { + "type": "modrinth", + "file_name": "lootr-forge-1.20-0.7.35.92.jar", + "mc_versions": [ + "1.20", + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/EltpO5cN/versions/9viyYois/lootr-forge-1.20-0.7.35.92.jar", + "id": "9viyYois", + "parent_id": "EltpO5cN", + "hashes": { + "sha512": "903ae0ba7077c86719399c32b4dba5726ce78c19f5eed8bb21acdbe1350cd3572fa2f1278a6b04d352b45ea12284bc97c24e77eab97500a44c0835e92288a0a2", + "sha1": "6e0c4289f06552c89bfe63b6d43a0609fecd6935" + }, + "required_dependencies": [], + "size": 458609, + "date_published": "2025-08-22T02:15:11.750259Z" + }, { "type": "curseforge", - "file_name": "lootr-forge-1.20-0.7.35.91.jar", + "file_name": "lootr-forge-1.20-0.7.35.92.jar", "mc_versions": [ "1.20.1", "1.20" @@ -8494,40 +8516,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6330/326/lootr-forge-1.20-0.7.35.91.jar", - "id": "6330326", + "url": "https://edge.forgecdn.net/files/6913/496/lootr-forge-1.20-0.7.35.92.jar", + "id": "6913496", "parent_id": "361276", "hashes": { - "sha1": "4175b32e3bc25b05c45cc84f70b585279a871d3c", - "md5": "512ee49d21782875b33513fb074eb098" + "sha1": "6e0c4289f06552c89bfe63b6d43a0609fecd6935", + "md5": "46f8cc588def48fc8971cdaae64b40ac" }, "required_dependencies": [], - "size": 458532, - "date_published": "2025-03-22T03:44:13.050Z" - }, - { - "type": "modrinth", - "file_name": "lootr-forge-1.20-0.7.35.91.jar", - "mc_versions": [ - "1.19.3", - "1.19.4", - "1.20", - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/EltpO5cN/versions/HmhkyU8X/lootr-forge-1.20-0.7.35.91.jar", - "id": "HmhkyU8X", - "parent_id": "EltpO5cN", - "hashes": { - "sha512": "9b576ec6008a5c86ce9ea218285bc133f49e9eaf8f4b854fa49170a9cc3c8de028b236f2e563493405732277fd1d2909520d5961076b3ddbffcb0c7c539b4826", - "sha1": "4175b32e3bc25b05c45cc84f70b585279a871d3c" - }, - "required_dependencies": [], - "size": 458532, - "date_published": "2025-07-15T09:13:32.531920Z" + "size": 458609, + "date_published": "2025-08-22T02:12:46.677Z" } ] }, @@ -10132,27 +10130,6 @@ "modrinth": "pYFUU6cq" }, "files": [ - { - "type": "curseforge", - "file_name": "particular-1.20.1-Forge-1.2.4.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6603/252/particular-1.20.1-Forge-1.2.4.jar", - "id": "6603252", - "parent_id": "1219053", - "hashes": { - "sha1": "4dc0cfd572151816c939d2896ad8f13838cb7cf6", - "md5": "ce29494f89ec662a19a954fa054ad49b" - }, - "required_dependencies": [], - "size": 421834, - "date_published": "2025-05-31T23:14:51.347Z" - }, { "type": "modrinth", "file_name": "particular-1.20.1-Forge-1.2.4.jar", @@ -10173,6 +10150,27 @@ "required_dependencies": [], "size": 421834, "date_published": "2025-06-06T19:00:04.136808Z" + }, + { + "type": "curseforge", + "file_name": "particular-1.20.1-Forge-1.2.7.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6916/904/particular-1.20.1-Forge-1.2.7.jar", + "id": "6916904", + "parent_id": "1219053", + "hashes": { + "sha1": "db04a6b14b7fb219701c50907986384bca363298", + "md5": "de5105497a7fa79ab099a592879ef260" + }, + "required_dependencies": [], + "size": 420332, + "date_published": "2025-08-22T23:10:47.973Z" } ] }, @@ -13235,34 +13233,9 @@ "modrinth": "lNttW2Xl" }, "files": [ - { - "type": "curseforge", - "file_name": "TerraFirmaGreg-Core-Modern-0.7.10.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6872/582/TerraFirmaGreg-Core-Modern-0.7.10.jar", - "id": "6872582", - "parent_id": "513402", - "hashes": { - "sha1": "9a5c98fcaef9d12fdc1a86035ebf4f9170d1cb2e", - "md5": "ca805dc57f89624bf9e53e4f9babda0a" - }, - "required_dependencies": [ - "890405", - "302973" - ], - "size": 515916, - "date_published": "2025-08-10T20:34:53.927Z" - }, { "type": "modrinth", - "file_name": "TerraFirmaGreg-Core-Modern-0.7.10.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.7.11.jar", "mc_versions": [ "1.20.1" ], @@ -13271,19 +13244,44 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/8m3psJno/TerraFirmaGreg-Core-Modern-0.7.10.jar", - "id": "8m3psJno", + "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/oiDw0Fhg/TerraFirmaGreg-Core-Modern-0.7.11.jar", + "id": "oiDw0Fhg", "parent_id": "lNttW2Xl", "hashes": { - "sha512": "bb8b2907e7dcf1e630aac76575cefc04cc594b6da0aeafa76bed5a5838677720bddf2b134d3480e06e850ff041f3963b1d22803c8ac873f315e32b698f01ef29", - "sha1": "9a5c98fcaef9d12fdc1a86035ebf4f9170d1cb2e" + "sha512": "cee41d5314832cc92ce25e8c33298e15bf478907739d3a932b0e96e79b741e1314c67fae538997066b06e47cf079b13117073aaab6c946e0311581d3b9f2bace", + "sha1": "b69f0c4aadf8edfb7b3e3864af70d35d84a45a77" }, "required_dependencies": [ "JaCEZUhg", "7tG215v7" ], - "size": 515916, - "date_published": "2025-08-10T20:34:55.642076Z" + "size": 584412, + "date_published": "2025-08-23T12:10:49.232137Z" + }, + { + "type": "curseforge", + "file_name": "TerraFirmaGreg-Core-Modern-0.7.11.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6918/492/TerraFirmaGreg-Core-Modern-0.7.11.jar", + "id": "6918492", + "parent_id": "513402", + "hashes": { + "sha1": "b69f0c4aadf8edfb7b3e3864af70d35d84a45a77", + "md5": "8d41611089b9a9ad0e018cbf93f8b680" + }, + "required_dependencies": [ + "890405", + "302973" + ], + "size": 584412, + "date_published": "2025-08-23T12:10:47.487Z" } ] }, From c7769c13827a535060d4ddeceb846ea85028fd71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Nieto?= Date: Sat, 23 Aug 2025 17:53:12 +0200 Subject: [PATCH 135/158] fix: Fixed Oven quest after tongs were removed, still need russian localization update (#1677) --- .../quests/chapters/queststfc_tips.snbt | 23 ++++++++++++++++++- kubejs/assets/tfg/lang/en_us.json | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 84b582024..843a2eb36 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -480,8 +480,29 @@ type: "item" } { + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "tfchotornot:tongs/wood" + tag: { + Damage: 0 + } + } id: "45EFF5E3C4FB5D77" - item: "firmalife:peel" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfchotornot:insulating)" + } + } + optional_task: true + title: "Any #tfchotornot:insulating" type: "item" } ] diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index ac4041a6e..22f9adf86 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -3329,7 +3329,7 @@ "quests.tfg_tips.candles.desc": "Candles can be crafted using &aParaffix Wax, Beeswax&r or &aRosin.&r\nCandles are the better light source compared to torches, staying lit for 1 month and 2 days.", "quests.tfg_tips.oven.title": "Oven", "quests.tfg_tips.oven.subtitle": "Caution, it's hot", - "quests.tfg_tips.oven.desc": "The &3Oven&r is a multiblock structure that can be used to easily cook foods as well as perform exclusive recipes. The &aBottom Oven, Top Oven&r and the &aChimney&r are mandatory components. And don't forget the &dPeel&r, used for picking up food from the &aTop Oven.&r\nMore information on how to build an &3Oven&r can be found in the &2Field Guide.&r\n\n&3&lTip:&r&o: The only food that can satisfy all 5 nutrient groups, &cPizza&f, must be cooked in an oven.", + "quests.tfg_tips.oven.desc": "The &3Oven&r is a multiblock structure that can be used to easily cook foods as well as perform exclusive recipes. The &aBottom Oven, Top Oven&r and the &aChimney&r are mandatory components. And don't forget to use &dTongs&r to pick up food from the &aTop Oven.&r\nMore information on how to build an &3Oven&r can be found in the &2Field Guide.&r\n\n&3&lTip:&r&o: The only food that can satisfy all 5 nutrient groups, &cPizza&f, must be cooked in an oven.", "quests.tfg_tips.oven_appliances.title": "Oven Appliances", "quests.tfg_tips.oven_appliances.subtitle": "Get more out of your Ovens", "quests.tfg_tips.oven_appliances.desc": "&3Oven Appliances&r are optional components that must be placed on top of &aBottom Ovens&r to receive heat. Remember you can have &cmultiple&r &aBottom Ovens&r in a single multiblock.\n\n&dWrought Iron Grill&r: Allows you to cook food at a much faster rate and provides a &cbonus&r to shelf life.\n&dVat&r: can process pot recipes in bulk! Extremely useful for making &eLatex&r and &aJam.&r\n&dJarring Station&r: must be place next to a &bVat&r, fills up jars with &aJam.&r\n&dPot&r: if you need to cook soups.", From de0d71a0660375021155e507282722551dc97707 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 17:11:49 +0100 Subject: [PATCH 136/158] create additions is a buggy ass mod --- CHANGELOG.md | 2 + .../create_additions/recipes.js | 45 ++++++++++--------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b35cb1cf7..f00a254cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,8 @@ - Added a new ore vein to all dimensions for gypsum, calcite, borax, and fuller's earth @Pyritie - Added some more moon ore veins for copper, tin, gold, aluminium.. nothing exciting @Pyritie - Changed the recipe for the infinity construction wand @Pyritie +- Rebalanced the liquid blaze burner fuel recipes to be more in-line with GregTech generation @Pyritie +- Changed the recipes for the circuit boards required for the electron tube and vacuum tube, and phenolic circuit board @TomPlop ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop diff --git a/kubejs/server_scripts/create_additions/recipes.js b/kubejs/server_scripts/create_additions/recipes.js index 2b761d5f1..da063578e 100644 --- a/kubejs/server_scripts/create_additions/recipes.js +++ b/kubejs/server_scripts/create_additions/recipes.js @@ -113,6 +113,7 @@ const registerCreateAdditionsRecipes = (event) => { processingTime: 20 * 6 }).id(`tfg:vi/lathe/straw`) + // the amount is hardcoded to 100mb because create additions sucks event.custom({ type: 'createaddition:liquid_burning', input: { @@ -126,99 +127,99 @@ const registerCreateAdditionsRecipes = (event) => { type: 'createaddition:liquid_burning', input: { fluidTag: 'forge:creosote', - amount: 160 + amount: 100 }, - burnTime: 10 * 9 * 9 + burnTime: 500 }).id('tfg:createadditions/liquid_burning/creosote') event.custom({ type: 'createaddition:liquid_burning', input: { fluidTag: 'forge:biomass', - amount: 40 + amount: 100 }, - burnTime: 10 * 9 * 9 + burnTime: 2000 }).id('tfg:createadditions/liquid_burning/biomass') event.custom({ type: 'createaddition:liquid_burning', input: { fluidTag: 'forge:oil', - amount: 200 + amount: 100 }, - burnTime: 10 * 9 * 9 + burnTime: 400 }).id('tfg:createadditions/liquid_burning/oil') event.custom({ type: 'createaddition:liquid_burning', input: { fluidTag: 'forge:oil_heavy', - amount: 32 + amount: 100 }, - burnTime: 10 * 9 * 9 + burnTime: 2500 }).id('tfg:createadditions/liquid_burning/oil_heavy') event.custom({ type: 'createaddition:liquid_burning', input: { fluidTag: 'forge:sulfuric_heavy_fuel', - amount: 32 + amount: 100 }, - burnTime: 10 * 9 * 9 + burnTime: 2500 }).id('tfg:createadditions/liquid_burning/sulfuric_heavy_fuel') event.custom({ type: 'createaddition:liquid_burning', input: { fluidTag: 'forge:heavy_fuel', - amount: 16 + amount: 100 }, - burnTime: 30 * 9 * 9 + burnTime: 7000 }).id('tfg:createadditions/liquid_burning/heavy_fuel') event.custom({ type: 'createaddition:liquid_burning', input: { fluidTag: 'forge:fish_oil', - amount: 50 + amount: 100 }, - burnTime: 100 * 9 * 9 + burnTime: 7000 }).id('tfg:createadditions/liquid_burning/fish_oil') event.custom({ type: 'createaddition:liquid_burning', input: { fluid: 'tfc:olive_oil', - amount: 50 + amount: 100 }, - burnTime: 150 * 9 * 9 + burnTime: 7000 }).id('tfg:createadditions/liquid_burning/olive_oil') event.custom({ type: 'createaddition:liquid_burning', input: { fluid: 'firmalife:soybean_oil', - amount: 50 + amount: 100 }, - burnTime: 150 * 9 * 9 + burnTime: 7000 }).id('tfg:createadditions/liquid_burning/soybean_oil') event.custom({ type: 'createaddition:liquid_burning', input: { fluidTag: 'forge:seed_oil', - amount: 50 + amount: 100 }, - burnTime: 150 * 9 * 9 + burnTime: 7000 }).id('tfg:createadditions/liquid_burning/seed_oil') event.custom({ type: 'createaddition:liquid_burning', input: { fluid: 'gtceu:steam', - amount: 256 + amount: 100 }, - burnTime: 4 * 9 * 9 + burnTime: 1 }).id('tfg:createadditions/liquid_burning/steam') //#endregion From 18f37c23fa963f123608afc57a6c09781948bb49 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 17:12:25 +0100 Subject: [PATCH 137/158] removed campfire from passive heaters --- kubejs/server_scripts/create/tags.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kubejs/server_scripts/create/tags.js b/kubejs/server_scripts/create/tags.js index 2cdde4e17..a452f380f 100644 --- a/kubejs/server_scripts/create/tags.js +++ b/kubejs/server_scripts/create/tags.js @@ -100,6 +100,8 @@ const registerCreateBlockTags = (event) => { event.add('create:chest_mounted_storage', '#forge:chests/wooden') event.add('create:chest_mounted_storage', 'framedblocks:framed_chest') + + event.add('create:passive_boiler_heaters', 'minecraft:campfire') } From fa67078182b8121113d2c0a2335c1cd48409ffae Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 17:16:46 +0100 Subject: [PATCH 138/158] added moon rabbits and birts to the carryon whitelist --- config/carryon-common.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/carryon-common.toml b/config/carryon-common.toml index e0832b465..68f3a8ec1 100644 --- a/config/carryon-common.toml +++ b/config/carryon-common.toml @@ -57,7 +57,7 @@ [whitelist] #Whitelist. Read about the format here: https://github.com/Tschipp/CarryOn/wiki/Black---and-Whitelist-Config #Entities that CAN be picked up (useWhitelistEntities must be true) - allowedEntities = ["tfc:turkey", "tfc:isopod", "tfc:lobster", "tfc:frog", "tfc:penguin", "tfc:turtle", "tfc:horseshoe_crab", "tfc:crayfish", "tfc:grouse", "tfc:pheasant", "tfc:peafowl", "tfc:rat", "tfc:chicken", "tfc:duck", "tfc:quail", "tfc:rabbit"] + allowedEntities = ["tfc:turkey", "tfc:isopod", "tfc:lobster", "tfc:frog", "tfc:penguin", "tfc:turtle", "tfc:horseshoe_crab", "tfc:crayfish", "tfc:grouse", "tfc:pheasant", "tfc:peafowl", "tfc:rat", "tfc:chicken", "tfc:duck", "tfc:quail", "tfc:rabbit", "tfg:moon_rabbit", "species:birt"] #Blocks that CAN be picked up (useWhitelistBlocks must be true) allowedBlocks = ["framedblocks:framed_chest", "tfc:wood/chest/*", "tfc:wood/trapped_chest/*", "afc:wood/chest/*", "afc:wood/trapped_chest/*", "#forge:chests/wooden"] #Entities that CAN have other entities stacked on top of them (useWhitelistStacking must be true) From ac99b9db8775c7de3d76b9b39da862e17736f1d5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 18:30:27 +0100 Subject: [PATCH 139/158] Solar tweaks (#1678) * solar tweaks * langs --- CHANGELOG.md | 1 + kubejs/assets/tfg/lang/en_us.json | 2 +- kubejs/assets/tfg/lang/uk_ua.json | 2 +- kubejs/data/ad_astra/planets/earth.json | 2 +- kubejs/data/ad_astra/planets/mars.json | 2 +- kubejs/data/ad_astra/planets/moon.json | 2 +- kubejs/data/ad_astra/planets/venus.json | 2 +- .../gregtech/recipes.machines.js | 49 ++++++++++++++----- kubejs/startup_scripts/gtceu/recipe_types.js | 2 +- 9 files changed, 46 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f00a254cf..8f4c4e0cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Removed the mod that was causing placed entities to sometimes not spawn - Removed energy P2P (#1661) @TomPlop @BlueBoat29 - Removed GT bedrock miners, replaced with a new system for Moon infinites (#1569) @TomPlop +- Buffed Large Solar Panel MK I so now it has a consistent EV-generating recipe, but halved the output of ad astra solar panels on the moon @TomPlop @Pyritie ### Changes - Rebalance Large Solar Array to make Mk2 circuit 2 viable, and buffed to LSA Mk3 circuit 2 (#1591) @TomPlop - Added mechanical press recipes to weld weak steels @Pyritie diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 22f9adf86..675ede7fa 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -963,7 +963,7 @@ "tfg.tooltip.support.tier2": "§717 x 9 x 17", "tfg.tooltip.support.tier3": "§733 x 13 x 33", "tfg.tooltip.vessels": "§cMax: 3024mB", - "tfg.tooltip.solar_panel.single": "Produces §6256 FE/t§r (64 EU/t) on the §6moon§r during the §6day§r", + "tfg.tooltip.solar_panel.single": "Produces §6128 FE/t§r (32 EU/t) on the §6moon§r during the §6day§r", "tfg.tooltip.solar_panel.large_tier1": "Massive structure producing from §61024 to 4096 EU/t§r on the §6moon§r during the §6day§r", "tfg.tooltip.solar_panel.large_tier2": "Massive structure producing from §64096 to 16384 EU/t§r on the §6moon§r during the §6day§r", "tfg.tooltip.solar_panel.large_tier3": "Massive structure producing from §616384 to 65536 EU/t§r on the §6moon§r during the §6day§r", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index cfb3c8cda..90382694b 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -956,7 +956,7 @@ "tfg.tooltip.support.tier2": "§717 x 9 x 17", "tfg.tooltip.support.tier3": "§733 x 13 x 33", "tfg.tooltip.vessels": "§cМакс: 3024mB", - "tfg.tooltip.solar_panel.single": "Виробляє §6256 FE/t§r (64 EU/t) на §6Місяці§r протягом §6дня§r", + "tfg.tooltip.solar_panel.single": "Виробляє §6128 FE/t§r (32 EU/t) на §6Місяці§r протягом §6дня§r", "tfg.tooltip.solar_panel.large_tier1": "Гігантська структура, що виробляє від §61024 до 4096 EU/t§r на §6Місяці§r протягом §6дня§r", "tfg.tooltip.solar_panel.large_tier2": "Гігантська структура, що виробляє від §64096 до 16384 EU/t§r на §6Місяці§r протягом §6дня§r", "tfg.tooltip.solar_panel.large_tier3": "Гігантська структура, що виробляє від §616384 до 65536 EU/t§r на §6Місяці§r протягом §6дня§r", diff --git a/kubejs/data/ad_astra/planets/earth.json b/kubejs/data/ad_astra/planets/earth.json index 72bb5ad14..f78621687 100644 --- a/kubejs/data/ad_astra/planets/earth.json +++ b/kubejs/data/ad_astra/planets/earth.json @@ -3,7 +3,7 @@ "gravity": 9.807, "orbit": "ad_astra:earth_orbit", "oxygen": true, - "solar_power": 32, + "solar_power": 16, "solar_system": "ad_astra:solar_system", "temperature": 15, "tier": 1 diff --git a/kubejs/data/ad_astra/planets/mars.json b/kubejs/data/ad_astra/planets/mars.json index 37c5c5f50..bd5e4a25d 100644 --- a/kubejs/data/ad_astra/planets/mars.json +++ b/kubejs/data/ad_astra/planets/mars.json @@ -3,7 +3,7 @@ "gravity": 3.72076, "orbit": "ad_astra:mars_orbit", "oxygen": false, - "solar_power": 32, + "solar_power": 16, "solar_system": "ad_astra:solar_system", "temperature": -65, "tier": 2 diff --git a/kubejs/data/ad_astra/planets/moon.json b/kubejs/data/ad_astra/planets/moon.json index 0205ab90e..c8f638877 100644 --- a/kubejs/data/ad_astra/planets/moon.json +++ b/kubejs/data/ad_astra/planets/moon.json @@ -3,7 +3,7 @@ "gravity": 1.622, "orbit": "ad_astra:moon_orbit", "oxygen": false, - "solar_power": 256, + "solar_power": 128, "solar_system": "ad_astra:solar_system", "temperature": -173, "tier": 1 diff --git a/kubejs/data/ad_astra/planets/venus.json b/kubejs/data/ad_astra/planets/venus.json index ed182032e..05d66842f 100644 --- a/kubejs/data/ad_astra/planets/venus.json +++ b/kubejs/data/ad_astra/planets/venus.json @@ -3,7 +3,7 @@ "gravity": 8.87, "orbit": "ad_astra:venus_orbit", "oxygen": false, - "solar_power": 32, + "solar_power": 16, "solar_system": "ad_astra:solar_system", "temperature": 465, "tier": 3 diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 0131d3b0e..e65392484 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -1040,33 +1040,36 @@ function registerGTCEuMachineRecipes(event) { // Solar T1 - event.recipes.gtceu.large_solar_panel('solar_panel_t1_cheap') - .notConsumable('tfg:photo_cell_t1') + event.recipes.gtceu.large_solar_panel('solar_panel_t1_emergency') + .chancedInput('tfg:photo_cell_t1', 100, 0) .duration(20 * 20) .daytime(false) .dimension('ad_astra:moon') - .EUt(-(GTValues.V[GTValues.HV]), 2) + .EUt(-((GTValues.V[GTValues.HV])), 2) .circuit(1) event.recipes.gtceu.large_solar_panel('solar_panel_t1') - .chancedInput('tfg:photo_cell_t1', 500, 0) + .notConsumable('tfg:photo_cell_t1') + .perTick(true) + .chancedFluidInput('tfg:compressed_trimix_3 4', 5000, 0) + .perTick(false) .duration(20 * 20) .daytime(false) .dimension('ad_astra:moon') - .EUt(-((GTValues.V[GTValues.EV])), 2) + .EUt(-(GTValues.V[GTValues.EV]), 2) .circuit(2) // Solar T2 - event.recipes.gtceu.large_solar_panel_tier2('solar_panel_t2_cheap') - .chancedInput('ad_astra:photovoltaic_etrium_cell', 500, 0) + event.recipes.gtceu.large_solar_panel_tier2('solar_panel_t2_emergency') + .chancedInput('ad_astra:photovoltaic_etrium_cell', 100, 0) .duration(20 * 20) .daytime(false) .dimension('ad_astra:moon') .EUt(-(GTValues.V[GTValues.EV]), 2) .circuit(1) - event.recipes.gtceu.large_solar_panel_tier2('solar_panel_t2') + event.recipes.gtceu.large_solar_panel_tier2('solar_panel_t2_strong') .notConsumable('ad_astra:photovoltaic_etrium_cell') .perTick(true) .chancedFluidInput('tfg:solar_coolant 10', 5000, 0) @@ -1079,17 +1082,28 @@ function registerGTCEuMachineRecipes(event) { .EUt(-(GTValues.V[GTValues.IV]), 2) .circuit(2) + event.recipes.gtceu.large_solar_panel_tier2('solar_panel_t2_cheap') + .notConsumable('ad_astra:photovoltaic_etrium_cell') + .perTick(true) + .inputFluids('tfg:compressed_trimix_3 1') + .perTick(false) + .duration(20 * 20) + .daytime(false) + .dimension('ad_astra:moon') + .EUt(-(GTValues.V[GTValues.EV]), 2) + .circuit(3) + // Solar T3 - event.recipes.gtceu.large_solar_panel_tier3('solar_panel_t3_cheap') - .chancedInput('ad_astra:photovoltaic_vesnium_cell', 500, 0) + event.recipes.gtceu.large_solar_panel_tier3('solar_panel_t3_emergency') + .chancedInput('ad_astra:photovoltaic_vesnium_cell', 100, 0) .duration(20 * 20) .daytime(false) .dimension('ad_astra:moon') .EUt(-(GTValues.V[GTValues.IV]), 2) .circuit(1) - event.recipes.gtceu.large_solar_panel_tier3('solar_panel_t3') + event.recipes.gtceu.large_solar_panel_tier3('solar_panel_t3_strong') .notConsumable('ad_astra:photovoltaic_vesnium_cell') .perTick(true) .chancedFluidInput('tfg:solar_coolant_tier2 10', 5000, 0) @@ -1102,6 +1116,19 @@ function registerGTCEuMachineRecipes(event) { .EUt(-(GTValues.V[GTValues.LuV]), 2) .circuit(2) + event.recipes.gtceu.large_solar_panel_tier3('solar_panel_t3_cheap') + .notConsumable('ad_astra:photovoltaic_vesnium_cell') + .perTick(true) + .chancedFluidInput('tfg:solar_coolant 10', 5000, 0) + .inputFluids('tfg:cryogenized_fluix 4') + .outputFluids('tfg:fluix 1') + .perTick(false) + .duration(20 * 20) + .daytime(false) + .dimension('ad_astra:moon') + .EUt(-(GTValues.V[GTValues.IV]), 2) + .circuit(2) + //#endregion //#region Mars Ore Line diff --git a/kubejs/startup_scripts/gtceu/recipe_types.js b/kubejs/startup_scripts/gtceu/recipe_types.js index 94554dc48..f7afe396e 100644 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ b/kubejs/startup_scripts/gtceu/recipe_types.js @@ -23,7 +23,7 @@ const registerGTCEuRecipeTypes = (event) => { event.create('large_solar_panel') .category('generator') .setEUIO('out') - .setMaxIOSize(2, 0, 0, 0) + .setMaxIOSize(2, 0, 2, 1) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.COOLING) From 2ebfaf2e3a7f744e233fc6170af5f56cb7a1b55e Mon Sep 17 00:00:00 2001 From: TomPlop Date: Sat, 23 Aug 2025 15:13:07 -0400 Subject: [PATCH 140/158] Board rework (#1679) * fix board * remove from tag * more update * last changes * Add new quests * fix the weird file * Fixes * fix quest optional --- .../quests/chapters/hv__high_voltage.snbt | 313 ++++++++++++++---- .../quests/chapters/questssteam_age.snbt | 20 +- kubejs/assets/gtceu/lang/en_us.json | 4 - .../item/high_density_treated_fiberboard.png | Bin 0 -> 289 bytes .../item/treated_chipboard_composite.png | Bin 0 -> 336 bytes kubejs/server_scripts/create/recipes.js | 4 +- kubejs/server_scripts/gregtech/recipes.js | 9 +- .../gregtech/recipes.machines.js | 40 ++- .../gregtech/recipes.removes.js | 12 - kubejs/server_scripts/gregtech/tags.js | 2 + kubejs/startup_scripts/gtceu/items.js | 6 + 11 files changed, 308 insertions(+), 102 deletions(-) create mode 100644 kubejs/assets/tfg/textures/item/high_density_treated_fiberboard.png create mode 100644 kubejs/assets/tfg/textures/item/treated_chipboard_composite.png diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index 0b20e09a8..6b5ec9584 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -525,11 +525,18 @@ id: "42FB276AB16258D9" size: 1.0d subtitle: "{quests.high_voltage.fluorine.subtitle}" - tasks: [{ - id: "4EF4F33BEB714485" - item: "gtceu:fluorine_bucket" - type: "item" - }] + tasks: [ + { + id: "4EF4F33BEB714485" + item: "gtceu:fluorine_bucket" + optional_task: true + type: "item" + } + { + id: "7245625D6C687E3A" + type: "checkmark" + } + ] title: "{quests.high_voltage.fluorine.title}" x: 1.0d y: 4.5d @@ -568,14 +575,22 @@ { dependencies: ["5BACED5AE350EAB1"] description: ["{quests.high_voltage.nitrobenzene.desc}"] + icon: "gtceu:nitrobenzene_bucket" id: "56E7A3A0CC690C8A" shape: "square" size: 1.0d - tasks: [{ - id: "33CF24B0A19D2F25" - item: "gtceu:nitrobenzene_bucket" - type: "item" - }] + tasks: [ + { + id: "33CF24B0A19D2F25" + item: "gtceu:nitrobenzene_bucket" + optional_task: true + type: "item" + } + { + id: "70D29F223E0CC5CB" + type: "checkmark" + } + ] title: "{quests.high_voltage.nitrobenzene.title}" x: -1.0d y: 9.5d @@ -723,11 +738,18 @@ id: "5BACED5AE350EAB1" size: 1.0d subtitle: "{quests.high_voltage.nitric_acid.subtitle}" - tasks: [{ - id: "5F8F684990622DE1" - item: "gtceu:nitric_acid_bucket" - type: "item" - }] + tasks: [ + { + id: "5F8F684990622DE1" + item: "gtceu:nitric_acid_bucket" + optional_task: true + type: "item" + } + { + id: "24520333587F2436" + type: "checkmark" + } + ] title: "{quests.high_voltage.nitric_acid.title}" x: 0.0d y: 9.5d @@ -735,15 +757,23 @@ { dependencies: ["5BACED5AE350EAB1"] description: ["{quests.high_voltage.cetane_diesel.desc}"] + icon: "gtceu:cetane_boosted_diesel_bucket" id: "04F6E968CEEC3D49" shape: "square" size: 1.0d subtitle: "{quests.high_voltage.cetane_diesel.subtitle}" - tasks: [{ - id: "51D904AA29256F8D" - item: "gtceu:cetane_boosted_diesel_bucket" - type: "item" - }] + tasks: [ + { + id: "51D904AA29256F8D" + item: "gtceu:cetane_boosted_diesel_bucket" + optional_task: true + type: "item" + } + { + id: "6BFCFA5257BE071F" + type: "checkmark" + } + ] title: "{quests.high_voltage.cetane_diesel.title}" x: 1.0d y: 9.5d @@ -831,11 +861,18 @@ icon: "gtceu:ammonia_bucket" id: "4343746E706264E6" size: 1.0d - tasks: [{ - id: "1C3EBA2535471DB6" - item: "gtceu:ammonia_bucket" - type: "item" - }] + tasks: [ + { + id: "1C3EBA2535471DB6" + item: "gtceu:ammonia_bucket" + optional_task: true + type: "item" + } + { + id: "6445F5DC9728583A" + type: "checkmark" + } + ] title: "{quests.high_voltage.ammonia.title}" x: -3.0d y: 6.0d @@ -973,6 +1010,8 @@ "{@pagebreak}" "{quests.high_voltage.space_alloy.desc.2}" ] + hide_details_until_startable: false + icon: "gtceu:rocket_alloy_t1_ingot" id: "56D337E264A4154F" subtitle: "{quests.high_voltage.space_alloy.subtitle}" tasks: [ @@ -1199,23 +1238,6 @@ x: 0.0d y: 11.0d } - { - dependencies: ["14D277A164202FF8"] - description: [ - "{quests.high_voltage.bedrock_miner.desc.1}" - "{@pagebreak}" - "{quests.high_voltage.bedrock_miner.desc.2}" - ] - id: "2878C147D273F774" - subtitle: "{quests.high_voltage.bedrock_miner.subtitle}" - tasks: [{ - id: "55981710612D21D7" - item: "gtceu:mv_bedrock_ore_miner" - type: "item" - }] - x: 2.5d - y: -10.5d - } { description: ["{quests.high_voltage.kaolinite_powder.desc}"] disable_toast: true @@ -1315,40 +1337,185 @@ y: 1.5d } { - dependencies: ["396E85A39FF414CF"] - description: ["{quests.high_voltage.hypertubes.desc}"] - icon: "create_hypertube:hypertube_entrance" - id: "194AB090A96CBC26" - optional: true - shape: "heart" - subtitle: "{quests.high_voltage.hypertubes.subtitle}" + dependencies: ["00A2566109144D7F"] + description: ["{quests.high_voltage.moon_harvester.desc}"] + id: "6A21CCAEB1FDF38E" + shape: "octagon" + size: 2.0d + subtitle: "{quests.high_voltage.moon_harvester.subtitle}" + tasks: [{ + id: "445320F445BA829F" + item: "gtceu:moon_dust_harvester" + type: "item" + }] + title: "{quests.high_voltage.moon_harvester.title}" + x: 16.0d + y: -2.0d + } + { + dependencies: ["6A21CCAEB1FDF38E"] + description: ["{quests.high_voltage.regolith_vapor.desc}"] + icon: "gtceu:regolith_vapor_bucket" + id: "578ECB10B30A77C7" + subtitle: "{quests.high_voltage.regolith_vapor.subtitle}" tasks: [ { - id: "284047DB1B1C022E" - item: "create_hypertube:hypertube_entrance" - type: "item" - } - { - disable_toast: true - id: "794148B8FFC9B001" - item: "create_hypertube:hypertube" + id: "0FF209271DB58067" + item: "gtceu:regolith_vapor_bucket" optional_task: true type: "item" } + { + id: "32E19F49E3A2D54B" + title: "{quests.high_voltage.regolith_vapor.task}" + type: "checkmark" + } ] - title: "{quests.high_voltage.hypertubes.title}" - x: 11.5d - y: -7.5d + title: "{quests.high_voltage.regolith_vapor.title}" + x: 17.5d + y: -2.5d + } + { + dependencies: ["6A21CCAEB1FDF38E"] + description: ["{quests.high_voltage.regolith_dust.desc}"] + id: "0527DF6A8567FED9" + subtitle: "{quests.high_voltage.regolith_dust.subtitle}" + tasks: [ + { + id: "567BAEEB6120F6CE" + item: "tfg:certus_regolith_dust" + type: "item" + } + { + id: "5507A8B1561AC3C3" + item: "tfg:cassiterite_regolith_dust" + type: "item" + } + { + id: "13C520F021B2E085" + item: "tfg:bright_regolith_dust" + type: "item" + } + { + id: "3565544FF49B9F50" + item: "tfg:goethe_regolith_dust" + type: "item" + } + ] + title: "{quests.high_voltage.regolith_dust.title}" + x: 17.5d + y: -1.5d + } + { + dependencies: [ + "0527DF6A8567FED9" + "578ECB10B30A77C7" + ] + description: ["{quests.high_voltage.dusty_ores.desc}"] + id: "5807400FD1F0998A" + subtitle: "{quests.high_voltage.dusty_ores.subtitle}" + tasks: [{ + id: "131B1D5F37FAC1F3" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:dusty_raw_goethite)item(gtceu:dusty_raw_cassiterite)item(gtceu:dusty_raw_certus_quartz)item(gtceu:dusty_raw_gold)item(gtceu:dusty_raw_diamond))" + } + } + title: "{quests.high_voltage.dusty_ores.task}" + type: "item" + }] + title: "{quests.high_voltage.dusty_ores.title}" + x: 18.5d + y: -2.0d + } + { + dependencies: ["5807400FD1F0998A"] + description: ["{quests.high_voltage.final_dust.desc}"] + id: "36FE3DDBCB535639" + subtitle: "{quests.high_voltage.final_dust.subtitle}" + tasks: [ + { + id: "1ABCC8007A69EF81" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:iron_dust" + } + type: "item" + } + { + id: "3AB1A3B8E6EB4291" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:copper_dust" + } + type: "item" + } + { + id: "1D38FECBB23C3E24" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:tin_dust" + } + type: "item" + } + { + id: "6C9C5498495F330C" + item: "ae2:certus_quartz_dust" + type: "item" + } + { + id: "0AF375FA38D44C32" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:gold_dust" + } + type: "item" + } + { + id: "6896A082D722EECB" + item: "gtceu:diamond_dust" + type: "item" + } + ] + title: "{quests.high_voltage.final_dust.title}" + x: 19.5d + y: -2.0d } { dependencies: ["396E85A39FF414CF"] description: ["{quests.high_voltage.wand.desc}"] - id: "6E370A161895A91B" + id: "22FD785F84E9D10D" optional: true shape: "heart" subtitle: "{quests.high_voltage.wand.subtitle}" tasks: [{ - id: "2311849F50A36265" + id: "525F329DD5F16E1F" item: { Count: 1 id: "constructionwand:infinity_wand" @@ -1362,6 +1529,28 @@ x: 13.0d y: -8.0d } + { + dependencies: ["396E85A39FF414CF"] + description: ["{quests.high_voltage.hypertubes.desc}"] + id: "159A0DAEE55DCAC0" + optional: true + subtitle: "{quests.high_voltage.hypertubes.subtitle}" + tasks: [ + { + id: "033B6A5EC2C17485" + item: "create_hypertube:hypertube_entrance" + type: "item" + } + { + id: "2EBA07A9A9B6D1EB" + item: "create_hypertube:hypertube" + type: "item" + } + ] + title: "{quests.high_voltage.hypertubes.title}" + x: 11.5d + y: -7.5d + } ] subtitle: ["{quests.high_voltage.subtitle}"] title: "{quests.high_voltage}" diff --git a/config/ftbquests/quests/chapters/questssteam_age.snbt b/config/ftbquests/quests/chapters/questssteam_age.snbt index 0d57e51d7..7b2886226 100644 --- a/config/ftbquests/quests/chapters/questssteam_age.snbt +++ b/config/ftbquests/quests/chapters/questssteam_age.snbt @@ -409,8 +409,8 @@ type: "item" }] title: "{quests.steam_age.crushing_wheel.title}" - x: -19.5d - y: 18.0d + x: -21.5d + y: 10.5d } { dependencies: ["7DB7AB5349218605"] @@ -436,13 +436,13 @@ ] title: "{quests.steam_age.treated_planks.title}" x: -19.5d - y: 12.0d + y: 10.5d } { dependencies: [ - "246D2C5989E3E907" "233B414B4F189140" "781C6AD30194CB45" + "3E175E20C91F168B" ] description: ["{quests.steam_age.electron_tube.desc}"] id: "033E74BC588E7EAD" @@ -564,8 +564,8 @@ type: "item" }] title: "{quests.steam_age.mech_crafter.title}" - x: -19.5d - y: 17.0d + x: -20.5d + y: 12.0d } { dependencies: ["46FA9DD4755A5548"] @@ -828,9 +828,9 @@ } { dependencies: [ - "033E74BC588E7EAD" "5917B0D4708BF534" "6100B3C732E379AA" + "246D2C5989E3E907" ] description: ["{quests.steam_age.centrifuge.desc}"] id: "19A1D52A7F550478" @@ -842,8 +842,8 @@ type: "item" }] title: "{quests.steam_age.centrifuge.title}" - x: -18.0d - y: 17.0d + x: -20.5d + y: 10.5d } { dependencies: [ @@ -1593,7 +1593,7 @@ type: "checkmark" }] title: "{quests.steam_age.packager.title}" - x: -22.0d + x: -19.5d y: 17.0d } { diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 57b015c45..8f72f42c9 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -90,11 +90,7 @@ "item.gtceu.osmium_credit": "§732,768 Credits", "item.gtceu.naquadah_credit": "§7262,144 Credits", "item.gtceu.neutronium_credit": "§72,097,152 Credits", - "item.gtceu.treated_wood_plate": "Treated Medium Density Fiberboard", "item.gtceu.wood_plate": "Medium Density Fiberboard", - "item.gtceu.treated_wood_dust": "Treated Chipboard Composite", - "item.gtceu.small_treated_wood_dust": "Small Pile of Treated Chipboard Composite", - "item.gtceu.tiny_treated_wood_dust": "Tiny Pile of Treated Chipboard Composite", "material.gtceu.ice": "Ice Slush", "material.gtceu.damascus_steel": "Swine-steel", "material.gtceu.cooperite": "Cooperite", diff --git a/kubejs/assets/tfg/textures/item/high_density_treated_fiberboard.png b/kubejs/assets/tfg/textures/item/high_density_treated_fiberboard.png new file mode 100644 index 0000000000000000000000000000000000000000..061ecfa39d7f4688b99bb676b987b9fd71792ff8 GIT binary patch literal 289 zcmV++0p9+JP)8Ymm;ezdtac|b zO2BPxAmPjVo7k4|j-F2vC)AuAgf9)mZOcHhX3GPDeLx;P3jq9+!g%W590E}K)MIoO nL85Rw!9AuEU+DK=Idi}jv7%h=Ta#7Y00000NkvXXu0mjf_uF~^ literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/treated_chipboard_composite.png b/kubejs/assets/tfg/textures/item/treated_chipboard_composite.png new file mode 100644 index 0000000000000000000000000000000000000000..cf3386024ba9468c19485cec148bbf2c7d96597d GIT binary patch literal 336 zcmV-W0k8gvP)S+zJSMv&CH zzoM!ht!`4TQgj{u-v(u#N|~o}?oDzIE?kT?3P7Hx-|FH7WuD5@C}HUO09d0K50aBf zjuHg;&i459YkVy{j&5PL0TOxr_~|53`)3SrP-Zk=b;D$_rLPsMMtJuv`zFyoT)3Fb zXaIaIyv#OaM)P1JR*g`&n4a#|>1<$)Vp-Jy3|*hX#Vo6uxo-h@tJ*N?@rdh2m@Kwf zqsWZj^`HBe!o>ir8o}4yEjt^G2Z`Lh5o{!G6jId}e+%I-Y?0000 { ], { A: 'gtceu:glass_tube', B: '#forge:bolts/steel', - C: 'gtceu:treated_wood_plate', + C: 'gtceu:wood_plate', D: 'gtceu:red_alloy_single_wire', E: '#forge:plates/wrought_iron', F: '#forge:tools/screwdrivers', @@ -931,7 +931,7 @@ const registerCreateRecipes = (event) => { event.recipes.createSequencedAssembly([ '2x create:electron_tube', - ], 'gtceu:treated_wood_plate', [ + ], 'gtceu:wood_plate', [ event.recipes.createDeploying('tfg:unfinished_electron_tube', ['tfg:unfinished_electron_tube', '#forge:plates/wrought_iron']), event.recipes.createDeploying('tfg:unfinished_electron_tube', ['tfg:unfinished_electron_tube', 'gtceu:red_alloy_single_wire']), event.recipes.createDeploying('tfg:unfinished_electron_tube', ['tfg:unfinished_electron_tube', 'gtceu:red_alloy_single_wire']), diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 03055afe0..2b09e8271 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -128,8 +128,9 @@ const registerGTCEURecipes = (event) => { event.recipes.tfc.barrel_sealed(2000) .outputItem('gtceu:treated_wood_dust') - .inputs('tfg:chipboard_composite', TFC.fluidStackIngredient('#forge:creosote', 50)) - .id('tfg:barrel/treated_chipboard_composite') + .inputs('#tfg:wood_dusts', TFC.fluidStackIngredient('#forge:creosote', 50)) + .id('tfg:barrel/treated_wood_dust') + //#endregion //#region Выход: Капля резины @@ -1426,5 +1427,9 @@ const registerGTCEURecipes = (event) => { event.replaceInput({ id: 'gtceu:shaped/large_combustion_engine' }, '#gtceu:circuits/iv', '#gtceu:circuits/ev') event.replaceInput({ id: 'gtceu:shaped/nano_chestplate_advanced' }, '#gtceu:circuits/iv', '#gtceu:circuits/ev') event.replaceInput({ id: 'gtceu:assembler/ev_large_miner' }, '#gtceu:circuits/iv', '#gtceu:circuits/ev') + + //# Circuit Board + + event.replaceInput({ id: 'gtceu:assembler/phenolic_board' }, '#tfg:wood_dusts', 'tfg:high_density_treated_fiberboard') } diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index e65392484..5e418a2f5 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -895,25 +895,45 @@ function registerGTCEuMachineRecipes(event) { .duration(10) .EUt(GTValues.VA[GTValues.LV]) - event.recipes.gtceu.chemical_bath('gtceu:treated_chipboard_composite') - .itemInputs('1x tfg:chipboard_composite') - .inputFluids(Fluid.of('gtceu:creosote', 50)) - .itemOutputs('gtceu:treated_wood_dust') - .duration(100) - .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.compressor('gtceu:wood_mdf') .itemInputs('1x tfg:chipboard_composite') .itemOutputs('gtceu:wood_plate') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.compressor('gtceu:treated_wood_mdf') - .itemInputs('1x gtceu:treated_wood_dust') - .itemOutputs('gtceu:treated_wood_plate') + event.recipes.gtceu.chemical_bath('gtceu:treated_chipboard_composite') + .itemInputs('1x tfg:chipboard_composite') + .inputFluids(Fluid.of('gtceu:creosote', 50)) + .itemOutputs('tfg:treated_chipboard_composite') + .duration(100) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.chemical_bath('gtceu:bath_high_density_treated_fiberboard') + .itemInputs('1x gtceu:wood_plate') + .inputFluids(Fluid.of('gtceu:creosote', 50)) + .itemOutputs('tfg:high_density_treated_fiberboard') + .duration(100) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.chemical_bath('gtceu:bath_high_density_treated_fiberboard') + .itemInputs('1x gtceu:wood_plate') + .inputFluids(Fluid.of('gtceu:creosote', 50)) + .itemOutputs('tfg:high_density_treated_fiberboard') + .duration(100) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.compressor('tfg:chemical_treated_wood') + .itemInputs('#tfg:wood_dusts') + .itemOutputs('gtceu:treated_wood_dust') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) + event.recipes.gtceu.assembler('tfg:resin_circuit_assembler') + .itemInputs('gtceu:wood_plate', '2x gtceu:sticky_resin') + .itemOutputs('gtceu:resin_circuit_board') + .duration(20*10) + .EUt(GTValues.VA[GTValues.ULV]) + //#region New Casings event.recipes.gtceu.assembler('basic_solar_casing') diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 895467739..b668b69c1 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -642,17 +642,6 @@ function removeGTCEURecipes(event) { removeMaceratorRecipe(event, 'macerate_brick_wall') removeMaceratorRecipe(event, 'macerate_flower_pot') - removeMaceratorRecipe(event, 'macerate_treated_wood_fence_gate') - removeMaceratorRecipe(event, 'macerate_long_treated_wood_rod') - removeMaceratorRecipe(event, 'macerate_treated_wood_normal_fluid_pipe') - removeMaceratorRecipe(event, 'macerate_treated_wood_large_fluid_pipe') - removeMaceratorRecipe(event, 'macerate_treated_wood_small_fluid_pipe') - removeMaceratorRecipe(event, 'macerate_treated_wood_door') - removeMaceratorRecipe(event, 'macerate_treated_wood_frame') - removeMaceratorRecipe(event, 'macerate_treated_wood_fence') - removeMaceratorRecipe(event, 'macerate_treated_wood_boat') - removeMaceratorRecipe(event, 'macerate_treated_wood_chest_boat') - removeMaceratorRecipe(event, 'macerate_marble') event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__fireclay' }) @@ -725,7 +714,6 @@ function removeGTCEURecipes(event) { // Remove old treated plank and wood plank recipe event.remove({ id: 'gtceu:compressor/compress_plate_dust_wood' }) - event.remove({ id: 'gtceu:compressor/compress_plate_dust_treated_wood'}) // Remove Default Pressure Plate Recipes const MC_PRESSURE_PLATES = [ diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index f62501506..5831cf73a 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -56,6 +56,8 @@ const registerGTCEUItemTags = (event) => { event.remove('minecraft:planks', 'gtceu:treated_wood_planks') event.remove('minecraft:planks', 'gtceu:treated_wood_plate') + event.remove('minecraft:planks', 'gtceu:wood_plate') + event.add('tfg:sugars', 'minecraft:sugar') event.add('tfg:sugars', 'afc:birch_sugar') event.add('tfg:sugars', 'afc:maple_sugar') diff --git a/kubejs/startup_scripts/gtceu/items.js b/kubejs/startup_scripts/gtceu/items.js index b595c4f20..6b29ca59f 100644 --- a/kubejs/startup_scripts/gtceu/items.js +++ b/kubejs/startup_scripts/gtceu/items.js @@ -36,4 +36,10 @@ const registerGTCEuItems = (event) => { event.create('tfg:chipboard_composite') .translationKey('item.chipboard_composite') + event.create('tfg:treated_chipboard_composite') + .translationKey('item.treated_chipboard_composite') + + event.create('tfg:high_density_treated_fiberboard') + .translationKey('item.high_density_treated_fiberboard') + } From 5e47c4a2ef94b77d48cedcf168dd9cae6d43a7eb Mon Sep 17 00:00:00 2001 From: Redeix Date: Sat, 23 Aug 2025 14:25:24 -0500 Subject: [PATCH 141/158] git moment --- .../tfg/blockstates/large_nest_box.json | 278 +++++++++--------- .../blockstates/large_nest_box_warped.json | 278 +++++++++--------- .../assets/tfg/models/item/sniffer_egg.json | 10 +- 3 files changed, 283 insertions(+), 283 deletions(-) diff --git a/kubejs/assets/tfg/blockstates/large_nest_box.json b/kubejs/assets/tfg/blockstates/large_nest_box.json index 93f899574..810bfd65f 100644 --- a/kubejs/assets/tfg/blockstates/large_nest_box.json +++ b/kubejs/assets/tfg/blockstates/large_nest_box.json @@ -1,140 +1,140 @@ -{ - "variants": { - "facing=north,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - "facing=north,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=north,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=north,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - - - "facing=south,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=south,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=south,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=south,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - - - "facing=east,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=east,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=east,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - "facing=east,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - - - "facing=west,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=west,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - - }, - "facing=west,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=west,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - - }, - - - "facing=north,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0" - }, - "facing=north,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 90 - }, - "facing=north,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 270 - }, - "facing=north,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 180 - }, - - "facing=south,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 180 - }, - "facing=south,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 270 - }, - "facing=south,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 90 - }, - "facing=south,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3" - }, - - "facing=east,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 90 - }, - "facing=east,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 180 - }, - "facing=east,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2" - }, - "facing=east,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 270 - }, - - "facing=west,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 270 - }, - "facing=west,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1" - - }, - "facing=west,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 180 - }, - "facing=west,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 90 - - } - - } +{ + "variants": { + "facing=north,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + "facing=north,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=north,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=north,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + + + "facing=south,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=south,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=south,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=south,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + + + "facing=east,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=east,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=east,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + "facing=east,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + + + "facing=west,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=west,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + + }, + "facing=west,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=west,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + + }, + + + "facing=north,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0" + }, + "facing=north,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 90 + }, + "facing=north,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 270 + }, + "facing=north,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 180 + }, + + "facing=south,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 180 + }, + "facing=south,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 270 + }, + "facing=south,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 90 + }, + "facing=south,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3" + }, + + "facing=east,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 90 + }, + "facing=east,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 180 + }, + "facing=east,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2" + }, + "facing=east,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 270 + }, + + "facing=west,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 270 + }, + "facing=west,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1" + + }, + "facing=west,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 180 + }, + "facing=west,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 90 + + } + + } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/large_nest_box_warped.json b/kubejs/assets/tfg/blockstates/large_nest_box_warped.json index 89e95bf8a..5b7e00742 100644 --- a/kubejs/assets/tfg/blockstates/large_nest_box_warped.json +++ b/kubejs/assets/tfg/blockstates/large_nest_box_warped.json @@ -1,140 +1,140 @@ -{ - "variants": { - "facing=north,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - "facing=north,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=north,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=north,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - - - "facing=south,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=south,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=south,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=south,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - - - "facing=east,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=east,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=east,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - "facing=east,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - - - "facing=west,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=west,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - - }, - "facing=west,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=west,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - - }, - - - "facing=north,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0" - }, - "facing=north,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 90 - }, - "facing=north,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 270 - }, - "facing=north,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 180 - }, - - "facing=south,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 180 - }, - "facing=south,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 270 - }, - "facing=south,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 90 - }, - "facing=south,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3" - }, - - "facing=east,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 90 - }, - "facing=east,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 180 - }, - "facing=east,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2" - }, - "facing=east,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 270 - }, - - "facing=west,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 270 - }, - "facing=west,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1" - - }, - "facing=west,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 180 - }, - "facing=west,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 90 - - } - - } +{ + "variants": { + "facing=north,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + "facing=north,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=north,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=north,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + + + "facing=south,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=south,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=south,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=south,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + + + "facing=east,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=east,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=east,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + "facing=east,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + + + "facing=west,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=west,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + + }, + "facing=west,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=west,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + + }, + + + "facing=north,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0" + }, + "facing=north,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 90 + }, + "facing=north,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 270 + }, + "facing=north,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 180 + }, + + "facing=south,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 180 + }, + "facing=south,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 270 + }, + "facing=south,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 90 + }, + "facing=south,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3" + }, + + "facing=east,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 90 + }, + "facing=east,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 180 + }, + "facing=east,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2" + }, + "facing=east,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 270 + }, + + "facing=west,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 270 + }, + "facing=west,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1" + + }, + "facing=west,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 180 + }, + "facing=west,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 90 + + } + + } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/sniffer_egg.json b/kubejs/assets/tfg/models/item/sniffer_egg.json index 4ff54261b..ee27e4927 100644 --- a/kubejs/assets/tfg/models/item/sniffer_egg.json +++ b/kubejs/assets/tfg/models/item/sniffer_egg.json @@ -1,6 +1,6 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "minecraft:item/sniffer_egg" - } +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/sniffer_egg" + } } \ No newline at end of file From 8d7abd4cf75d22817f155b6406ac608369e13cdb Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 21:54:21 +0100 Subject: [PATCH 142/158] langs --- kubejs/assets/gtceu/lang/en_us.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 8f72f42c9..57b015c45 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -90,7 +90,11 @@ "item.gtceu.osmium_credit": "§732,768 Credits", "item.gtceu.naquadah_credit": "§7262,144 Credits", "item.gtceu.neutronium_credit": "§72,097,152 Credits", + "item.gtceu.treated_wood_plate": "Treated Medium Density Fiberboard", "item.gtceu.wood_plate": "Medium Density Fiberboard", + "item.gtceu.treated_wood_dust": "Treated Chipboard Composite", + "item.gtceu.small_treated_wood_dust": "Small Pile of Treated Chipboard Composite", + "item.gtceu.tiny_treated_wood_dust": "Tiny Pile of Treated Chipboard Composite", "material.gtceu.ice": "Ice Slush", "material.gtceu.damascus_steel": "Swine-steel", "material.gtceu.cooperite": "Cooperite", From e64c8bc6aa427eecccbb00ee1f93efea10128741 Mon Sep 17 00:00:00 2001 From: TomPlop Date: Sat, 23 Aug 2025 17:00:35 -0400 Subject: [PATCH 143/158] Fix Board rework (#1681) * fix board * remove from tag * more update * last changes * Add new quests * fix the weird file * Fixes * fix quest optional * fix duplicate recipe * more fix * Fix fur for insulation * an other fix --- .../server_scripts/gregtech/recipes.machines.js | 16 ++++++++-------- .../server_scripts/tfg/recipes.miscellaneous.js | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 5e418a2f5..4938903fc 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -915,18 +915,18 @@ function registerGTCEuMachineRecipes(event) { .duration(100) .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.chemical_bath('gtceu:bath_high_density_treated_fiberboard') - .itemInputs('1x gtceu:wood_plate') + event.recipes.gtceu.chemical_bath('gtceu:bath_treated_wood_dust') + .itemInputs('#tfg:wood_dusts') .inputFluids(Fluid.of('gtceu:creosote', 50)) - .itemOutputs('tfg:high_density_treated_fiberboard') + .itemOutputs('gtceu:treated_wood_dust') .duration(100) .EUt(GTValues.VA[GTValues.ULV]) - event.recipes.gtceu.compressor('tfg:chemical_treated_wood') - .itemInputs('#tfg:wood_dusts') - .itemOutputs('gtceu:treated_wood_dust') - .duration(200) - .EUt(GTValues.VA[GTValues.ULV]) + event.recipes.gtceu.compressor('tfg:compressed_treated_chipboard_composite') + .itemInputs('tfg:treated_chipboard_composite') + .itemOutputs('tfg:high_density_treated_fiberboard') + .duration(200) + .EUt(GTValues.VA[GTValues.ULV]) event.recipes.gtceu.assembler('tfg:resin_circuit_assembler') .itemInputs('gtceu:wood_plate', '2x gtceu:sticky_resin') diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 3f96d316b..17ea21a87 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -1161,7 +1161,8 @@ function registerTFGMiscellaneousRecipes(event) { .duration(80) .EUt(GTValues.VA[GTValues.IV]) event.recipes.gtceu.mixer('tfg:aes_polyurethane_electric_only') - .itemInputs('tfg:aes_compressed_wool', '2x tfg:sniffer_wool','#forge:dusts/methylene_diphenyl_diisocyanate') + .itemInputs('tfg:aes_compressed_wool', //'2x tfg:sniffer_wool' REVERT UNTIL MARS, + '#forge:dusts/methylene_diphenyl_diisocyanate') .inputFluids(Fluid.of('gtceu:diethylenetriamine', 250), Fluid.of('gtceu:acetone', 1000)) .itemOutputs('tfg:aes_polyurethane') .duration(80) From 4812aa56343e6c2f4b9c2ae9e63094a42ca79521 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 22:01:57 +0100 Subject: [PATCH 144/158] langs --- kubejs/assets/gtceu/lang/en_us.json | 4 ---- kubejs/assets/tfg/lang/en_us.json | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 57b015c45..8f72f42c9 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -90,11 +90,7 @@ "item.gtceu.osmium_credit": "§732,768 Credits", "item.gtceu.naquadah_credit": "§7262,144 Credits", "item.gtceu.neutronium_credit": "§72,097,152 Credits", - "item.gtceu.treated_wood_plate": "Treated Medium Density Fiberboard", "item.gtceu.wood_plate": "Medium Density Fiberboard", - "item.gtceu.treated_wood_dust": "Treated Chipboard Composite", - "item.gtceu.small_treated_wood_dust": "Small Pile of Treated Chipboard Composite", - "item.gtceu.tiny_treated_wood_dust": "Tiny Pile of Treated Chipboard Composite", "material.gtceu.ice": "Ice Slush", "material.gtceu.damascus_steel": "Swine-steel", "material.gtceu.cooperite": "Cooperite", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 675ede7fa..e34420966 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -598,6 +598,8 @@ "item.tfg.large_casing_extruder_mold": "Extruder Mold (Large Bullet Casing)", "item.tfg.photo_cell_t1": "Basic Photovoltaic Cell", "item.tfg.electric_extendo_grip": "Electric Extendo Grip", + "item.tfg.treated_chipboard_composite": "Treated Chipboard Composite", + "item.tfg.high_density_treated_fiberboard": "Medium Density Treated Fiberboard", "material.tfg.latex": "Latex", "material.tfg.vulcanized_latex": "Vulcanized Latex", "material.tfg.fluix": "Fluix", @@ -1579,6 +1581,23 @@ "quests.high_voltage.wand.title": "Infinity Construction Wand", "quests.high_voltage.wand.subtitle": "Ultimate skyblock tool", "quests.high_voltage.wand.desc": "This wand does exactly the same thing as the other wands, except with &3no durability&r. Do you like building lots of tall buildings or paving over acres of pristine grassland? This is the tool for you!\n\nKeep in mind that Building Gadgets is available soon in &5EV&r, which provides even more powerful tools for avid builders.", + "quests.high_voltage.moon_harvester.title": "The Moon Harvester", + "quests.high_voltage.moon_harvester.subtitle": "Remember Bedrock miner?", + "quests.high_voltage.moon_harvester.desc": "The &7Moon&r is your first entry into &einfinite ores&r — but it’s a slow one.\nYou will need to harvest different kinds of &bRegolith Dust&r, each obtainable only in a specific biome.\nTo do this, you’ll rely on the &6Moon Harvester&r. There are two important things to remember when using it:\n\n• It requires an &9Input Bus&r so you can set the right &9circuit&r.\n• It supports &ecoils&r just like the &6Cracker&r — the higher the tier of your coils, the bigger the energy discount.\nThis is especially useful when harvesting Regolith far from your base.\n\nOf course, raw dust isn’t enough.\nYou’ll need a &asmall processing line&r to extract resources from the Regolith dust. So make sure to bring them to your &7Moon base&r for processing.", + "quests.high_voltage.regolith_vapor.title": "Regolith Vapor", + "quests.high_voltage.regolith_vapor.subtitle": "The little something to make dusts into ores", + "quests.high_voltage.regolith_vapor.desc": "To process your &bRegolith Dust&r, you’ll need &bRegolith Vapor&r — and setting it up is a bit more involved.\n\nHere’s what you’ll need:\n\n• &7Lunar Sand&r — obtainable infinitely with a &6Rock Breaker&r.\n• &eCarbon Dioxide&r — produced from &9Oxygen&r and &8Carbon Dust&r (easy, thanks to the infinite &bDiamond Dust&r you’ll be getting).\n• &9Nitrogen&r — acquired through the cultivation of &dChorus Fruits&r.\n\nTip: You can loop your &9Oxygen&r through &bSilicon Dioxide&r, which also gives you a steady bonus of &eSilicon Dust&r — a very useful side product.", + "quests.high_voltage.regolith_vapor.task": "Got it", + "quests.high_voltage.regolith_dust.title": "Regolith for each biomes", + "quests.high_voltage.regolith_dust.subtitle": "The three musketeers", + "quests.high_voltage.regolith_dust.desc": "You can obtain &b4 different types of Regolith Dust&r, each producing unique resources.\n\nEach type is tied to a specific &7deep biome&r on the &7Moon&r. Keep in mind: these biomes are not directly connected to each other, so you’ll need to explore a bit.\n\nFinding the right biome is made much easier with the &aXaero Map&r — use it to quickly locate where each dust can be harvested.", + "quests.high_voltage.dusty_ores.title": "Dusty Ores", + "quests.high_voltage.dusty_ores.subtitle": "Are you telling more Ore Processing?", + "quests.high_voltage.dusty_ores.desc": "The &7Dusty Ore&r is an exclusive &dTerraFirmaGreg&r ore type. All the &cinfinite ores&r you’ll obtain on the &7Moon&r — and later on &4Mars&r — will appear as Dusty Ores.\n\nAt this stage, the only way to process them is by using a &6Centrifuge&r to extract their dusts.\n\nPretty limiting, right? Don’t worry — you’ll unlock far &ebetter processing&r options once you reach &eVenus&r!\n\nPro tip: You can already speed things up with a &6Large Chemical Reactor&r. Thanks to &bPerfect Overcloaking&r, it can handle Dusty Ores much faster than the basic recipe suggests.", + "quests.high_voltage.dusty_ores.task": "All the Moon Dusty Ores", + "quests.high_voltage.final_dust.title": "Infinite Dusts", + "quests.high_voltage.final_dust.subtitle": "Finally infinite resources", + "quests.high_voltage.wafinal_dustd.desc": "This is all the &cinfinite resources&r you can obtain on the &7Moon&r before unlocking the more advanced processing available on &eVenus&r.\n\nWith these, you should have everything you need to keep progressing through &dGregTech&r — especially to secure the &amaintenance&r of your Moon Base.\n\nThese resources are essential for:\n• Crafting &dAE2 components&r\n• Producing an &cinfinite&r supply of &6Railgun Ammo&r\n\nPassive automation is now within your reach — take the step and make it happen!", "quests.low_voltage": "&7LV&r - Low Voltage", "quests.low_voltage.subtitle": "Tame electricity and begin your GregTech journey", "quests.low_voltage.lv_machine_hull.title": "Your second machine hull", From e4e9e10ff2781dd8651d1c939112f0717b29ec0e Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 22:06:32 +0100 Subject: [PATCH 145/158] fix banana split warning --- kubejs/server_scripts/tfg/recipes.food.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index da3ff0b5d..7d8148cd1 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -686,8 +686,7 @@ function registerTFGFoodRecipes(event) { processorRecipe("banana_split", 500, 16, { itemInputs: ['firmalife:food/vanilla_ice_cream', 'firmalife:food/strawberry_ice_cream', 'firmalife:food/chocolate_ice_cream', 'firmalife:food/pineapple', 'tfc:food/cherry', '2x tfc:food/banana'], itemOutputs: ['2x firmalife:food/banana_split'], - itemOutputProvider: TFC.isp.of('2x firmalife:food/banana_split').resetFood(), - circuit: 4 + itemOutputProvider: TFC.isp.of('2x firmalife:food/banana_split').resetFood() }) processorRecipe("butter", 300, 16, { From 0e5940b6751d37891d6a7b9d99ddb60022f9727d Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 22:09:17 +0100 Subject: [PATCH 146/158] chipboard composite mixing bowl unification --- kubejs/server_scripts/firmalife/recipes.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 2249bac00..15e27c0d3 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -540,18 +540,18 @@ const registerFirmaLifeRecipes = (event) => { .duration(200) event.recipes.firmalife.mixing_bowl() - .itemIngredients(['#tfg:wood_dusts', 'tfc:glue']) - .outputItem('tfg:chipboard_composite') + .itemIngredients(['#tfg:wood_dusts', '#tfg:wood_dusts', 'tfc:glue']) + .outputItem('2x tfg:chipboard_composite') .id('tfg:mixing_bowl/chipboard_composite_glue') event.recipes.firmalife.mixing_bowl() - .itemIngredients(['#tfg:wood_dusts', 'gtceu:sticky_resin']) - .outputItem('tfg:chipboard_composite') + .itemIngredients(['#tfg:wood_dusts', '#tfg:wood_dusts', '#tfg:wood_dusts', '#tfg:wood_dusts', 'gtceu:sticky_resin']) + .outputItem('4x tfg:chipboard_composite') .id('tfg:mixing_bowl/chipboard_composite_resin') event.recipes.firmalife.mixing_bowl() - .itemIngredients(['#tfg:wood_dusts', '#forge:wax']) - .outputItem('tfg:chipboard_composite') + .itemIngredients(['#tfg:wood_dusts', '#tfg:wood_dusts', '#forge:wax']) + .outputItem('2x tfg:chipboard_composite') .id('tfg:mixing_bowl/chipboard_composite_wax') // Dough From 143db245ab6b55c0338e869a20f131f10fc39e01 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 22:15:49 +0100 Subject: [PATCH 147/158] fix typo --- kubejs/assets/tfg/lang/en_us.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index e34420966..033521a87 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1597,7 +1597,7 @@ "quests.high_voltage.dusty_ores.task": "All the Moon Dusty Ores", "quests.high_voltage.final_dust.title": "Infinite Dusts", "quests.high_voltage.final_dust.subtitle": "Finally infinite resources", - "quests.high_voltage.wafinal_dustd.desc": "This is all the &cinfinite resources&r you can obtain on the &7Moon&r before unlocking the more advanced processing available on &eVenus&r.\n\nWith these, you should have everything you need to keep progressing through &dGregTech&r — especially to secure the &amaintenance&r of your Moon Base.\n\nThese resources are essential for:\n• Crafting &dAE2 components&r\n• Producing an &cinfinite&r supply of &6Railgun Ammo&r\n\nPassive automation is now within your reach — take the step and make it happen!", + "quests.high_voltage.final_dust.desc": "This is all the &cinfinite resources&r you can obtain on the &7Moon&r before unlocking the more advanced processing available on &eVenus&r.\n\nWith these, you should have everything you need to keep progressing through &dGregTech&r — especially to secure the &amaintenance&r of your Moon Base.\n\nThese resources are essential for:\n• Crafting &dAE2 components&r\n• Producing an &cinfinite&r supply of &6Railgun Ammo&r\n\nPassive automation is now within your reach — take the step and make it happen!", "quests.low_voltage": "&7LV&r - Low Voltage", "quests.low_voltage.subtitle": "Tame electricity and begin your GregTech journey", "quests.low_voltage.lv_machine_hull.title": "Your second machine hull", From 9b6cc9cbd1b4c97bafce81bb4d9c724a2f7d61cb Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 22:18:05 +0100 Subject: [PATCH 148/158] remove old bedrock miner quest, fix typo --- .../quests/chapters/space_survival.snbt | 26 +------------------ kubejs/assets/tfg/lang/en_us.json | 5 +--- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/config/ftbquests/quests/chapters/space_survival.snbt b/config/ftbquests/quests/chapters/space_survival.snbt index 28c948ed4..de0339f43 100644 --- a/config/ftbquests/quests/chapters/space_survival.snbt +++ b/config/ftbquests/quests/chapters/space_survival.snbt @@ -153,27 +153,6 @@ } ] quests: [ - { - dependencies: ["5826EC76931359B8"] - description: ["{quests.space_survival.bedrock_mining.desc}"] - icon: "gtceu:mv_bedrock_ore_miner" - id: "3C92063DE5B9D5E9" - subtitle: "{quests.space_survival.bedrock_mining.subtitle}" - tasks: [{ - id: "7768441FAA017BB1" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "or(item(gtceu:mv_bedrock_ore_miner)item(gtceu:hv_bedrock_ore_miner)item(gtceu:ev_bedrock_ore_miner))" - } - } - type: "item" - }] - title: "{quests.space_survival.bedrock_mining.title}" - x: -1.0d - y: 1.0d - } { dependencies: ["16B735F9C391D260"] description: ["{quests.space_survival.preparations.desc}"] @@ -456,10 +435,7 @@ y: -4.5d } { - dependencies: [ - "5826EC76931359B8" - "3C92063DE5B9D5E9" - ] + dependencies: ["5826EC76931359B8"] description: [ "{quests.space_survival.railgun.desc.1}" "{@pagebreak}" diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 033521a87..e4cc0586a 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1577,7 +1577,7 @@ "quests.high_voltage.space_survival.desc": "If you haven't already, be sure to check out the &3Tips - Space Survival&r quest chapter! It contains all the information you'll need to establish a proper moon colony.", "quests.high_voltage.hypertubes.title": "Hypertubes", "quests.high_voltage.hypertubes.subtitle": "The future is now, old man", - "quests.high_voltage.hypertubes.desc": "Looking for a cooler way to quickly get around your base? Try &3Hypertubes&r! Just stand near one end and you'll be sucked up and transported to the other, and they can go in any direction too!\n\nThese do require Stress Units to power, but if you don't have a Create setup any more, you can turn EU into SU with a GregTech Energy Converter and an Electric Motor from &9&oCreate Crafts & Additions&r.", + "quests.high_voltage.hypertubes.desc": "Looking for a cooler way to quickly get around your base? Try &3Hypertubes&r! Just stand near one end and you'll be sucked up and transported to the other, and they can go in any direction too!\n\nThese do require Stress Units to power, but if you don't have a Create setup any more, you can turn EU into SU with a GregTech Energy Converter and an Electric Motor from &9&oCreate Crafts && Additions&r.", "quests.high_voltage.wand.title": "Infinity Construction Wand", "quests.high_voltage.wand.subtitle": "Ultimate skyblock tool", "quests.high_voltage.wand.desc": "This wand does exactly the same thing as the other wands, except with &3no durability&r. Do you like building lots of tall buildings or paving over acres of pristine grassland? This is the tool for you!\n\nKeep in mind that Building Gadgets is available soon in &5EV&r, which provides even more powerful tools for avid builders.", @@ -2385,9 +2385,6 @@ "quests.space_survival.oxygen_info.title": "More Moon base machines", "quests.space_survival.oxygen_info.subtitle": "Home comforts", "quests.space_survival.oxygen_info.desc": "The Oxygen Detector is a simple machine that emits a redstone signal whenever it's in an oxygenated area.\n\nThe Vent is a solid block that can also let breathable air through without causing a vortex.\n\nThe Gravity Normalizer can change the gravity of an area within an enclosed space similar to how an Air Distributor works, but is a little too expensive at the moment.", - "quests.space_survival.bedrock_mining.title": "Bedrock mining", - "quests.space_survival.bedrock_mining.subtitle": "You'll never run out of copper again!", - "quests.space_survival.bedrock_mining.desc": "If you've ever pumped oil before, &9Bedrock Veins&r are the equivalent of that but for raw ores. And if you haven't? It's like oil pumping.\n\nJokes aside, these multiblocks can provide a constant, &cinfinite&r source of some ores for the rest of your game. Wow, that sounds too good to be true, doesn't it? What's the catch? Finding the veins.\n\nThey're spread far apart and don't exist on Earth, meaning you'll want to set up some way to ship the ores back to your main base. (&aTrains&r are fantastic here!)\n\nCheck out JEI to see what ores are available on the Moon, then find the veins with your HV Ore Prospector set to &oBedrock Ore Mode&r (sneak + right-click)!", "quests.space_survival.railgun.title": "Interplanetary Logistics", "quests.space_survival.railgun.subtitle": "Ender chest? Never heard of her!", "quests.space_survival.railgun.desc.1": "&7In &bTerraFirmaGreg&r, transporting items across dimensions or over long distances requires you to build special &6multiblock structures&r.\n\nThis system is &apowerful and flexible&r, offering multiple settings that let you customize logistics to perfectly suit your needs.\n\nThis is the perfect system to transport all of your &apassively-produced&r resources to exactly where they're needed on other planets! And it comes with a powerful &dconfiguration system&r to let you control everything from a single place.", From 6c27029842b7d62cf946781fadac94836bb0b0ab Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 23 Aug 2025 22:19:51 +0100 Subject: [PATCH 149/158] fucking formatting --- kubejs/assets/tfg/lang/en_us.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index e4cc0586a..7d3c5a671 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1577,7 +1577,7 @@ "quests.high_voltage.space_survival.desc": "If you haven't already, be sure to check out the &3Tips - Space Survival&r quest chapter! It contains all the information you'll need to establish a proper moon colony.", "quests.high_voltage.hypertubes.title": "Hypertubes", "quests.high_voltage.hypertubes.subtitle": "The future is now, old man", - "quests.high_voltage.hypertubes.desc": "Looking for a cooler way to quickly get around your base? Try &3Hypertubes&r! Just stand near one end and you'll be sucked up and transported to the other, and they can go in any direction too!\n\nThese do require Stress Units to power, but if you don't have a Create setup any more, you can turn EU into SU with a GregTech Energy Converter and an Electric Motor from &9&oCreate Crafts && Additions&r.", + "quests.high_voltage.hypertubes.desc": "Looking for a cooler way to quickly get around your base? Try &3Hypertubes&r! Just stand near one end and you'll be sucked up and transported to the other, and they can go in any direction too!\n\nThese do require Stress Units to power, but if you don't have a Create setup any more, you can turn EU into SU with a GregTech Energy Converter and an Electric Motor from &9&oCreate Crafts and Additions&r.", "quests.high_voltage.wand.title": "Infinity Construction Wand", "quests.high_voltage.wand.subtitle": "Ultimate skyblock tool", "quests.high_voltage.wand.desc": "This wand does exactly the same thing as the other wands, except with &3no durability&r. Do you like building lots of tall buildings or paving over acres of pristine grassland? This is the tool for you!\n\nKeep in mind that Building Gadgets is available soon in &5EV&r, which provides even more powerful tools for avid builders.", From 69fa9c1b2346c496952c44a38206a47bed1ffaac Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 24 Aug 2025 00:53:03 +0100 Subject: [PATCH 150/158] lang --- kubejs/assets/tfc/lang/en_us.json | 1 + 1 file changed, 1 insertion(+) diff --git a/kubejs/assets/tfc/lang/en_us.json b/kubejs/assets/tfc/lang/en_us.json index 265eef153..2bcfdf701 100644 --- a/kubejs/assets/tfc/lang/en_us.json +++ b/kubejs/assets/tfc/lang/en_us.json @@ -19,6 +19,7 @@ "metal.tfg.cobalt": "Cobalt", "metal.tfg.cobalt_brass": "Cobalt Brass", "metal.tfg.aluminium_silicate": "Aluminium Silicate", + "tfc.tooltip.propick.accuracy": "Accuracy: 100%", "trim_material.tfc.almandine_tfc": "Almandine", "trim_material.tfc.andradite_tfc": "Andradite", "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", From 3ab8616b8f77f92dea8e5129717b4c1d2ded1410 Mon Sep 17 00:00:00 2001 From: Redeix Date: Sat, 23 Aug 2025 18:56:37 -0500 Subject: [PATCH 151/158] Patchouli stuff (#1684) * Prospecting Stuff * correction * another correction * another another correction * lets just make this better --- kubejs/assets/tfc/lang/en_us.json | 1 + .../en_us/entries/mechanics/prospecting.json | 47 ++++++++++++++---- .../prospecting/tfg_luv_ore_prospector.png | Bin 0 -> 52587 bytes .../prospecting/tfg_prospectors_pick_xray.png | Bin 0 -> 92844 bytes kubejs/server_scripts/tfg/tags.js | 1 - 5 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 kubejs/assets/tfg/textures/gui/field_guide/prospecting/tfg_luv_ore_prospector.png create mode 100644 kubejs/assets/tfg/textures/gui/field_guide/prospecting/tfg_prospectors_pick_xray.png diff --git a/kubejs/assets/tfc/lang/en_us.json b/kubejs/assets/tfc/lang/en_us.json index 265eef153..2bcfdf701 100644 --- a/kubejs/assets/tfc/lang/en_us.json +++ b/kubejs/assets/tfc/lang/en_us.json @@ -19,6 +19,7 @@ "metal.tfg.cobalt": "Cobalt", "metal.tfg.cobalt_brass": "Cobalt Brass", "metal.tfg.aluminium_silicate": "Aluminium Silicate", + "tfc.tooltip.propick.accuracy": "Accuracy: 100%", "trim_material.tfc.almandine_tfc": "Almandine", "trim_material.tfc.andradite_tfc": "Andradite", "trim_material.tfc.blue_topaz_tfc": "Blue Topaz", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/prospecting.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/prospecting.json index 8bc8d9df5..c7701da2f 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/prospecting.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/prospecting.json @@ -6,11 +6,11 @@ "pages": [ { "type": "patchouli:text", - "text": "You remembered where you picked up those $(l:getting_started/finding_ores)small metal nuggets$(), right? Finding additional ores may require extensive exploration and mining. You should become very familiar with $(l:tfg_ores/index)ores and minerals$(). If you need a specific resource, you must find the rock type it spawns in either under your feet or across the world." + "text": "You remembered where you picked up those $(l:getting_started/finding_ores)small metal nuggets$(), right? Finding additional ores may require extensive exploration and mining. You should become very familiar with $(l:tfg_ores/earth_ore_index)ores and minerals$(). If you need a specific resource, you must find the rock type it spawns in either under your feet or across the world." }, { "type": "patchouli:text", - "text": "When picking up small nuggets becomes unsatisfying, it is time to start prospecting to find ore veins:$(br)$(li)Small nuggets occur when an ore vein is located below. If you find the center of a group of nuggets, it's likely that the vein is beneath you.$(li)Exposed ore can occur in cliffs and water bodies, which may be seen from farther away." + "text": "When picking up small nuggets becomes unsatisfying, it is time to start prospecting to find ore veins:$(br)$(li)Small nuggets, surface buds, and surface rocks occur when an ore vein is located below. If you find the center of a group of nuggets, it's likely that the vein is beneath you.$(li)Exposed ore can occur in cliffs and water bodies, which may be seen from farther away." }, { "type": "patchouli:spotlight", @@ -18,7 +18,22 @@ "item": "tfc:metal/propick/copper", "title": "Prospector's Pick", "link_recipes": false, - "text": "If you're looking for metal ores or mineral veins (which have no nuggets), and you can't find the vein by guessing, it's time to pull out the $(thing)prospector's pick$(). It searches the 25x25x25 area centered on the block clicked, and reports to the action bar the amount and type of ore located." + "text": "If you're looking for ore veins, and you can't find the vein by guessing, it's time to pull out the $(item)prospector's pick$(). If you are familiar with base prospector's picks in $(thing)TFC$() you may be suprised to learn that they function very differently in $(thing)TerraFirmaGreg$()" + }, + { + "type": "patchouli:text", + "text": "Right-clicking a prospector's pick in $(thing)TFG$() will cast a search ray in your views direction. The rays width and depth is dependent on the tier of the pick noted in its tooltips. Depending on the tier of the prospector's pick can also give you a count of the ore quantities and even display an $(thing)X-Ray$() indicator of the ore vein." + }, + { + "type": "patchouli:text", + "text": "The prospector's pick can display the following information on use:$(br)$(li)In chat the pick can display the $(thing)total quantity$() of the ore vein, the $(thing)contents$() of the ore vein, and the $(thing)quantity per ore-type$() of the ore vein.$(li)$(thing)colored steel$() prospector's picks can also display either a large X-Ray particle in the $(thing)center$() of an ore vein, or $(thing)paricle's per ore block$()" + }, + { + "type": "patchouli:image", + "title": "Prospector View", + "images": ["tfg:textures/gui/field_guide/prospecting/tfg_prospectors_pick_xray.png"], + "border": true, + "text": "Using a prospector's pick looks like this. The large $(bold)\"!\"$() mark particle is from per-vein style x-ray. And the smaller ones are from per-block style x-ray." }, { "type": "tfc:knapping_recipe", @@ -28,20 +43,31 @@ { "type": "tfc:heat_recipe", "recipe": "tfc:heating/propick_head_mold", - "text": "Once the mold has been $(l:getting_started/pottery)knapped$(), it needs to be $(l:mechanics/heating)fired$() to create a $(thing)propick head mold.$()$(br2)To create the tool head, $(l:getting_started/finding_ores#casting)cast$() liquid metal into the mold." + "text": "Once the mold has been $(l:getting_started/pottery)knapped$(), it needs to be $(l:mechanics/heating)fired$() to create a $(item)propick head mold.$()$(br2)To create the tool head, $(l:getting_started/finding_ores#casting)cast$() liquid metal into the mold." }, { "type": "tfc:anvil_recipe", "recipe": "tfc:anvil/copper_propick_head", - "text": "A prospector's pick head can also be $(l:mechanics/anvils#working)smithed$() out of an $(thing)ingot$() of any tool metal on an $(l:mechanics/anvils)Anvil$().$(br2)The prospector's pick is then created by crafting the tool head with a stick." + "text": "A prospector's pick head can also be $(l:mechanics/anvils#working)smithed$() out of an $(item)ingot$() of any tool metal on an $(l:mechanics/anvils)Anvil$().$(br2)The prospector's pick is then created by crafting the tool head with a stick." }, { "type": "patchouli:text", - "text": "The prospector's pick will never report finding something when nothing is actually there. However, it may incorrectly say nothing is there when a vein is in range. Higher tier tools will reduce or eliminate these false negatives.$(br2)Prospector's picks at the same tier give identical results when used on the same block unless ores were removed.$(br2)If the prospector's pick finds multiple ores nearby, it will only report one." + "text": "The majority of the stats and charecteristics of the prospector's picks can be adjustable in your server config file." }, { - "type": "patchouli:text", - "text": "Right-clicking a Prospector's Pick on a block will report finding one of these possible results:$(br)$(li)Nothing (may be false)$(li)Traces$(li)A Small Sample$(li)A Medium Sample$(li)A Large Sample$(li)A Very Large Sample$(br2)Very large samples indicate at least eighty and potentially many more blocks." + "type": "patchouli:spotlight", + "anchor": "prospector", + "item": "gtceu:prospector.lv", + "title": "Digital Ore Prospector's", + "link_recipes": false, + "text": "Technology is now! And with it comes new ways to find your ore veins!$(br)$(item)Ore Prospector's$() are $(thing)GregTech's$() solution to finding ore veins and fluid deposits in your world. The size and capabilities of the ore prospectors are determined by the $(#ff1100)voltage tier$()." + }, + { + "type": "patchouli:image", + "title": "Ore Prospector", + "images": ["tfg:textures/gui/field_guide/prospecting/tfg_luv_ore_prospector.png"], + "border": true, + "text": "An example of what you may see using the $(#e373ff)LuV ore prospector$()." } ], "read_by_default": true, @@ -54,6 +80,9 @@ "tfc:metal/propick/steel": 2, "tfc:metal/propick/black_steel": 2, "tfc:metal/propick/blue_steel": 2, - "tfc:metal/propick/red_steel": 2 + "tfc:metal/propick/red_steel": 2, + "gtceu:prospector.lv": 10, + "gtceu:prospector.hv": 10, + "gtceu:prospector.luv": 10 } } diff --git a/kubejs/assets/tfg/textures/gui/field_guide/prospecting/tfg_luv_ore_prospector.png b/kubejs/assets/tfg/textures/gui/field_guide/prospecting/tfg_luv_ore_prospector.png new file mode 100644 index 0000000000000000000000000000000000000000..dba14c33cfea10876cf424e2c6ee4584b644ca42 GIT binary patch literal 52587 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 literal 0 HcmV?d00001 diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index bb62dbb3f..8001e35f1 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -62,7 +62,6 @@ const registerTFGItemTags = (event) => { event.add('tfg:harvester', 'tfg:harvest_basket') event.add('tfg:harvester', 'tfg:aluminium_harvest_basket') - event.removeAll('tfc:propicks') event.add('tfg:tools/ore_prospectors/copper', 'tfc:metal/propick/copper') event.add('tfg:tools/ore_prospectors/bronze', 'tfc:metal/propick/bronze') event.add('tfg:tools/ore_prospectors/bronze', 'tfc:metal/propick/bismuth_bronze') From 70202295735434bb6ce87f34f08a4f25ed406a5f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 24 Aug 2025 11:41:29 +0100 Subject: [PATCH 152/158] pakku --- pakku-lock.json | 132 ++++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index 368c0d9b9..ec49e6c1d 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -5077,7 +5077,7 @@ "files": [ { "type": "modrinth", - "file_name": "everycomp-1.20-2.9.0-forge.jar", + "file_name": "everycomp-1.20-2.9.1-forge.jar", "mc_versions": [ "1.20.1" ], @@ -5085,22 +5085,22 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/eiktJyw1/versions/QeAScqwj/everycomp-1.20-2.9.0-forge.jar", - "id": "QeAScqwj", + "url": "https://cdn.modrinth.com/data/eiktJyw1/versions/ZmTNauR4/everycomp-1.20-2.9.1-forge.jar", + "id": "ZmTNauR4", "parent_id": "eiktJyw1", "hashes": { - "sha512": "e9677f60675a83f0d645c95503bdcede921d7a5b0ce513766b051b785519bb7191165381deaae1837c716de12458e2f13ef59820a72af2d36788e9ed1f5fca9a", - "sha1": "79b7d93cebf1aa77d9d0b244f196d426a3a71e59" + "sha512": "861479f930de09109a285ad3ddbfe54764510fa4228ba95d13e200d467b580c3a5e67d7b88ee453db7b4796f3f26a333934aae3610d0e8624a7fb5c357bfff5f", + "sha1": "88eabf9f0c614cc097b1b39b5a970b5e7835274b" }, "required_dependencies": [ "twkfQtEc" ], - "size": 2805521, - "date_published": "2025-08-21T08:37:42.008646Z" + "size": 2808536, + "date_published": "2025-08-24T04:23:13.159167Z" }, { "type": "curseforge", - "file_name": "everycomp-1.20-2.9.0-forge.jar", + "file_name": "everycomp-1.20-2.9.1-forge.jar", "mc_versions": [ "1.20.1" ], @@ -5108,18 +5108,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6910/551/everycomp-1.20-2.9.0-forge.jar", - "id": "6910551", + "url": "https://edge.forgecdn.net/files/6921/386/everycomp-1.20-2.9.1-forge.jar", + "id": "6921386", "parent_id": "628539", "hashes": { - "sha1": "79b7d93cebf1aa77d9d0b244f196d426a3a71e59", - "md5": "3ef743fb5d8e8b445edaa56825616f44" + "sha1": "88eabf9f0c614cc097b1b39b5a970b5e7835274b", + "md5": "3685dc96dc9eec27c20d73fb19240108" }, "required_dependencies": [ "499980" ], - "size": 2805521, - "date_published": "2025-08-21T08:37:31.970Z" + "size": 2808536, + "date_published": "2025-08-24T04:22:59.213Z" } ] }, @@ -5717,7 +5717,7 @@ "files": [ { "type": "modrinth", - "file_name": "fancymenu_forge_3.6.4_MC_1.20.1.jar", + "file_name": "fancymenu_forge_3.7.0_MC_1.20.1.jar", "mc_versions": [ "1.20.1" ], @@ -5725,19 +5725,19 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/Wq5SjeWM/versions/uWOORZzp/fancymenu_forge_3.6.4_MC_1.20.1.jar", - "id": "uWOORZzp", + "url": "https://cdn.modrinth.com/data/Wq5SjeWM/versions/MbyfTTsz/fancymenu_forge_3.7.0_MC_1.20.1.jar", + "id": "MbyfTTsz", "parent_id": "Wq5SjeWM", "hashes": { - "sha512": "a63c8caeb1b39d2161c6836e1fb7b4ec0d4faa37230039fcb6bef6c6a3b4ccdf736d2f8140c867e7f70b64012aabb7817fabfa0c6222a2547b512a5a58ef18f9", - "sha1": "da528b28187269d2c44c8192e89c701187953d1e" + "sha512": "00579685f38e30eaeaf2ab01c23ea72b53ef03245e46be35297e0955383e070a92983ec5ca2043592fcf34213d3cf9ae8e82165187da7d3b32d84b65c9d054fa", + "sha1": "f33a40f7d33585e781d90d00d156178e369ae8ed" }, "required_dependencies": [ "CVT4pFB2", "J81TRJWm" ], - "size": 3573433, - "date_published": "2025-07-18T21:12:19.752104Z" + "size": 3628603, + "date_published": "2025-08-23T14:53:05.096476Z" }, { "type": "curseforge", @@ -10663,7 +10663,7 @@ "modrinth": "puzzles-lib" }, "name": { - "curseforge": "Puzzles Lib [Forge & Fabric]", + "curseforge": "Puzzles Lib", "modrinth": "Puzzles Lib" }, "id": { @@ -10671,30 +10671,9 @@ "modrinth": "QAGBst4M" }, "files": [ - { - "type": "curseforge", - "file_name": "PuzzlesLib-v8.1.32-1.20.1-Forge.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6387/81/PuzzlesLib-v8.1.32-1.20.1-Forge.jar", - "id": "6387081", - "parent_id": "495476", - "hashes": { - "sha1": "1f24a25582fa6bb2569e32401a232ee90d34cc1a", - "md5": "3ca3da58d71c0b14241df38578ffdb22" - }, - "required_dependencies": [], - "size": 1342204, - "date_published": "2025-04-05T11:23:03.413Z" - }, { "type": "modrinth", - "file_name": "PuzzlesLib-v8.1.32-1.20.1-Forge.jar", + "file_name": "PuzzlesLib-v8.1.33-1.20.1-Forge.jar", "mc_versions": [ "1.20.1" ], @@ -10702,16 +10681,37 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/QAGBst4M/versions/YFZdsqXl/PuzzlesLib-v8.1.32-1.20.1-Forge.jar", - "id": "YFZdsqXl", + "url": "https://cdn.modrinth.com/data/QAGBst4M/versions/mIyVGf3d/PuzzlesLib-v8.1.33-1.20.1-Forge.jar", + "id": "mIyVGf3d", "parent_id": "QAGBst4M", "hashes": { - "sha512": "f6420b4884583727ee66d7410ce5ad3ce2a5fd9aed49700ea4bba1fd944a4b63d2d3f15a3d0d64afa2ec1aa261f8ef52b6277712c7d19e6dd31ff9d9360f05ae", - "sha1": "1f24a25582fa6bb2569e32401a232ee90d34cc1a" + "sha512": "4e0a6243f70a7f99bb631940bfeca49f31b13ec34f338d994fe129f0445e738ffd925e5c440f4e6bf822f9013bb8c2156de6dfcd62741d85c3ca3e8221d86a19", + "sha1": "285b7c7616971338ccbe0022c9ea0f8ad3036aaf" }, "required_dependencies": [], - "size": 1342204, - "date_published": "2025-04-05T11:23:08.540092Z" + "size": 1342987, + "date_published": "2025-08-23T12:27:37.945208Z" + }, + { + "type": "curseforge", + "file_name": "PuzzlesLib-v8.1.33-1.20.1-Forge.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6918/565/PuzzlesLib-v8.1.33-1.20.1-Forge.jar", + "id": "6918565", + "parent_id": "495476", + "hashes": { + "sha1": "285b7c7616971338ccbe0022c9ea0f8ad3036aaf", + "md5": "19f23e3040eaadc7c30ae38f5a3dec68" + }, + "required_dependencies": [], + "size": 1342987, + "date_published": "2025-08-23T12:27:32.200Z" } ] }, @@ -13235,7 +13235,7 @@ "files": [ { "type": "modrinth", - "file_name": "TerraFirmaGreg-Core-Modern-0.7.11.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.7.12.jar", "mc_versions": [ "1.20.1" ], @@ -13244,23 +13244,23 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/oiDw0Fhg/TerraFirmaGreg-Core-Modern-0.7.11.jar", - "id": "oiDw0Fhg", + "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/Dd2UXNbV/TerraFirmaGreg-Core-Modern-0.7.12.jar", + "id": "Dd2UXNbV", "parent_id": "lNttW2Xl", "hashes": { - "sha512": "cee41d5314832cc92ce25e8c33298e15bf478907739d3a932b0e96e79b741e1314c67fae538997066b06e47cf079b13117073aaab6c946e0311581d3b9f2bace", - "sha1": "b69f0c4aadf8edfb7b3e3864af70d35d84a45a77" + "sha512": "225f221bfe05db8bf12db88423c1978f5c288ea6377f000827b9d8d49c86181dc2c50f31e7cb008d81a8ebff57f2b77d027a90eed9725df8586ee9a6d610164e", + "sha1": "6b2684bf4af912e4951ec5790725798c90b512ef" }, "required_dependencies": [ "JaCEZUhg", "7tG215v7" ], - "size": 584412, - "date_published": "2025-08-23T12:10:49.232137Z" + "size": 584411, + "date_published": "2025-08-24T07:00:10.368612Z" }, { "type": "curseforge", - "file_name": "TerraFirmaGreg-Core-Modern-0.7.11.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.7.12.jar", "mc_versions": [ "1.20.1" ], @@ -13269,19 +13269,19 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6918/492/TerraFirmaGreg-Core-Modern-0.7.11.jar", - "id": "6918492", + "url": "https://edge.forgecdn.net/files/6921/637/TerraFirmaGreg-Core-Modern-0.7.12.jar", + "id": "6921637", "parent_id": "513402", "hashes": { - "sha1": "b69f0c4aadf8edfb7b3e3864af70d35d84a45a77", - "md5": "8d41611089b9a9ad0e018cbf93f8b680" + "sha1": "6b2684bf4af912e4951ec5790725798c90b512ef", + "md5": "364dc88bee9a429c47f1e59dffd1da2a" }, "required_dependencies": [ - "890405", - "302973" + "302973", + "890405" ], - "size": 584412, - "date_published": "2025-08-23T12:10:47.487Z" + "size": 584411, + "date_published": "2025-08-24T07:00:04.203Z" } ] }, From 84656b4606ad96661710dd65434040a194349c13 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 24 Aug 2025 11:46:55 +0100 Subject: [PATCH 153/158] remove embeddium/sodium, add xenon --- config/xenon++.toml | 131 +++++++++++++++++ config/xenon-mixins.properties | 6 + config/xenon-options.json | 31 ++++ pakku-lock.json | 261 +++++---------------------------- 4 files changed, 208 insertions(+), 221 deletions(-) create mode 100644 config/xenon++.toml create mode 100644 config/xenon-mixins.properties create mode 100644 config/xenon-options.json diff --git a/config/xenon++.toml b/config/xenon++.toml new file mode 100644 index 000000000..5e3011163 --- /dev/null +++ b/config/xenon++.toml @@ -0,0 +1,131 @@ + +[xenonextras] + + [xenonextras.general] + #Set Fullscreen mode + #Borderless let you change between screens more faster and move your mouse across monitors + #Allowed Values: WINDOWED, BORDERLESS, FULLSCREEN + fullscreen = "WINDOWED" + #Configure FPS Display mode + #Complete mode gives you min FPS count and average count + #Allowed Values: OFF, SIMPLE, ADVANCED, FRAMETIME + fpsDisplay = "ADVANCED" + #Configure FPS Display gravity + #Places counter on specified corner of your screen + #Allowed Values: LEFT, CENTER, RIGHT + fpsDisplayGravity = "LEFT" + #Shows GPU and memory usage onto FPS display + #Allowed Values: OFF, ON, RAM + fpsDisplaySystem = "OFF" + #Configure FPS Display margin + #Give some space between corner and text + #Range: 0 ~ 48 + fpsDisplayMargin = 12 + #Toggle FPS Display shadow + #In case sometimes you can't see the text + fpsDisplayShadow = false + + [xenonextras.quality] + #Toggle fog feature + #Fog was a vanilla feature, toggling off may increases performance + fog = true + #Raise clouds + #Modify clouds height perfect for a adaptative world experience + #Range: 0 ~ 512 + cloudsHeight = 192 + #Chunks fade in speed + #This option doesn't affect performance, just changes speed + #Allowed Values: OFF, FAST, SLOW + chunkFadeSpeed = "SLOW" + + [xenonextras.quality.darkness] + #Configure Darkness Mode + #Each config changes what is considered 'true darkness' + #Allowed Values: TOTAL_DARKNESS, PITCH_BLACK, DARK, DIM, OFF + mode = "OFF" + #Toggle Darkness on Overworld dimension + enableOnOverworld = true + #Toggle Darkness on Nether dimension + enableOnNether = false + #Configure fog brightness on nether when darkness is enabled + #Range: 0.0 ~ 1.0 + netherFogBright = 0.5 + #Toggle Darkness on End dimension + enableOnEnd = false + #Configure fog brightness on nether when darkness is enabled + #Range: 0.0 ~ 1.0 + endFogBright = 0.5 + #Toggle Darkness default mode for modded dimensions + valueByDefault = false + #List of all dimensions to use True Darkness + #This option overrides 'valueByDefault' state + dimensionWhitelist = [] + #Toggle darkness when dimension has no SkyLight + enableOnNoSkyLight = false + #Disables all bright sources of darkness like moon or fog + #Only affects darkness effect + enableBlockLightOnly = false + #Toggles if moon phases affects darkness in the overworld + affectedByMoonPhase = true + #Configure max moon brightness level with darkness + #Range: 0.0 ~ 1.0 + fullMoonBright = 0.25 + #Configure min moon brightness level with darkness + #Range: 0.0 ~ 1.0 + newMoonBright = 0.0 + + [xenonextras.performance] + #Toggles JREI item rendering until searching + #Increases performance a little bit and cleans your screen when you don't want to use it + hideJREI = false + #Toggles Minecraft Fonts shadows + #Depending of the case may increase performance + #Gives a flat style text + fontShadows = true + + [xenonextras.performance.distanceCulling] + + [xenonextras.performance.distanceCulling.tileEntities] + #Toggles distance culling for Block Entities + #Maybe you use another mod for that :( + enable = true + #Configure horizontal max distance before cull Block entities + #Value is squared, default was 64^2 (or 64x64) + #Range: > 0 + cullingMaxDistanceX = 4096 + #Configure vertical max distance before cull Block entities + #Value is raw + #Range: 0 ~ 512 + cullingMaxDistanceY = 32 + #List of all Block Entities to be ignored by distance culling + #Uses ResourceLocation to identify it + #Example 1: "minecraft:chest" - Ignores chests only + #Example 2: "ae2:*" - ignores all Block entities from Applied Energetics 2 + whitelist = ["waterframes:*"] + + [xenonextras.performance.distanceCulling.entities] + #Toggles distance culling for entities + enable = true + #Configure horizontal max distance before cull entities + #Value is squared, default was 64^2 (or 64x64) + #Range: > 0 + cullingMaxDistanceX = 4096 + #Configure vertical max distance before cull entities + #Value is raw + #Range: 0 ~ 512 + cullingMaxDistanceY = 32 + #Configure modifier applied to hostile entities + #Value is raw, 50% - 200% + #Range: 25 ~ 200 + hostileEntityModifier = 100 + #List of all Entities to be ignored by distance culling + #Uses ResourceLocation to identify it + #Example 1: "minecraft:bat" - Ignores bats only + #Example 2: "alexsmobs:*" - ignores all entities for alexmobs mod + whitelist = ["minecraft:ghast", "minecraft:ender_dragon", "iceandfire:*", "create:*"] + + [xenonextras.others] + #Configure if borderless fullscreen option should be attached to F11 or replace vanilla fullscreen + #Allowed Values: ATTACH, REPLACE, OFF + borderlessAttachModeOnF11 = "ATTACH" + diff --git a/config/xenon-mixins.properties b/config/xenon-mixins.properties new file mode 100644 index 000000000..923d9581a --- /dev/null +++ b/config/xenon-mixins.properties @@ -0,0 +1,6 @@ +# This is the configuration file for Xenon. +# +# You can find information on editing this file and all the available options here: +# https://github.com/jellysquid3/sodium-fabric/wiki/Configuration-File +# +# By default, this file will be empty except for this notice. diff --git a/config/xenon-options.json b/config/xenon-options.json new file mode 100644 index 000000000..2a49be477 --- /dev/null +++ b/config/xenon-options.json @@ -0,0 +1,31 @@ +{ + "quality": { + "weather_quality": "DEFAULT", + "leaves_quality": "DEFAULT", + "enable_vignette": true, + "use_quad_normals_for_shading": false + }, + "advanced": { + "enable_memory_tracing": false, + "use_advanced_staging_buffers": true, + "disable_incompatible_mod_warnings": false, + "cpu_render_ahead_limit": 3 + }, + "performance": { + "chunk_builder_threads": 0, + "always_defer_chunk_updates_v2": true, + "animate_only_visible_textures": true, + "use_entity_culling": true, + "leaf_culling_quality": "SOLID_AGGRESSIVE", + "use_fog_occlusion": true, + "use_block_face_culling": true, + "use_compact_vertex_format": true, + "use_translucent_face_sorting_v2": true, + "use_no_error_g_l_context": true + }, + "notifications": { + "force_disable_donation_prompts": false, + "has_cleared_donation_button": false, + "has_seen_donation_prompt": false + } +} \ No newline at end of file diff --git a/pakku-lock.json b/pakku-lock.json index ec49e6c1d..b8829535e 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -4723,69 +4723,6 @@ } ] }, - { - "pakku_id": "gYHPAspVHiwlSSXI", - "type": "MOD", - "side": "CLIENT", - "slug": { - "curseforge": "embeddium", - "modrinth": "embeddium" - }, - "name": { - "curseforge": "Embeddium", - "modrinth": "Embeddium" - }, - "id": { - "curseforge": "908741", - "modrinth": "sk9rgfiA" - }, - "files": [ - { - "type": "curseforge", - "file_name": "embeddium-0.3.31+mc1.20.1.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/5681/725/embeddium-0.3.31+mc1.20.1.jar", - "id": "5681725", - "parent_id": "908741", - "hashes": { - "sha1": "bb2fa8f3e493af16af9160d049f96c614a1faf2f", - "md5": "1dfb2ee49ce9ad5d484ff3eea0d628b7" - }, - "required_dependencies": [], - "size": 1320675, - "date_published": "2024-08-31T23:11:49.240Z" - }, - { - "type": "modrinth", - "file_name": "embeddium-0.3.31+mc1.20.1.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge", - "neoforge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/sk9rgfiA/versions/UTbfe5d1/embeddium-0.3.31+mc1.20.1.jar", - "id": "UTbfe5d1", - "parent_id": "sk9rgfiA", - "hashes": { - "sha512": "ffbf2da4685260a4d5c14c621708bd20722563f084f042d3dfb0a7b87f048e39299648c854a93939129da0d23a15a91ec628560d601e76074b08e275f6e132e9", - "sha1": "bb2fa8f3e493af16af9160d049f96c614a1faf2f" - }, - "required_dependencies": [], - "size": 1320675, - "date_published": "2024-08-31T23:11:49.184634Z" - } - ] - }, { "pakku_id": "mEP7yMd938gKqjfz", "pakku_links": [ @@ -11324,164 +11261,6 @@ } ] }, - { - "pakku_id": "zUgGWEg2vl35sipH", - "pakku_links": [ - "XSWzPp7PhHWY0nfU", - "yeujdIYswj77BSkb" - ], - "type": "MOD", - "side": "CLIENT", - "slug": { - "curseforge": "dynamiclights-reforged" - }, - "name": { - "curseforge": "Sodium/Embeddium Dynamic Lights" - }, - "id": { - "curseforge": "551736" - }, - "files": [ - { - "type": "curseforge", - "file_name": "sodiumdynamiclights-forge-1.0.10-1.20.1.jar", - "mc_versions": [ - "1.20.1", - "1.20" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6044/481/sodiumdynamiclights-forge-1.0.10-1.20.1.jar", - "id": "6044481", - "parent_id": "551736", - "hashes": { - "sha1": "d27524e85bed0f0af83c03be46f9ca3eb02a1be9", - "md5": "687c18cefa558ca8101ef97914d9ba6b" - }, - "required_dependencies": [ - "1103431" - ], - "size": 511601, - "date_published": "2025-01-02T01:22:43.027Z" - } - ] - }, - { - "pakku_id": "OKKOKwRG1CU9T3ym", - "pakku_links": [ - "6I5K2vwIvkFSfEuv", - "XSWzPp7PhHWY0nfU", - "gYHPAspVHiwlSSXI", - "yeujdIYswj77BSkb" - ], - "type": "MOD", - "side": "CLIENT", - "slug": { - "curseforge": "magnesium-extras" - }, - "name": { - "curseforge": "Sodium/Embeddium Extras" - }, - "id": { - "curseforge": "558905" - }, - "files": [ - { - "type": "curseforge", - "file_name": "sodiumextras-forge-1.0.7-1.20.1.jar", - "mc_versions": [ - "1.20.1", - "1.20" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6041/697/sodiumextras-forge-1.0.7-1.20.1.jar", - "id": "6041697", - "parent_id": "558905", - "hashes": { - "sha1": "7603f44bc4750774fbbdc07a3153c391650fcf3d", - "md5": "823adea3bcfd64dbdbaec46950cf4108" - }, - "required_dependencies": [ - "1103431", - "908741" - ], - "size": 438540, - "date_published": "2025-01-01T04:39:13.763Z" - } - ] - }, - { - "pakku_id": "yeujdIYswj77BSkb", - "type": "MOD", - "side": "CLIENT", - "slug": { - "curseforge": "sodium-options-api", - "modrinth": "sodium-options-api" - }, - "name": { - "curseforge": "Sodium/Embeddium Options API", - "modrinth": "Sodium Options API" - }, - "id": { - "curseforge": "1103431", - "modrinth": "Es5v4eyq" - }, - "files": [ - { - "type": "curseforge", - "file_name": "sodiumoptionsapi-forge-1.0.10-1.20.1.jar", - "mc_versions": [ - "1.20.1", - "1.20" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6100/812/sodiumoptionsapi-forge-1.0.10-1.20.1.jar", - "id": "6100812", - "parent_id": "1103431", - "hashes": { - "sha1": "7529fbf938787ed13a251cbf40936f8c29ec4b6c", - "md5": "75807590ae2648ecdeb855705868ce59" - }, - "required_dependencies": [ - "908741" - ], - "size": 443978, - "date_published": "2025-01-18T20:48:18.013Z" - }, - { - "type": "modrinth", - "file_name": "sodiumoptionsapi-forge-1.0.10-1.20.1.jar", - "mc_versions": [ - "1.20", - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/Es5v4eyq/versions/d0EFLitO/sodiumoptionsapi-forge-1.0.10-1.20.1.jar", - "id": "d0EFLitO", - "parent_id": "Es5v4eyq", - "hashes": { - "sha512": "20b11f1582df3df3d351e0cffcfc8b97453e2d73164fbad46d3f4eb960cab57d8f708d84b818782ef019d5cd9494ce001161f753623680516a191d6f510ebb79", - "sha1": "7529fbf938787ed13a251cbf40936f8c29ec4b6c" - }, - "required_dependencies": [ - "sk9rgfiA" - ], - "size": 443978, - "date_published": "2025-01-18T20:48:20.566320Z" - } - ] - }, { "pakku_id": "mUY7a1f4DIhjgXtQ", "pakku_links": [ @@ -13784,6 +13563,46 @@ } ] }, + { + "pakku_id": "V5l5vox7aWdt6HSJ", + "type": "MOD", + "side": "CLIENT", + "slug": { + "curseforge": "xenon", + "modrinth": "xenon" + }, + "name": { + "curseforge": "Xenon", + "modrinth": "Xenon" + }, + "id": { + "curseforge": "564239", + "modrinth": "BsmAXLQn" + }, + "files": [ + { + "type": "curseforge", + "file_name": "xenon-0.3.31+mc1.20.1.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/5752/40/xenon-0.3.31+mc1.20.1.jar", + "id": "5752040", + "parent_id": "564239", + "hashes": { + "sha1": "93e7c3938f88dbd24591412033572f42f90d3cb4", + "md5": "41ca035046ec01bd29a879be036a4560" + }, + "required_dependencies": [], + "size": 2093415, + "date_published": "2024-09-24T12:55:08.173Z" + } + ] + }, { "pakku_id": "dHJr8CybJVqGuwXG", "type": "MOD", From 31edc203124ad4a0a63b9cc8333dbf923699c7fa Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 24 Aug 2025 11:51:49 +0100 Subject: [PATCH 154/158] fix mars water lang key --- kubejs/assets/tfg/lang/en_us.json | 2 +- kubejs/assets/tfg/lang/uk_ua.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 7d3c5a671..8ff6b6da2 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -233,7 +233,7 @@ "block.tfg.luv_gas_pressurizer": "§dElite Gas Pressurizer II§r", "block.tfg.zpm_gas_pressurizer": "§cElite Gas Pressurizer III§r", "block.tfg.uv_gas_pressurizer": "§3Ultimate Gas Pressurizer III§r", - "block.tfg.semiheavy_ammoniacal_water": "Semiheavy Ammoniacal Water", + "block.tfg.fluid.semiheavy_ammoniacal_water": "Semiheavy Ammoniacal Water", "block.tfg.grass.mars_dirt": "Martian Dirt", "block.tfg.grass.mars_farmland": "Martian Farmland", "block.tfg.grass.amber_mycelium": "Amber Mycelium", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index 90382694b..c8f3e281c 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -233,7 +233,7 @@ "block.tfg.luv_gas_pressurizer": "§dЕлітний Газовий Пресуризатор II§r", "block.tfg.zpm_gas_pressurizer": "§dЕлітний Газовий Пресуризатор III§r", "block.tfg.uv_gas_pressurizer": "§3Абсолютний Газовий Пресуризатор III§r", - "block.tfg.semiheavy_ammoniacal_water": "Термохімічно збагачена амоніачна напівважка вода", + "block.tfg.fluid.semiheavy_ammoniacal_water": "Термохімічно збагачена амоніачна напівважка вода", "block.tfg.grass.mars_dirt": "Марсіанський ґрунт", "block.tfg.grass.mars_farmland": "Марсіанське поле", "block.tfg.grass.amber_mycelium": "Бурштиновий міцелій", From c0203267fe718a811e5656036fe771b61abf5ab9 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 24 Aug 2025 12:23:32 +0100 Subject: [PATCH 155/158] removed placeholder crimson spore particle, added cave carvers back to the desert --- kubejs/data/tfg/worldgen/biome/mars/amber_hills.json | 6 ------ kubejs/data/tfg/worldgen/biome/mars/amber_plains.json | 6 ------ .../tfg/worldgen/biome/mars/martian_deep_desert.json | 10 +++------- .../tfg/worldgen/biome/mars/martian_dune_edge.json | 10 +++------- kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json | 10 +++------- .../tfg/worldgen/biome/mars/martian_mountains.json | 6 ------ kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json | 10 +++------- kubejs/data/tfg/worldgen/biome/mars/martian_river.json | 6 ------ .../data/tfg/worldgen/biome/mars/martian_riverbed.json | 6 ------ .../data/tfg/worldgen/biome/mars/rusticus_hills.json | 6 ------ .../data/tfg/worldgen/biome/mars/rusticus_plains.json | 6 ------ kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json | 6 ------ .../data/tfg/worldgen/biome/mars/sangnum_plains.json | 6 ------ 13 files changed, 12 insertions(+), 82 deletions(-) diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index 5a20f90f8..84c8887ee 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -14,12 +14,6 @@ "sound": "minecraft:ambient.cave", "tick_delay": 6000 }, - "particle": { - "options": { - "type": "minecraft:crimson_spore" - }, - "probability": 0.014 - }, "sky_color": 15117444, "water_color": 4159204, "water_fog_color": 1069623 diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index 0befe6e5a..25cb5ed0f 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -14,12 +14,6 @@ "sound": "minecraft:ambient.cave", "tick_delay": 6000 }, - "particle": { - "options": { - "type": "minecraft:crimson_spore" - }, - "probability": 0.014 - }, "sky_color": 15117444, "water_color": 4159204, "water_fog_color": 1069623 diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json index 78a015371..5f8417922 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json @@ -1,6 +1,8 @@ { "carvers": { - "air": [] + "air": [ + "tfg:mars_cave" + ] }, "downfall": 0.0, "effects": { @@ -11,12 +13,6 @@ "sound": "minecraft:ambient.cave", "tick_delay": 6000 }, - "particle": { - "options": { - "type": "minecraft:crimson_spore" - }, - "probability": 0.014 - }, "sky_color": 15117444, "water_color": 4159204, "water_fog_color": 1069623 diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json index 64febb1de..f52a6a05e 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -1,6 +1,8 @@ { "carvers": { - "air": [] + "air": [ + "tfg:mars_cave" + ] }, "downfall": 0.0, "effects": { @@ -11,12 +13,6 @@ "sound": "minecraft:ambient.cave", "tick_delay": 6000 }, - "particle": { - "options": { - "type": "minecraft:crimson_spore" - }, - "probability": 0.014 - }, "sky_color": 15117444, "water_color": 4159204, "water_fog_color": 1069623 diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json index 85d45d325..a9e2f7605 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json @@ -1,6 +1,8 @@ { "carvers": { - "air": [] + "air": [ + "tfg:mars_cave" + ] }, "downfall": 0.0, "effects": { @@ -11,12 +13,6 @@ "sound": "minecraft:ambient.cave", "tick_delay": 6000 }, - "particle": { - "options": { - "type": "minecraft:crimson_spore" - }, - "probability": 0.014 - }, "sky_color": 15117444, "water_color": 4159204, "water_fog_color": 1069623 diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index f0b9acd73..434e22a43 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -14,12 +14,6 @@ "sound": "minecraft:ambient.cave", "tick_delay": 6000 }, - "particle": { - "options": { - "type": "minecraft:crimson_spore" - }, - "probability": 0.014 - }, "sky_color": 15117444, "water_color": 4159204, "water_fog_color": 1069623 diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json b/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json index 2bf7a2eba..4b4c5a4ef 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json @@ -1,6 +1,8 @@ { "carvers": { - "air": [] + "air": [ + "tfg:mars_cave" + ] }, "downfall": 0.0, "effects": { @@ -11,12 +13,6 @@ "sound": "minecraft:ambient.cave", "tick_delay": 6000 }, - "particle": { - "options": { - "type": "minecraft:crimson_spore" - }, - "probability": 0.014 - }, "sky_color": 15117444, "water_color": 4159204, "water_fog_color": 1069623 diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json index 321febf6c..304c71094 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json @@ -14,12 +14,6 @@ "sound": "minecraft:ambient.cave", "tick_delay": 6000 }, - "particle": { - "options": { - "type": "minecraft:crimson_spore" - }, - "probability": 0.014 - }, "sky_color": 15117444, "water_color": 4159204, "water_fog_color": 1069623 diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json index e092c165d..f7eb9f539 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json @@ -14,12 +14,6 @@ "sound": "minecraft:ambient.cave", "tick_delay": 6000 }, - "particle": { - "options": { - "type": "minecraft:crimson_spore" - }, - "probability": 0.014 - }, "sky_color": 15117444, "water_color": 4159204, "water_fog_color": 1069623 diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index b53811376..3745a481c 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -14,12 +14,6 @@ "sound": "minecraft:ambient.cave", "tick_delay": 6000 }, - "particle": { - "options": { - "type": "minecraft:crimson_spore" - }, - "probability": 0.014 - }, "sky_color": 15117444, "water_color": 4159204, "water_fog_color": 1069623 diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index 254df3963..2fac9938b 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -14,12 +14,6 @@ "sound": "minecraft:ambient.cave", "tick_delay": 6000 }, - "particle": { - "options": { - "type": "minecraft:crimson_spore" - }, - "probability": 0.014 - }, "sky_color": 15117444, "water_color": 4159204, "water_fog_color": 1069623 diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index 618c11c0e..30bbb9f21 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -14,12 +14,6 @@ "sound": "minecraft:ambient.cave", "tick_delay": 6000 }, - "particle": { - "options": { - "type": "minecraft:crimson_spore" - }, - "probability": 0.014 - }, "sky_color": 15117444, "water_color": 4159204, "water_fog_color": 1069623 diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index c826e3d0d..d1602f32f 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -14,12 +14,6 @@ "sound": "minecraft:ambient.cave", "tick_delay": 6000 }, - "particle": { - "options": { - "type": "minecraft:crimson_spore" - }, - "probability": 0.014 - }, "sky_color": 15117444, "water_color": 4159204, "water_fog_color": 1069623 From 6b7e79bceca62de97e0f8fc156df5495a3093610 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 24 Aug 2025 12:26:36 +0100 Subject: [PATCH 156/158] update pakku --- pakku.json | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pakku.json b/pakku.json index 249b29c7f..a02bb96fa 100644 --- a/pakku.json +++ b/pakku.json @@ -155,9 +155,12 @@ "embeddium": { "side": "CLIENT" }, - "flickerfix": { + "first-person-model": { "side": "CLIENT" }, + "ftb-backups-2": { + "side": "BOTH" + }, "no-report-button": { "side": "CLIENT" }, @@ -206,6 +209,9 @@ "fast-ip-ping": { "side": "CLIENT" }, + "badoptimizations": { + "side": "CLIENT" + }, "entityculling": { "side": "CLIENT" }, @@ -240,6 +246,9 @@ "side": "BOTH" }, "particular-reforged": { + "side": "CLIENT" + }, + "pick-up-notifier": { "side": "BOTH" }, "inventory-tweaks-refoxed": { @@ -251,11 +260,8 @@ "detected-setblock-be-gone": { "side": "BOTH" }, - "ad-astra-auto-lander": { - "side": "CLIENT" - }, "probejs": { "export": false } } -} +} \ No newline at end of file From 9255cd7814984281d3d539ddcaa6527259a33781 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 24 Aug 2025 12:33:19 +0100 Subject: [PATCH 157/158] 0.10.10 time --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f4c4e0cf..ef2214157 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog ## [Unreleased] +### Changes +### Bug fixes + +## [0.10.10] - 23-08-2025 ### Major changes - Complete rework of prospector's picks. (#1594) @Redeix - Removed the mod that was causing placed entities to sometimes not spawn From 3a10aa274282fadbe0608121fd3cd43f210a445c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 24 Aug 2025 12:35:12 +0100 Subject: [PATCH 158/158] pakku --- pakku.json | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pakku.json b/pakku.json index a02bb96fa..4225bd1c4 100644 --- a/pakku.json +++ b/pakku.json @@ -8,7 +8,7 @@ "config", "defaultconfigs", "kubejs", - "tacz", + "tacz", "!kubejs/probe/**" ], "server_overrides": [ @@ -215,9 +215,6 @@ "entityculling": { "side": "CLIENT" }, - "pick-up-notifier": { - "side": "CLIENT" - }, "resourceful-config": { "side": "BOTH" }, @@ -242,11 +239,8 @@ "xaeros-minimap": { "side": "BOTH" }, - "xaeros-world-map": { - "side": "BOTH" - }, "particular-reforged": { - "side": "CLIENT" + "side": "BOTH" }, "pick-up-notifier": { "side": "BOTH"