Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed oilsands, added missing english strings, added indicators for all ores #637

Merged
merged 6 commits into from
Dec 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 42 additions & 2 deletions kubejs/assets/gtceu/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,45 @@
"gtceu.alternator": "Alternator",

"material.treated_wood": "Creosote-Treated Wood",
"block.gtceu.treated_wood_planks": "Creosote-Treated Wood Planks"
}
"block.gtceu.treated_wood_planks": "Creosote-Treated Wood Planks",

"block.gtceu.lv_kinetic_mixer": "Basic Kinetic Mixer",
"block.gtceu.mv_kinetic_mixer": "Advanced Kinetic Mixer",
"block.gtceu.hv_kinetic_mixer": "Advanced Kinetic Mixer II",
"block.gtceu.ev_kinetic_mixer": "Advanced Kinetic Mixer III",

"block.gtceu.lv_electric_gear_box_2a": "Low Voltage 2x Gear Box",
"block.gtceu.mv_electric_gear_box_2a": "Medium Voltage 2x Gear Box",
"block.gtceu.hv_electric_gear_box_2a": "High Voltage 2x Gear Box",
"block.gtceu.ev_electric_gear_box_2a": "Extreme Voltage 2x Gear Box",
"block.gtceu.lv_electric_gear_box_8a": "Low Voltage 8x Gear Box",
"block.gtceu.mv_electric_gear_box_8a": "Medium Voltage 8x Gear Box",
"block.gtceu.hv_electric_gear_box_8a": "High Voltage 8x Gear Box",
"block.gtceu.ev_electric_gear_box_8a": "Extreme Voltage 8x Gear Box",
"block.gtceu.lv_electric_gear_box_16a": "Low Voltage 16x Gear Box",
"block.gtceu.mv_electric_gear_box_16a": "Medium Voltage 16x Gear Box",
"block.gtceu.hv_electric_gear_box_16a": "High Voltage 16x Gear Box",
"block.gtceu.ev_electric_gear_box_16a": "Extreme Voltage 16x Gear Box",
"block.gtceu.lv_electric_gear_box_32a": "Low Voltage 32x Gear Box",
"block.gtceu.mv_electric_gear_box_32a": "Medium Voltage 32x Gear Box",
"block.gtceu.hv_electric_gear_box_32a": "High Voltage 32x Gear Box",
"block.gtceu.ev_electric_gear_box_32a": "Extreme Voltage 32x Gear Box",

"block.gtceu.lv_kinetic_input_box": "Low Voltage Kinetic Input Box",
"block.gtceu.mv_kinetic_input_box": "Medium Voltage Kinetic Input Box",
"block.gtceu.hv_kinetic_input_box": "High Voltage Kinetic Input Box",
"block.gtceu.ev_kinetic_input_box": "Extreme Voltage Kinetic Input Box",
"block.gtceu.iv_kinetic_input_box": "Insane Voltage Kinetic Input Box",
"block.gtceu.luv_kinetic_input_box": "Ludicrous Voltage Kinetic Input Box",
"block.gtceu.zpm_kinetic_input_box": "ZPM Voltage Kinetic Input Box",
"block.gtceu.uv_kinetic_input_box": "Ultimate Voltage Kinetic Input Box",

"block.gtceu.lv_kinetic_output_box": "Low Voltage Kinetic Output Box",
"block.gtceu.mv_kinetic_output_box": "Medium Voltage Kinetic Output Box",
"block.gtceu.hv_kinetic_output_box": "High Voltage Kinetic Output Box",
"block.gtceu.ev_kinetic_output_box": "Extreme Voltage Kinetic Output Box",
"block.gtceu.iv_kinetic_output_box": "Insane Voltage Kinetic Output Box",
"block.gtceu.luv_kinetic_output_box": "Ludicrous Voltage Kinetic Output Box",
"block.gtceu.zpm_kinetic_output_box": "ZPM Voltage Kinetic Output Box",
"block.gtceu.uv_kinetic_output_box": "Ultimate Voltage Kinetic Output Box"
}
4 changes: 4 additions & 0 deletions kubejs/assets/tfg/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
"material.tfg.latex": "Latex",
"material.tfg.fluix": "Fluix",
"item.tfg.spade_head_extruder_mold": "Extruder Mold (Spade Head)",

