Merge branch '1.13.5' into master-ceu

planetme · Dec 10, 2024 · 3773d05 · 3773d05
2 parents 1a12956 + 72f0170
commit 3773d05
Show file tree

Hide file tree

Showing 937 changed files with 1,879 additions and 58 deletions.
diff --git a/config/betterquesting/DefaultQuests/QuestLines/0.json b/config/betterquesting/DefaultQuests/QuestLines/0.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.0.desc",
       "icon:10": {
+        "Count:3": 1,
         "id:8": "minecraft:stone_pickaxe"
       },
       "name:8": "susy.quest.ql.0.title"

diff --git a/config/betterquesting/DefaultQuests/QuestLines/1.json b/config/betterquesting/DefaultQuests/QuestLines/1.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.1.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 516,
         "id:8": "gregtech:meta_item_1"
       },
@@ -72,7 +73,7 @@
       "id:3": 32,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": -174,
+      "x:3": -252,
       "y:3": -12
     },
     "9:10": {
@@ -86,8 +87,8 @@
       "id:3": 34,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": -174,
-      "y:3": 96
+      "x:3": -204,
+      "y:3": 36
     },
     "11:10": {
       "id:3": 35,
@@ -128,15 +129,15 @@
       "id:3": 42,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": -228,
-      "y:3": -12
+      "x:3": -300,
+      "y:3": 36
     },
     "17:10": {
       "id:3": 43,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": -174,
-      "y:3": 144
+      "x:3": -252,
+      "y:3": 84
     },
     "18:10": {
       "id:3": 44,
@@ -199,7 +200,7 @@
       "sizeX:3": 48,
       "sizeY:3": 48,
       "x:3": -312,
-      "y:3": 132
+      "y:3": 72
     },
     "27:10": {
       "id:3": 55,
@@ -310,22 +311,22 @@
       "id:3": 77,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": -228,
-      "y:3": 96
+      "x:3": -348,
+      "y:3": 36
     },
     "43:10": {
       "id:3": 78,
-      "sizeX:3": 48,
-      "sizeY:3": 48,
-      "x:3": -240,
-      "y:3": 132
+      "sizeX:3": 24,
+      "sizeY:3": 24,
+      "x:3": -348,
+      "y:3": 84
     },
     "44:10": {
       "id:3": 79,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": -228,
-      "y:3": 48
+      "x:3": -300,
+      "y:3": -12
     },
     "45:10": {
       "id:3": 94,
@@ -429,15 +430,15 @@
       "id:3": 518,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": -175,
-      "y:3": -72
+      "x:3": -252,
+      "y:3": -60
     },
     "60:10": {
       "id:3": 535,
       "sizeX:3": 24,
       "sizeY:3": 24,
-      "x:3": -228,
-      "y:3": -72
+      "x:3": -204,
+      "y:3": -60
     },
     "61:10": {
       "id:3": 536,
@@ -494,6 +495,13 @@
       "sizeY:3": 24,
       "x:3": 12,
       "y:3": 144
+    },
+    "69:10": {
+      "id:3": 1458175841,
+      "sizeX:3": 24,
+      "sizeY:3": 24,
+      "x:3": -252,
+      "y:3": 36
     }
   }
 }
diff --git a/config/betterquesting/DefaultQuests/QuestLines/10.json b/config/betterquesting/DefaultQuests/QuestLines/10.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.10.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 3007,
         "id:8": "gregtech:meta_item_2"
       },

diff --git a/config/betterquesting/DefaultQuests/QuestLines/11.json b/config/betterquesting/DefaultQuests/QuestLines/11.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.11.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 3011,
         "id:8": "gregtech:meta_item_2"
       },

diff --git a/config/betterquesting/DefaultQuests/QuestLines/12.json b/config/betterquesting/DefaultQuests/QuestLines/12.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.12.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 3015,
         "id:8": "gregtech:meta_item_2"
       },

diff --git a/config/betterquesting/DefaultQuests/QuestLines/13.json b/config/betterquesting/DefaultQuests/QuestLines/13.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.13.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 3019,
         "id:8": "gregtech:meta_item_2"
       },

diff --git a/config/betterquesting/DefaultQuests/QuestLines/14.json b/config/betterquesting/DefaultQuests/QuestLines/14.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.14.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 3021,
         "id:8": "gregtech:meta_item_2"
       },

diff --git a/config/betterquesting/DefaultQuests/QuestLines/15.json b/config/betterquesting/DefaultQuests/QuestLines/15.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.15.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 3036,
         "id:8": "gregtech:meta_item_2"
       },

diff --git a/config/betterquesting/DefaultQuests/QuestLines/16.json b/config/betterquesting/DefaultQuests/QuestLines/16.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.16.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 14554,
         "id:8": "gregtech:machine"
       },

diff --git a/config/betterquesting/DefaultQuests/QuestLines/17.json b/config/betterquesting/DefaultQuests/QuestLines/17.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.17.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 4,
         "id:8": "openmodularturrets:ammo_meta"
       },

diff --git a/config/betterquesting/DefaultQuests/QuestLines/18.json b/config/betterquesting/DefaultQuests/QuestLines/18.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.18.desc",
       "icon:10": {
+        "Count:3": 1,
         "id:8": "littletiles:hammer",
         "tag:10": {}
       },

diff --git a/config/betterquesting/DefaultQuests/QuestLines/19.json b/config/betterquesting/DefaultQuests/QuestLines/19.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.19.desc",
       "icon:10": {
+        "Count:3": 1,
         "id:8": "minecraft:ice"
       },
       "name:8": "susy.quest.ql.19.title"

