Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev
Pyritie
|
|
@ -366,6 +366,9 @@
|
|||
"item.tfg.food.cooked_crawlermari": "Cooked Crawlermari",
|
||||
"item.tfg.food.raw_limpet": "Raw Limpet",
|
||||
"item.tfg.food.cooked_limpet": "Cooked Limpet",
|
||||
"item.tfg.food.raw_moon_rabbit": "Raw Moon Rabbit",
|
||||
"item.tfg.food.cooked_moon_rabbit": "Cooked Moon Rabbit",
|
||||
"item.tfg.spawn_egg.moon_rabbit": "Moon Rabbit Spawn Egg",
|
||||
"item.tfg.food.freeze_dried.red_grapes": "Freeze Dried Red Grapes",
|
||||
"item.tfg.food.freeze_dried.white_grapes": "Freeze Dried White Grapes",
|
||||
"item.tfg.food.freeze_dried.glow_berries": "Freeze Dried Glow Berries",
|
||||
|
|
@ -1693,7 +1696,7 @@
|
|||
"quests.space_survival.food.task": "Any space food",
|
||||
"quests.space_survival.satellite.title": "Space Stations",
|
||||
"quests.space_survival.satellite.subtitle": "For when you really want to get away from it all",
|
||||
"quests.space_survival.satellite.desc": "By putting the above items into a Rocket's inventory, you'll be able to build a &9Space Station&r in orbit once you launch! There's not really much to do up there, and they're totally optional, but if you want a void dimension with no gravity for whatever reason, or just &oreally&r like sky diving, they're an option.",
|
||||
"quests.space_survival.satellite.desc": "By keeping the above items in your inventory, you'll be able to build a &9Space Station&r in orbit once you launch! There's not really much to do up there, and they're totally optional, but if you want a void dimension with no gravity for whatever reason, or just &oreally&r like sky diving, they're an option.",
|
||||
"quests.space_survival.flag.title": "Flag Planter",
|
||||
"quests.space_survival.flag.subtitle": "LunaFirmaCraft",
|
||||
"quests.space_survival.flag.desc": "Introduce yourself to the Moon by planting a flag with whatever image you like on it!",
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
{"parent":"minecraft:block/cube_bottom_top","textures":{"bottom":"gtceu:block/casings/steam/steel/bottom","side":"gtceu:block/casings/steam/steel/side","top":"tfg:block/casings/machine_casing_blue_solar_panel"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/machine_casing_clean_stainless_steel_desh"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/machine_casing_desh_ptfe"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"parent":"minecraft:block/cube_bottom_top","textures":{"bottom":"gtceu:block/casings/steam/steel/bottom","side":"gtceu:block/casings/steam/steel/side","top":"tfg:block/casings/machine_casing_green_solar_panel"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/machine_casing_iron_desh"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/machine_casing_ptfe_desh"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"parent":"minecraft:block/cube_bottom_top","textures":{"bottom":"gtceu:block/casings/steam/steel/bottom","side":"gtceu:block/casings/steam/steel/side","top":"tfg:block/casings/machine_casing_red_solar_panel"}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/machine_casing_stainless_steel_desh"}}
|
||||
6
kubejs/assets/tfg/models/item/spawn_egg/moon_rabbit.json
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "minecraft:item/generated",
|
||||
"textures": {
|
||||
"layer0": "tfg:item/spawn_egg/moon_rabbit"
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 454 B |
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"ldlib": {
|
||||
"connection": "tfg:block/casings/machine_casing_blue_solar_panel_ctm"
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 833 B |
|
After Width: | Height: | Size: 429 B |
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"ldlib": {
|
||||
"connection": "tfg:block/casings/machine_casing_clean_stainless_steel_desh_ctm"
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 762 B |
|
After Width: | Height: | Size: 579 B |
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"ldlib": {
|
||||
"connection": "tfg:block/casings/machine_casing_desh_ptfe_ctm"
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 957 B |
|
After Width: | Height: | Size: 439 B |
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"ldlib": {
|
||||
"connection": "tfg:block/casings/machine_casing_green_solar_panel_ctm"
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 782 B |
|
After Width: | Height: | Size: 673 B |
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"ldlib": {
|
||||
"connection": "tfg:block/casings/machine_casing_iron_desh_ctm"
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 610 B |
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"ldlib": {
|
||||
"connection": "tfg:block/casings/machine_casing_ptfe_desh_ctm"
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 419 B |
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"ldlib": {
|
||||
"connection": "tfg:block/casings/machine_casing_red_solar_panel_ctm"
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 775 B |
|
After Width: | Height: | Size: 395 B |
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"ldlib": {
|
||||
"connection": "tfg:block/casings/machine_casing_stainless_steel_desh_ctm"
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 761 B |
BIN
kubejs/assets/tfg/textures/item/food/cooked_moon_rabbit.png
Normal file
|
After Width: | Height: | Size: 571 B |
BIN
kubejs/assets/tfg/textures/item/food/raw_moon_rabbit.png
Normal file
|
After Width: | Height: | Size: 600 B |
BIN
kubejs/assets/tfg/textures/item/spawn_egg/moon_rabbit.png
Normal file
|
After Width: | Height: | Size: 466 B |
|
|
@ -15,6 +15,20 @@ const registerTFGBlocks = (event) => {
|
|||
item.modelJson({ parent: 'minecraft:block/end_portal_frame' })
|
||||
})
|
||||
|
||||
// #region Machine Casings
|
||||
|
||||
global.TFG_MACHINE_CASINGS.forEach(type => {
|
||||
event.create(`tfg:block/casings/${type}`)
|
||||
.model(`tfg:block/casings/${type}`)
|
||||
.soundType('copper')
|
||||
.hardness(5)
|
||||
.resistance(6)
|
||||
.tagBlock('minecraft:mineable/pickaxe')
|
||||
.mapColor('color_light_gray')
|
||||
})
|
||||
|
||||
//#endregion
|
||||
|
||||
// #region Decorative vases
|
||||
global.MINECRAFT_DYE_NAMES.forEach(color => {
|
||||
event.create(`tfg:decorative_vase/generated/${color}`, 'cardinal')
|
||||
|
|
|
|||
|
|
@ -68,6 +68,17 @@ global.MARS_BIOMES = [
|
|||
'tfg:mars/martian_mountains'
|
||||
]
|
||||
|
||||
global.TFG_MACHINE_CASINGS = [
|
||||
'machine_casing_clean_stainless_steel_desh',
|
||||
'machine_casing_desh_ptfe',
|
||||
'machine_casing_iron_desh',
|
||||
'machine_casing_ptfe_desh',
|
||||
'machine_casing_stainless_steel_desh',
|
||||
'machine_casing_blue_solar_panel',
|
||||
'machine_casing_green_solar_panel',
|
||||
'machine_casing_red_solar_panel'
|
||||
];
|
||||
|
||||
global.UNIVERSAL_CIRCUIT_TIERS = ["ulv", "lv", "mv", "hv", "ev", "iv", "luv", "zpm", "uv", "uhv"];
|
||||
|
||||
global.FOOD_FRUIT = [
|
||||
|
|
|
|||