From 27869d62919d917880613df81361f5d84aa5d3f8 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Fri, 18 Dec 2020 18:37:15 +0100 Subject: [PATCH] Port recent changes --- .../create/blockstates/radial_chassis.json | 24 +++++++++---------- .../resources/assets/create/lang/en_ud.json | 2 +- .../resources/assets/create/lang/en_us.json | 2 +- .../assets/create/lang/unfinished/de_de.json | 4 ++-- .../assets/create/lang/unfinished/fr_fr.json | 4 ++-- .../assets/create/lang/unfinished/it_it.json | 4 ++-- .../assets/create/lang/unfinished/ja_jp.json | 4 ++-- .../assets/create/lang/unfinished/ko_kr.json | 4 ++-- .../assets/create/lang/unfinished/nl_nl.json | 4 ++-- .../assets/create/lang/unfinished/pt_br.json | 4 ++-- .../assets/create/lang/unfinished/ru_ru.json | 4 ++-- .../assets/create/lang/unfinished/zh_cn.json | 4 ++-- .../create/models/item/bar_of_chocolate.json | 2 +- .../create/models/item/builders_tea.json | 2 +- 14 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/generated/resources/assets/create/blockstates/radial_chassis.json b/src/generated/resources/assets/create/blockstates/radial_chassis.json index 410cb13c7..49576633e 100644 --- a/src/generated/resources/assets/create/blockstates/radial_chassis.json +++ b/src/generated/resources/assets/create/blockstates/radial_chassis.json @@ -207,8 +207,8 @@ }, { "when": { - "axis": "x", - "sticky_east": "true" + "sticky_east": "true", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -217,8 +217,8 @@ }, { "when": { - "axis": "y", - "sticky_east": "true" + "sticky_east": "true", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky", @@ -227,8 +227,8 @@ }, { "when": { - "axis": "z", - "sticky_east": "true" + "sticky_east": "true", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_z_sticky" @@ -236,8 +236,8 @@ }, { "when": { - "axis": "x", - "sticky_east": "false" + "sticky_east": "false", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -246,8 +246,8 @@ }, { "when": { - "axis": "y", - "sticky_east": "false" + "sticky_east": "false", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y", @@ -256,8 +256,8 @@ }, { "when": { - "axis": "z", - "sticky_east": "false" + "sticky_east": "false", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_z" diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index 9ffdfb0c5..8b753f455 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -413,7 +413,7 @@ "fluid.create.tea": "\u0250\u01DD\u27D8 s,\u0279\u01DDp\u05DF\u0131n\u15FA", "item.create.andesite_alloy": "\u028Eo\u05DF\u05DF\u2C6F \u01DD\u0287\u0131s\u01DDpu\u2C6F", "item.create.attribute_filter": "\u0279\u01DD\u0287\u05DF\u0131\u2132 \u01DD\u0287nq\u0131\u0279\u0287\u0287\u2C6F", - "item.create.bar_of_chocolate": "\u01DD\u0287\u0250\u05DFo\u0254o\u0265\u0186 \u025FO \u0279\u0250\u15FA", + "item.create.bar_of_chocolate": "\u01DD\u0287\u0250\u05DFo\u0254o\u0265\u0186 \u025Fo \u0279\u0250\u15FA", "item.create.belt_connector": "\u0287\u05DF\u01DD\u15FA \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW", "item.create.blaze_cake": "\u01DD\u029E\u0250\u0186 \u01DDz\u0250\u05DF\u15FA", "item.create.blaze_cake_base": "\u01DDs\u0250\u15FA \u01DD\u029E\u0250\u0186 \u01DDz\u0250\u05DF\u15FA", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 699a4404b..d7a374810 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -419,7 +419,7 @@ "item.create.andesite_alloy": "Andesite Alloy", "item.create.attribute_filter": "Attribute Filter", - "item.create.bar_of_chocolate": "Bar Of Chocolate", + "item.create.bar_of_chocolate": "Bar of Chocolate", "item.create.belt_connector": "Mechanical Belt", "item.create.blaze_cake": "Blaze Cake", "item.create.blaze_cake_base": "Blaze Cake Base", diff --git a/src/generated/resources/assets/create/lang/unfinished/de_de.json b/src/generated/resources/assets/create/lang/unfinished/de_de.json index 30c2e438d..3a2fb936d 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1211", + "_": "Missing Localizations: 1215", "_": "->------------------------] Game Elements [------------------------<-", @@ -420,7 +420,7 @@ "item.create.andesite_alloy": "UNLOCALIZED: Andesite Alloy", "item.create.attribute_filter": "UNLOCALIZED: Attribute Filter", - "item.create.bar_of_chocolate": "UNLOCALIZED: Bar Of Chocolate", + "item.create.bar_of_chocolate": "UNLOCALIZED: Bar of Chocolate", "item.create.belt_connector": "Mechanischer Riemen", "item.create.blaze_cake": "UNLOCALIZED: Blaze Cake", "item.create.blaze_cake_base": "UNLOCALIZED: Blaze Cake Base", diff --git a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json index c2553eed7..d8fcfabff 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 862", + "_": "Missing Localizations: 866", "_": "->------------------------] Game Elements [------------------------<-", @@ -420,7 +420,7 @@ "item.create.andesite_alloy": "Alliage d'andésite", "item.create.attribute_filter": "Filtre d'attribut", - "item.create.bar_of_chocolate": "UNLOCALIZED: Bar Of Chocolate", + "item.create.bar_of_chocolate": "UNLOCALIZED: Bar of Chocolate", "item.create.belt_connector": "Tapis roulant", "item.create.blaze_cake": "UNLOCALIZED: Blaze Cake", "item.create.blaze_cake_base": "UNLOCALIZED: Blaze Cake Base", diff --git a/src/generated/resources/assets/create/lang/unfinished/it_it.json b/src/generated/resources/assets/create/lang/unfinished/it_it.json index 12993d208..926b5cb34 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 846", + "_": "Missing Localizations: 850", "_": "->------------------------] Game Elements [------------------------<-", @@ -420,7 +420,7 @@ "item.create.andesite_alloy": "Lega di Andesite", "item.create.attribute_filter": "Filtro Attributi", - "item.create.bar_of_chocolate": "UNLOCALIZED: Bar Of Chocolate", + "item.create.bar_of_chocolate": "UNLOCALIZED: Bar of Chocolate", "item.create.belt_connector": "Nastro Meccanico", "item.create.blaze_cake": "UNLOCALIZED: Blaze Cake", "item.create.blaze_cake_base": "UNLOCALIZED: Blaze Cake Base", diff --git a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json index eead17ab3..079fe1eb8 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 845", + "_": "Missing Localizations: 849", "_": "->------------------------] Game Elements [------------------------<-", @@ -420,7 +420,7 @@ "item.create.andesite_alloy": "安山岩合金", "item.create.attribute_filter": "属性フィルター", - "item.create.bar_of_chocolate": "UNLOCALIZED: Bar Of Chocolate", + "item.create.bar_of_chocolate": "UNLOCALIZED: Bar of Chocolate", "item.create.belt_connector": "メカニカルベルト", "item.create.blaze_cake": "UNLOCALIZED: Blaze Cake", "item.create.blaze_cake_base": "UNLOCALIZED: Blaze Cake Base", diff --git a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json index 9adb98b95..3cdc53b85 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 846", + "_": "Missing Localizations: 850", "_": "->------------------------] Game Elements [------------------------<-", @@ -420,7 +420,7 @@ "item.create.andesite_alloy": "안산암 합금", "item.create.attribute_filter": "속성 필터 틀", - "item.create.bar_of_chocolate": "UNLOCALIZED: Bar Of Chocolate", + "item.create.bar_of_chocolate": "UNLOCALIZED: Bar of Chocolate", "item.create.belt_connector": "기계식 벨트", "item.create.blaze_cake": "UNLOCALIZED: Blaze Cake", "item.create.blaze_cake_base": "UNLOCALIZED: Blaze Cake Base", diff --git a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json index af19176bb..7fd208bee 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1152", + "_": "Missing Localizations: 1156", "_": "->------------------------] Game Elements [------------------------<-", @@ -420,7 +420,7 @@ "item.create.andesite_alloy": "UNLOCALIZED: Andesite Alloy", "item.create.attribute_filter": "UNLOCALIZED: Attribute Filter", - "item.create.bar_of_chocolate": "UNLOCALIZED: Bar Of Chocolate", + "item.create.bar_of_chocolate": "UNLOCALIZED: Bar of Chocolate", "item.create.belt_connector": "Mechanische Transportband", "item.create.blaze_cake": "UNLOCALIZED: Blaze Cake", "item.create.blaze_cake_base": "UNLOCALIZED: Blaze Cake Base", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_br.json b/src/generated/resources/assets/create/lang/unfinished/pt_br.json index 417a0c884..6f8b8d787 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1218", + "_": "Missing Localizations: 1222", "_": "->------------------------] Game Elements [------------------------<-", @@ -420,7 +420,7 @@ "item.create.andesite_alloy": "UNLOCALIZED: Andesite Alloy", "item.create.attribute_filter": "UNLOCALIZED: Attribute Filter", - "item.create.bar_of_chocolate": "UNLOCALIZED: Bar Of Chocolate", + "item.create.bar_of_chocolate": "UNLOCALIZED: Bar of Chocolate", "item.create.belt_connector": "Esteira Mecânica", "item.create.blaze_cake": "UNLOCALIZED: Blaze Cake", "item.create.blaze_cake_base": "UNLOCALIZED: Blaze Cake Base", diff --git a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json index 960e80f69..bc8d3f70c 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 521", + "_": "Missing Localizations: 525", "_": "->------------------------] Game Elements [------------------------<-", @@ -420,7 +420,7 @@ "item.create.andesite_alloy": "Андезитовый сплав", "item.create.attribute_filter": "Фильтр атрибутов", - "item.create.bar_of_chocolate": "UNLOCALIZED: Bar Of Chocolate", + "item.create.bar_of_chocolate": "UNLOCALIZED: Bar of Chocolate", "item.create.belt_connector": "Механический ремень", "item.create.blaze_cake": "UNLOCALIZED: Blaze Cake", "item.create.blaze_cake_base": "UNLOCALIZED: Blaze Cake Base", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json index 3a1e54083..e84ec96a2 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 529", + "_": "Missing Localizations: 533", "_": "->------------------------] Game Elements [------------------------<-", @@ -420,7 +420,7 @@ "item.create.andesite_alloy": "安山合金", "item.create.attribute_filter": "属性过滤器", - "item.create.bar_of_chocolate": "UNLOCALIZED: Bar Of Chocolate", + "item.create.bar_of_chocolate": "UNLOCALIZED: Bar of Chocolate", "item.create.belt_connector": "传送带", "item.create.blaze_cake": "UNLOCALIZED: Blaze Cake", "item.create.blaze_cake_base": "UNLOCALIZED: Blaze Cake Base", diff --git a/src/generated/resources/assets/create/models/item/bar_of_chocolate.json b/src/generated/resources/assets/create/models/item/bar_of_chocolate.json index ff8c81b19..2d336e1e6 100644 --- a/src/generated/resources/assets/create/models/item/bar_of_chocolate.json +++ b/src/generated/resources/assets/create/models/item/bar_of_chocolate.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "create:item/bar_of_chocolate" } diff --git a/src/generated/resources/assets/create/models/item/builders_tea.json b/src/generated/resources/assets/create/models/item/builders_tea.json index d428646a8..5e647a839 100644 --- a/src/generated/resources/assets/create/models/item/builders_tea.json +++ b/src/generated/resources/assets/create/models/item/builders_tea.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "create:item/builders_tea" }