diff --git a/config/betterquesting/DefaultQuests/QuestLines/2.json b/config/betterquesting/DefaultQuests/QuestLines/2.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.2.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 621,
         "id:8": "gregtech:meta_item_1"
       },

diff --git a/config/betterquesting/DefaultQuests/QuestLines/20.json b/config/betterquesting/DefaultQuests/QuestLines/20.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.20.desc",
       "icon:10": {
+        "Count:3": 1,
         "id:8": "immersiverailroading:item_rolling_stock_component",
         "tag:10": {
           "componentType:3": 7,

diff --git a/config/betterquesting/DefaultQuests/QuestLines/21.json b/config/betterquesting/DefaultQuests/QuestLines/21.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.21.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 592,
         "id:8": "gregtech:meta_item_1"
       },

diff --git a/config/betterquesting/DefaultQuests/QuestLines/22.json b/config/betterquesting/DefaultQuests/QuestLines/22.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.22.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 465,
         "id:8": "gregtech:meta_item_1",
         "tag:10": {

diff --git a/config/betterquesting/DefaultQuests/QuestLines/23.json b/config/betterquesting/DefaultQuests/QuestLines/23.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.23.desc",
       "icon:10": {
+        "Count:3": 1,
         "id:8": "minecraft:apple"
       },
       "name:8": "susy.quest.ql.23.title"

diff --git a/config/betterquesting/DefaultQuests/QuestLines/24.json b/config/betterquesting/DefaultQuests/QuestLines/24.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.24.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 1,
         "id:8": "opencomputers:storage",
         "tag:10": {

diff --git a/config/betterquesting/DefaultQuests/QuestLines/25.json b/config/betterquesting/DefaultQuests/QuestLines/25.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.25.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 1610,
         "id:8": "gregtech:machine"
       },

diff --git a/config/betterquesting/DefaultQuests/QuestLines/26.json b/config/betterquesting/DefaultQuests/QuestLines/26.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.26.desc",
       "icon:10": {
+        "Count:3": 1,
         "id:8": "minecraft:spawn_egg",
         "tag:10": {
           "EntityTag:10": {

diff --git a/config/betterquesting/DefaultQuests/QuestLines/27.json b/config/betterquesting/DefaultQuests/QuestLines/27.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.27.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 950,
         "id:8": "gregtech:machine"
       },

diff --git a/config/betterquesting/DefaultQuests/QuestLines/3.json b/config/betterquesting/DefaultQuests/QuestLines/3.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.3.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 624,
         "id:8": "gregtech:meta_item_1"
       },

diff --git a/config/betterquesting/DefaultQuests/QuestLines/4.json b/config/betterquesting/DefaultQuests/QuestLines/4.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.4.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 629,
         "id:8": "gregtech:meta_item_1"
       },

diff --git a/config/betterquesting/DefaultQuests/QuestLines/5.json b/config/betterquesting/DefaultQuests/QuestLines/5.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.5.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 633,
         "id:8": "gregtech:meta_item_1"
       },

diff --git a/config/betterquesting/DefaultQuests/QuestLines/6.json b/config/betterquesting/DefaultQuests/QuestLines/6.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.6.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 637,
         "id:8": "gregtech:meta_item_1"
       },

diff --git a/config/betterquesting/DefaultQuests/QuestLines/7.json b/config/betterquesting/DefaultQuests/QuestLines/7.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.7.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 641,
         "id:8": "gregtech:meta_item_1"
       },

diff --git a/config/betterquesting/DefaultQuests/QuestLines/8.json b/config/betterquesting/DefaultQuests/QuestLines/8.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.8.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 645,
         "id:8": "gregtech:meta_item_1"
       },

diff --git a/config/betterquesting/DefaultQuests/QuestLines/9.json b/config/betterquesting/DefaultQuests/QuestLines/9.json
@@ -5,6 +5,7 @@
     "betterquesting:10": {
       "desc:8": "susy.quest.ql.9.desc",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 3003,
         "id:8": "gregtech:meta_item_2"
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/0/0.json b/config/betterquesting/DefaultQuests/Quests/0/0.json
@@ -4,6 +4,7 @@
       "desc:8": "susy.quest.db.0.desc",
       "frame:8": "GATE",
       "icon:10": {
+        "Count:3": 1,
         "id:8": "biomesoplenty:earth"
       },
       "ismain:1": 1,
@@ -14,6 +15,7 @@
   "questID:3": 0,
   "tasks:9": {
     "0:10": {
+      "index:3": 0,
       "taskID:8": "bq_standard:checkbox"
     }
   }

diff --git a/config/betterquesting/DefaultQuests/Quests/0/1.json b/config/betterquesting/DefaultQuests/Quests/0/1.json
@@ -7,6 +7,7 @@
       "desc:8": "susy.quest.db.1.desc",
       "frame:8": "GATE",
       "icon:10": {
+        "Count:3": 1,
         "id:8": "minecraft:book"
       },
       "ismain:1": 1,
@@ -16,6 +17,7 @@
   "questID:3": 1,
   "tasks:9": {
     "0:10": {
+      "index:3": 0,
       "taskID:8": "bq_standard:checkbox"
     }
   }

diff --git a/config/betterquesting/DefaultQuests/Quests/0/106.json b/config/betterquesting/DefaultQuests/Quests/0/106.json
@@ -7,6 +7,7 @@
       "desc:8": "susy.quest.db.106.desc",
       "frame:8": "GATE",
       "icon:10": {
+        "Count:3": 1,
         "Damage:2": 351,
         "id:8": "gregtech:meta_item_1"
       },
@@ -17,6 +18,7 @@
   "questID:3": 106,
   "tasks:9": {
     "0:10": {
+      "index:3": 0,
       "requiredItems:9": {
         "0:10": {
           "Count:3": 8,