"quests.naming-1": "t - Title",
"quests.naming-2": "st - Subtitle",
"quests.naming-3": "d* - Description, where * description number, for example: d1, d2, d3, d4...",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,26 @@
}
]
}
]
],
"indicator": {
"rarity": 20,
"depth": 35,
"underground_rarity": 80,
"underground_count": 1000,
"blocks": [
{
"block": "minecraft:small_amethyst_bud",
"weight": 50
},
{
"block": "minecraft:medium_amethyst_bud",
"weight": 30
},
{
"block": "minecraft:large_amethyst_bud",
"weight": 20
}
]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,26 @@
}
]
}
]
],
"indicator": {
"rarity": 20,
"depth": 35,
"underground_rarity": 80,
"underground_count": 1000,
"blocks": [
{
"block": "minecraft:small_amethyst_bud",
"weight": 50
},
{
"block": "minecraft:medium_amethyst_bud",
"weight": 30
},
{
"block": "minecraft:large_amethyst_bud",
"weight": 20
}
]
}
}
}
22 changes: 21 additions & 1 deletion kubejs/data/tfg/worldgen/configured_feature/vein/deep_gold.json
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,26 @@
}
]
}
]
],
"indicator": {
"rarity": 12,
"depth": 35,
"underground_rarity": 40,
"underground_count": 1000,
"blocks": [
{
"block": "tfc:ore/small_limonite",
"weight": 25
},
{
"block": "tfc:ore/small_hematite",
"weight": 25
},
{
"block": "tfc:ore/small_native_gold",
"weight": 50
}
]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,26 @@
}
]
}
]
],
"indicator": {
"rarity": 12,
"depth": 35,
"underground_rarity": 40,
"underground_count": 1000,
"blocks": [
{
"block": "tfc:ore/small_hematite",
"weight": 40
},
{
"block": "tfc:ore/small_limonite",
"weight": 40
},
{
"block": "tfc:ore/small_native_gold",
"weight": 20
}
]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,26 @@
}
]
}
]
],
"indicator": {
"rarity": 12,
"depth": 35,
"underground_rarity": 40,
"underground_count": 1000,
"blocks": [
{
"block": "tfc:ore/small_hematite",
"weight": 30
},
{
"block": "tfc:ore/small_limonite",
"weight": 30
},
{
"block": "tfc:ore/small_malachite",
"weight": 40
}
]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,30 @@
}
]
}
]
],
"indicator": {
"rarity": 12,
"depth": 35,
"underground_rarity": 40,
"underground_count": 1000,
"blocks": [
{
"block": "tfc:ore/small_magnetite",
"weight": 20
},
{
"block": "tfc:ore/small_native_gold",
"weight": 10
},
{
"block": "gtceu:chromite_indicator",
"weight": 60
},
{
"block": "gtceu:sapphire_indicator",
"weight": 10
}
]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,30 @@
}
]
}
]
],
"indicator": {
"rarity": 12,
"depth": 35,
"underground_rarity": 40,
"underground_count": 500,
"blocks": [
{
"block": "gtceu:wulfenite_indicator",
"weight": 40
},
{
"block": "gtceu:molybdenite_indicator",
"weight": 30
},
{
"block": "gtceu:molybdenum_indicator",
"weight": 15
},
{
"block": "gtceu:powellite_indicator",
"weight": 15
}
]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"type": "tfc:cluster_vein",
"config": {
"rarity": 310,
"density": 0.25,
"density": 0.30,
"min_y": -64,
"max_y": -20,
"size": 22,
"size": 32,
"random_name": "deep_naquadah",
"blocks": [
{
Expand Down Expand Up @@ -98,6 +98,22 @@
}
]
}
]
],
"indicator": {
"rarity": 12,
"depth": 35,
"underground_rarity": 40,
"underground_count": 500,
"blocks": [
{
"block": "gtceu:naquadah_indicator",
"weight": 75
},
{
"block": "gtceu:plutonium_indicator",
"weight": 25
}
]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,22 @@
}
]
}
]
],
"indicator": {
"rarity": 12,
"depth": 35,
"underground_rarity": 40,
"underground_count": 500,
"blocks": [
{
"block": "gtceu:pitchblende_indicator",
"weight": 50
},
{
"block": "gtceu:uraninite_indicator",
"weight": 50
}
]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,30 @@
}
]
}
]
],
"indicator": {
"rarity": 12,
"depth": 35,
"underground_rarity": 40,
"underground_count": 500,
"blocks": [
{
"block": "gtceu:almandine_indicator",
"weight": 35
},
{
"block": "gtceu:pyrope_indicator",
"weight": 25
},
{
"block": "gtceu:sapphire_indicator",
"weight": 15
},
{
"block": "gtceu:green_sapphire_indicator",
"weight": 15
}
]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,26 @@
}
]
}
]
],
"indicator": {
"rarity": 12,
"depth": 35,
"underground_rarity": 40,
"underground_count": 500,
"blocks": [
{
"block": "gtceu:scheelite_indicator",
"weight": 45
},
{
"block": "gtceu:tungstate_indicator",
"weight": 35
},
{
"block": "gtceu:lithium_indicator",
"weight": 20
}
]
}
}
}
Loading
Loading