Skip to content

Commit b70da92

Browse files
ZippityZippity
committed
Merge branch 'dev' into toolfixes
2 parents a198775 + 246b1ad commit b70da92

File tree

180 files changed

+6234
-3122
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+6234
-3122
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,17 @@
77
- Vanilla moss blocks/carpet are now compostable @Pyritie
88
- Added missing mixer recipes for turning medium compost greens/browns into compost @Pyritie
99
- Adjusted recipe times of the VI machines @Pyritie
10-
- Added universal compost items, for more efficient storage of compostables @Vazde
10+
- Added universal compost items, for more efficient storage of compostables @Vazde @Redeix
1111
- Added recipe for backpack feeding upgrade (#1462) @Pyritie
1212
- Greate shaft recipes are now shapeless (#1453) @Pyritie
1313
- Added crafting table recipes for matches and the matchbox (#1449) @Pyritie
1414
- Made "Etched" more accessible (#1473) @Nebby1999
1515
- Added faster recipes for crafting dough @Pyritie
1616
- Black bronze now has a fluid pipe instead of an item pipe, so the drum has proper containment info @Pyritie
1717
- Added recipes to create basic TFC alcohol in the food processor @Pyritie
18+
- Added melting recipes for all the TFC metal dusts @Pyritie
19+
- Added mortar and pestle recipes for soybean and olive paste (#1480) @Pyritie
20+
- Added concrete to the list of valid blocks for GT facades (#1487) @TheAshenWolf
1821
### Bug fixes
1922
- Fixed not being able to craft fine wire in a coiling machine for materials that didn't also have normal wire @Pyritie
2023
- Fixed cobalt brass and potin double plates not being obtainable until MV @Pyritie
@@ -24,6 +27,7 @@
2427
- Possibly fixed the issue with airplanes and akistor carts not appearing when placing them (#1447) @Pyritie
2528
- Fixed not being able to make sea water with TFC salt in a barrel (#1476) @Pyritie
2629
- Fixed the electric greenhouse fruit tree recipes making more saplings instead of fruit (#1445) @Pyritie
30+
- Fixed missing firmalife jam food processor recipes (#1478) @Pyritie
2731
### Translations
2832
- Ukranian @Furryks
2933

‎config/ftbquests/quests/chapters/create_logistics.snbt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@
111111
"{quests.create_logistics.nbt_handling.desc.1}"
112112
"{@pagebreak}"
113113
"{quests.create_logistics.nbt_handling.desc.2}"
114-
"{@pagebreak}"
115-
"{quests.create_logistics.nbt_handling.desc.3}"
116114
]
117115
icon: "gtceu:brass_huge_item_pipe"
118116
id: "7E97A95EA986C476"

‎config/xaeroworldmap.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ onlyCurrentMapWaypoints:false
3232
minZoomForLocalWaypoints:0.0
3333
arrowColour:-2
3434
minimapRadar:true
35-
renderWaypoints:true
35+
renderWaypoints:false
3636
partialYTeleportation:true
3737
displayStainedGlass:true
3838
caveModeDepth:30
3939
caveModeStart:2147483647
4040
autoCaveMode:-1
41-
legibleCaveMaps:false
41+
legibleCaveMaps:true
4242
displayCaveModeStart:true
4343
caveModeToggleTimer:1000
4444
defaultCaveModeType:1

‎kubejs/assets/ad_astra/lang/en_us.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@
120120
"item.ad_astra.tier_1_rover": "Rover",
121121
"item.ad_astra.photovoltaic_etrium_cell": "Basic Photovoltaic Cell",
122122
"item.ad_astra.photovoltaic_vesnium_cell": "Energium Photovoltaic Cell",
123-
"item.ad_astra.cheese": "Moon Cheese",
124123
"item.ad_astra.ostrum_tank": "Ostrum Booster Tank",
125124
"item.ad_astra.steel_engine": "Steel Rocket Engine",
126125
"item.ad_astra.desh_engine": "Desh Rocket Engine",
@@ -129,6 +128,7 @@
129128
"item.ad_astra.netherite_space_suit": "§bTungstensteel Space Suit",
130129
"item.ad_astra.netherite_space_pants": "§bTungstensteel Space Pants",
131130
"item.ad_astra.netherite_space_boots": "§bTungstensteel Space Boots",
131+
"item.ad_astra.cheese": "Moon Cheese",
132132
"tagprefix.moon_stone": "Anorthosite %s Ore",
133133
"tagprefix.moon_deepslate": "Norite %s Ore",
134134
"tagprefix.mars_stone": "Argillite %s Ore",

‎kubejs/assets/ad_astra/lang/uk_ua.json‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,21 +106,23 @@
106106
"block.ad_astra.polished_glacio_stone_slab": "Оброблена фонолітова плита",
107107
"block.ad_astra.polished_glacio_stone_stairs": "Оброблені Фонолітові сходи",
108108
"entity.ad_astra.corrupted_lunarian": "Місячний Зомбі",
109-
"entity.ad_astra.tier_1_rocket": "Р-алюміносталева ракета",
109+
"entity.ad_astra.tier_1_rocket": "R-Алюміносталева Ракета",
110+
"entity.ad_astra.tier_2_rocket": "Титанова ракета ASM 4914",
110111
"entity.ad_astra.tier_1_rover": "Ровер",
111112
"fluid_type.ad_astra.oxygen": "Придатне Повітря",
112-
"item.ad_astra.steel_cable": "Базовий RF-кабель",
113-
"item.ad_astra.desh_cable": "Покращений RF-кабель",
114-
"item.ad_astra.tier_1_rocket": "Р-алюміносталева ракета",
115-
"item.ad_astra.oxygen_bucket": "Відро з вдиханим повітрям",
113+
"item.ad_astra.steel_cable": "Базовий RF Кабель",
114+
"item.ad_astra.desh_cable": "Покращений RF Кабель",
115+
"item.ad_astra.tier_1_rocket": "R-Алюміносталева Ракета",
116+
"item.ad_astra.tier_2_rocket": "Титанова ракета ASM 4914",
117+
"item.ad_astra.oxygen_bucket": "Відро з Дихальним Повітрям",
116118
"item.ad_astra.tier_1_rover": "Ровер",
117-
"item.ad_astra.photovoltaic_etrium_cell": "Базова фотоелектрична капсула",
118-
"item.ad_astra.photovoltaic_vesnium_cell": "Вдосконалена фотоелектрична капсула",
119+
"item.ad_astra.photovoltaic_etrium_cell": "Базова Фотоелектрична Капсула",
120+
"item.ad_astra.photovoltaic_vesnium_cell": "Капсула Фотоелементу Енергіюму",
119121
"item.ad_astra.cheese": "Місячний сир",
120122
"tagprefix.moon_stone": "Анорто́зитова %s Руда",
121123
"tagprefix.moon_deepslate": "Норитова %s Руда",
122124
"tagprefix.mars_stone": "Аргілітова %s Руда",
123-
"tagprefix.venus_stone": "ТрахітовАа %s Руда",
125+
"tagprefix.venus_stone": "Трахітова %s Руда",
124126
"tagprefix.mercury_stone": "Коматієва %s Руда",
125127
"tagprefix.glacio_stone": "Фонолітова %s Руда"
126128
}

‎kubejs/assets/ae2/lang/uk_ua.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
3-
"gui.ae2.inWorldCraftingPresses": "Прес-форми для крафту здобуваються шляхом руйнування Таємничого куба. Таємничі куби розташовані в центрі метеоритів, які можна знайти на Місяці.",
3+
"gui.ae2.inWorldCraftingPresses": "Пресформи для крафту здобуваються шляхом руйнування Таємничого куба. Таємничі куби розташовані в центрі метеоритів, які можна знайти на Місяці.",
44
"gui.advanced_ae.AdvPatternProvider": "",
55
"gui.expandedae.exp_pattern_provider": ""
66
}

‎kubejs/assets/beneath/lang/uk_ua.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
"block.beneath.ore.blackstone_sylvite": "Руда Сильвіну",
1010
"block.beneath.crackrack": "Кератофір",
1111
"block.beneath.soul_clay": "Брудна Глина",
12+
"block.beneath.wood.fallen_leaves.crimson": "Занепала червона ламела",
13+
"block.beneath.wood.fallen_leaves.warped": "Занепала викривлена ламела",
1214
"item.beneath.cursed_hide": "Лавостійка Шкіра",
1315
"item.beneath.blackstone_brick": "Цегла з Піроксеніту",
1416
"item.beneath.cursecoal": "Антрацит",

‎kubejs/assets/betterend/blockstates/amber_root.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
2-
"variants": {
3-
"age=0": [
2+
"variants": {
3+
"age=0": [
44
{ "model": "betterend:block/amber_root_0" },
55
{ "model": "betterend:block/amber_root_1" }
66
],
7-
"age=1": [
7+
"age=1": [
88
{ "model": "betterend:block/amber_root_2" },
99
{ "model": "betterend:block/amber_root_3" }
1010
],
11-
"age=2": [
11+
"age=2": [
1212
{ "model": "betterend:block/amber_root_4" },
1313
{ "model": "betterend:block/amber_root_5" }
1414
],
15-
"age=3": [
15+
"age=3": [
1616
{ "model": "betterend:block/amber_root_6" },
1717
{ "model": "betterend:block/amber_root_7" }
1818
]
19-
}
19+
}
2020
}

‎kubejs/assets/betterend/blockstates/amber_root_wild.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"variants": {
3+
"": [
4+
{ "model": "betterend:block/amber_root_6" },
5+
{ "model": "betterend:block/amber_root_7" }
6+
]
7+
}
8+
}

‎kubejs/assets/betterend/blockstates/blossom_berry.json‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,28 @@
11
{
2-
"variants": {
3-
"age=0": { "model": "betterend:block/blossom_berry_seed_0" },
4-
"age=1": { "model": "betterend:block/blossom_berry_seed_1" },
5-
"age=2": { "model": "betterend:block/blossom_berry_seed_2" },
6-
"age=3": { "model": "betterend:block/blossom_berry" }
7-
}
2+
"variants": {
3+
"age=0": [
4+
{ "model": "betterend:block/blossom_berry_seed_0", "y": 0 },
5+
{ "model": "betterend:block/blossom_berry_seed_0", "y": 90 },
6+
{ "model": "betterend:block/blossom_berry_seed_0", "y": 180 },
7+
{ "model": "betterend:block/blossom_berry_seed_0", "y": 270 }
8+
],
9+
"age=1": [
10+
{ "model": "betterend:block/blossom_berry_seed_1", "y": 0 },
11+
{ "model": "betterend:block/blossom_berry_seed_1", "y": 90 },
12+
{ "model": "betterend:block/blossom_berry_seed_1", "y": 180 },
13+
{ "model": "betterend:block/blossom_berry_seed_1", "y": 270 }
14+
],
15+
"age=2": [
16+
{ "model": "betterend:block/blossom_berry_seed_2", "y": 0 },
17+
{ "model": "betterend:block/blossom_berry_seed_2", "y": 90 },
18+
{ "model": "betterend:block/blossom_berry_seed_2", "y": 180 },
19+
{ "model": "betterend:block/blossom_berry_seed_2", "y": 270 }
20+
],
21+
"age=3": [
22+
{ "model": "betterend:block/blossom_berry", "y": 0 },
23+
{ "model": "betterend:block/blossom_berry", "y": 90 },
24+
{ "model": "betterend:block/blossom_berry", "y": 180 },
25+
{ "model": "betterend:block/blossom_berry", "y": 270 }
26+
]
27+
}
828
}

0 commit comments

Comments
 (0)