Dev

.pakku/prism-overrides/mmc-pack.json

@@ -29,9 +29,9 @@
           "uid": "net.minecraft"
         }
       ],
-      "cachedVersion": "47.4.0",
+      "cachedVersion": "47.4.10",
       "uid": "net.minecraftforge",
-      "version": "47.4.0"
+      "version": "47.4.10"
     }
   ],
   "formatVersion": 1

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [Unreleased]
+### Changes
+ * Java 25 support
+    * Updated forge, along with various mods.
+ * Replaced Blockswap with AE2 meteor mixin
+ * Updated Tinker's Construct
+ * Melting can be applied to all tools again
+ * Cleaned up silver's recipes, and added a tooltip hint regarding how to make it for those wanting to make it early.
+ * Added slime vines to overworld slime patches
+ * Added more splashes and cleaned up questbook a minor amount
+
+### Fixes
+* Fixed a Quark and Soph Storage compat bug
+* Fixed the trade machine model
+* Fixed pewter being unobtainable
+* Fixed the ponder command in the questbook
+* Fixed Create: Encased compatibility
+
 ## [2.1.2]
 ### Changes
  * Hotfix for curseforge not accepting the server builds because of Trial Chambers Reuploaded

config/darkmodeeverywhere-client.toml

@@ -10,10 +10,10 @@ METHOD_SHADER_DUMP = false
 ["Inventory Button"]
 	#Pixels away from the left of the GUI in the x axis
 	#Range: > 0
-	X = 2
+	X = 4
 	#Pixels away from the bottom of the GUI in the y axis
 	#Range: > 0
-	Y = 20
+	Y = 30
 
 ["Main Menu Button"]
 	#Enabled

config/emi_loot_config.toml

@@ -14,9 +14,12 @@ skippedKeys = [
     "emi_loot.function.limit_count"
 ]
 chestLootAlwaysStackSame = false
-mobLootIncludeDirectDrops = true
+splitChestLootByTrial = false
 chanceDecimalPlaces = 1
 conditionStyle = "default"
+linkFormatting = [
+    "UNDERLINE"
+]
 
 [debugModes]
 block = false
@@ -32,7 +35,14 @@ mob = true
 gameplay = true
 archaeology = true
 
-[logUnstranslatedTables]
+[logUntranslatedTables]
 chest = false
 gameplay = false
-archaeology = false
+archaeology = false
+
+[directDrops]
+chestLoot = true
+blockLoot = true
+mobLoot = true
+gameplayLoot = true
+archaeologyLoot = true

config/fancymenu/assets/splash.txt

@@ -1,8 +1,8 @@
 The first splash of the list!
 Also try Monifactory!
 Same Day Shipping!
-Blaze Burners can be used as Lava!
-Blaze Burners can be used as Campfires!
+Fed Blaze Burners can be used for bulk blasting!
+Blaze Burners can be used for bulk smoking!
 Train Simulator
 Froge
 Denser Ores!
@@ -42,4 +42,5 @@ find him
 Press W to Ponder!
 Ponder that.
 Third time's the charm!
-Creature Channel
+Creature Channel
+Kubed!

config/ftbquests/quests/chapters/lifesavers.snbt

@@ -824,18 +824,14 @@
 				"[\"\",{\"translate\":\"cabin.quest.3A428CA43D545DB9.rich_description7\"},{\"color\":\"gold\",\"underlined\":true,\"bold\":1,\"translate\":\"cabin.quest.3A428CA43D545DB9.rich_description8\",\"hoverEvent\":{\"action\":\"show_text\",\"contents\":{\"translate\":\"cabin.quest.3A428CA43D545DB9.rich_description.hover_text8\"}}},{\"translate\":\"cabin.quest.3A428CA43D545DB9.rich_description9\"},{\"color\":\"gold\",\"underlined\":true,\"bold\":1,\"translate\":\"cabin.quest.3A428CA43D545DB9.rich_description10\",\"hoverEvent\":{\"action\":\"show_text\",\"contents\":{\"translate\":\"cabin.quest.3A428CA43D545DB9.rich_description.hover_text10\"}}},{\"translate\":\"cabin.quest.3A428CA43D545DB9.rich_description11\"}]"
 				""
 				"{\"translate\":\"cabin.quest.3A428CA43D545DB9.rich_description12\"}"
-				"{@pagebreak}"
-				"{cabin.quest.012E50977D8EEEDB.description3}"
-				""
-				"{cabin.quest.012E50977D8EEEDB.description4}"
-				""
-				"{cabin.quest.012E50977D8EEEDB.description5}"
-				"{@pagebreak}"
-				"{cabin.quest.012E50977D8EEEDB.description6}"
-				""
-				"{cabin.quest.012E50977D8EEEDB.description7}"
 			]
 			id: "3A428CA43D545DB9"
+			rewards: [{
+				count: 4
+				id: "3ECC7FCF5DC069DE"
+				item: "minecraft:stick"
+				type: "item"
+			}]
 			tasks: [{
 				id: "3B501EA544B81E73"
 				item: "minecraft:crafting_table"

config/ftbquests/quests/chapters/market.snbt

@@ -935,7 +935,7 @@
 			icon: "minecraft:minecart"
 			id: "117587D824D23D69"
 			rewards: [{
-				count: 128
+				count: 256
 				id: "738387AED344C59B"
 				item: "create:track"
 				type: "item"

config/modernfix-mixins.properties

@@ -56,7 +56,6 @@
 #  mixin.perf.blast_search_trees=true # (default)
 #  mixin.perf.blast_search_trees.force=false # (default)
 #  mixin.perf.cache_blockstate_cache_arrays=true # (default)
-#  mixin.perf.cache_model_materials=true # (default)
 #  mixin.perf.cache_profile_texture_url=true # (default)
 #  mixin.perf.cache_strongholds=true # (default)
 #  mixin.perf.cache_upgraded_structures=true # (default)
@@ -79,6 +78,7 @@
 #  mixin.perf.dynamic_structure_manager=true # (default)
 #  mixin.perf.fast_forge_dummies=true # (default)
 #  mixin.perf.fast_registry_validation=true # (default)
+#  mixin.perf.faster_capabilities=true # (default)
 #  mixin.perf.faster_ingredients=true # (default)
 #  mixin.perf.faster_item_rendering=false # (default)
 #  mixin.perf.faster_structure_location=true # (default)

config/quark-common.toml

@@ -9,7 +9,7 @@
 	#Blocks that Quark should treat as Shulker Boxes.
 	"Shulker Boxes" = ["minecraft:white_shulker_box", "minecraft:orange_shulker_box", "minecraft:magenta_shulker_box", "minecraft:light_blue_shulker_box", "minecraft:yellow_shulker_box", "minecraft:lime_shulker_box", "minecraft:pink_shulker_box", "minecraft:gray_shulker_box", "minecraft:light_gray_shulker_box", "minecraft:cyan_shulker_box", "minecraft:purple_shulker_box", "minecraft:blue_shulker_box", "minecraft:brown_shulker_box", "minecraft:green_shulker_box", "minecraft:red_shulker_box", "minecraft:black_shulker_box"]
 	#Should Quark treat anything with 'shulker_box' in its item identifier as a shulker box?
-	"Interpret Shulker Box Like Blocks" = true
+	"Interpret Shulker Box Like Blocks" = false
 	#Set to true if you need to find the class name for a screen that's causing problems
 	"Print Screen Classnames" = false
 	#A list of screens that can accept quark's buttons. Use "Print Screen Classnames" to find the names of any others you'd want to add.

kubejs/assets/ae2/ae2guide/getting-started.md

@@ -3,7 +3,7 @@ navigation:
   title: Getting Started (CABIN)
   position: 10
 ---
-
+# Getting Started (CABIN)
 <div class="notification is-info">
   The following information only applies to Applied Energistics 2 in CABIN! 
 

kubejs/assets/cabin/lang/en_us.json

@@ -210,7 +210,7 @@
     "item.supplementaries.ash.tooltip": "Created by burning wooden materials in-world",
     "item.functionalstorage.controller.tooltip": "Allows automation to wirelessly insert and extract from connected drawers",
     "item.functionalstorage.controller_extension.tooltip": "Serves as an extra point for automation to insert and extract items from if a storage controller is present.",
-    "item.kubejs.pureore.tooltip": "§7A purer grade of ore. §7Can only be found by exploring.",
+    "item.kubejs.pureore.tooltip": "§7A purer grade of ore, can only be found by exploring.",
     "ftbquests.book.tooltip": "The quest window can also be opened with a keybind.",
     "item.kubejs.accellerator_redstone.tooltip": "§7When used in Alchemy Research: §6One of the §ecorrect §6Reagents in §eincorrect §6slots will not be consumed",
     "item.kubejs.accellerator_glowstone.tooltip": "§7When used in Alchemy Research: §6One of the §ecorrect §6Reagents in §ecorrect §6slots will not be consumed",
@@ -237,6 +237,7 @@
     "item.dynamo.info": "§6Dynamos generate §eredstone flux§6 from applicable fuels, which is used to power electric machinary.",
     "item.dynamo.placement": "§6Redstone Flux is pushed from the §ered coil§6, and can be transported over distances with §efluxducts§6.",
     "item.dynamo.details": "§6Must be §eactively producting§6 energy to export it.§6",
+    "item.silver.tooltip": "§7Casted from coins",
     "filled_map.fortress": "Fortress Locator Map",
     "cabin.ponder.tag.ponders": "CABIN",
     "cabin.ponder.tag.ponders.description": "Components and Devices which are distinctive to A&B and CABIN",
@@ -248,7 +249,7 @@
     "ponderjs.ponder.alchemy_setup.text_5": "Whenever the Deployer activates...",
     "ponderjs.ponder.alchemy_setup.text_6": "...the Laser Lamp will emit a High-Energy Beam",
     "ponderjs.ponder.alchemy_setup.text_7": "Hopper Minecarts caught in the Beam will process their contained Items",
-    "cabin.trials.crafter.deprecation.tooltip": "Deprecated. Craft into a Crafter from Quark",
+    "cabin.trials.deprecation.tooltip": "Deprecated.",
     "cabin.profession.prefix": "Profession: %s",
     "cabin.profession.farming": "Farming",
     "cabin.profession.carpentry": "Carpentry",

kubejs/assets/ftbquests/lang/en_us.json

@@ -256,7 +256,7 @@
     "cabin.quest.1D1D1FEAF49C5E11.description1": "A central role in your Laboratory is played by the Alchemical Laser.",
     "cabin.quest.1D1D1FEAF49C5E11.description2": "The Laser is the only way to obtain Catalysts or to find the necessary clues toward their recipe. Another use is the actual application of the Chaos Catalyst to a specific Reagent, causing the Transmutation.",
     "cabin.quest.1D1D1FEAF49C5E11.description3": "Inventors can familiarise themselves with the necessary machinery components via JEI or via entering",
-    "cabin.quest.1D1D1FEAF49C5E11.description4": " &6/c ponder kubejs:alchemical_laser",
+    "cabin.quest.1D1D1FEAF49C5E11.description4": " &6/ponder kubejs:alchemical_laser",
     "cabin.quest.1D1D1FEAF49C5E11.title": "The Alchemical Laser",
     "cabin.quest.1D4AA0F29FA698F2.title": "4x Glow Lichen",
     "cabin.quest.1D4B76A3C724C40D.title": "32x Twisted Planks",
@@ -645,7 +645,7 @@
     "cabin.quest.4B80A801A5BE4A01.title": "Chapter 4 Start!",
     "cabin.quest.4B891E9ED8DE6BB2.description1": "Glow Berries have a couple of ways to be automated, so pick whichever suits you best.",
     "cabin.quest.4B891E9ED8DE6BB2.subtitle": "Contraption 19-2",
-    "cabin.quest.4B891E9ED8DE6BB2.title": "Suger and Spice II",
+    "cabin.quest.4B891E9ED8DE6BB2.title": "Sugar and Spice II",
     "cabin.quest.4BAC95CCC72369AD.description1": "True IT experts tend to avoid going outside much. Thankfully the necessary computer parts can now be delivered directly to their inventory!",
     "cabin.quest.4BAC95CCC72369AD.subtitle": "6 Gold",
     "cabin.quest.4BAC95CCC72369AD.title": "Press Express",

kubejs/assets/ftbquests/lang/es_es.json

@@ -254,7 +254,7 @@
     "cabin.quest.1D1D1FEAF49C5E11.description1": "Un papel central en tu Laboratorio lo desempeña el Láser Alquímico.",
     "cabin.quest.1D1D1FEAF49C5E11.description2": "El Láser es la única forma de obtener Catalizadores o de encontrar las pistas necesarias para tu receta. Otro uso es la aplicación real del Catalizador del Caos a un Reactivo específico, provocando la Transmutación.",
     "cabin.quest.1D1D1FEAF49C5E11.description3": "Los inventores pueden familiarizarse con los componentes de maquinaria necesarios a través de JEI o entrando en",
-    "cabin.quest.1D1D1FEAF49C5E11.description4": " &6/c ponder kubejs:alchemical_laser",
+    "cabin.quest.1D1D1FEAF49C5E11.description4": " &6/ponder kubejs:alchemical_laser",
     "cabin.quest.1D1D1FEAF49C5E11.title": "El Láser Alquimico",
     "cabin.quest.1D4AA0F29FA698F2.title": "4x Liquen Brillante",
     "cabin.quest.1D4B76A3C724C40D.title": "32x Tablones Retorcidos",

kubejs/assets/ftbquests/lang/fr_fr.json

@@ -254,7 +254,7 @@
     "cabin.quest.1D1D1FEAF49C5E11.description1": "A central role in your Laboratory is played by the Alchemical Laser.",
     "cabin.quest.1D1D1FEAF49C5E11.description2": "The Laser is the only way to obtain Catalysts or to find the necessary clues toward their recipe. Another use is the actual application of the Chaos Catalyst to a specific Reagent, causing the Transmutation.",
     "cabin.quest.1D1D1FEAF49C5E11.description3": "Inventors can familiarise themselves with the necessary machinery components via JEI or via entering",
-    "cabin.quest.1D1D1FEAF49C5E11.description4": " &6/c ponder kubejs:alchemical_laser",
+    "cabin.quest.1D1D1FEAF49C5E11.description4": " &6/ponder kubejs:alchemical_laser",
     "cabin.quest.1D1D1FEAF49C5E11.title": "The Alchemical Laser",
     "cabin.quest.1D4AA0F29FA698F2.title": "4x Glow Lichen",
     "cabin.quest.1D4B76A3C724C40D.title": "32x Twisted Planks",

kubejs/assets/ftbquests/lang/ko_kr.json

@@ -256,7 +256,7 @@
     "cabin.quest.1D1D1FEAF49C5E11.description1": "여러분의 연구소의 가장 중요한 역할을 연금술 레이저가 수행합니다.",
     "cabin.quest.1D1D1FEAF49C5E11.description2": "레이저는 촉매제를 얻거나 그 레시피를의 단서를 찾을 수 있는 유일한 방법입니다. 또 다른 용도는 Choas Catalyst를 특정 시약에 실제로 적용해, 변환을 일으키는 것입니다.",
     "cabin.quest.1D1D1FEAF49C5E11.description3": "발명가들은 JEI 또는 다음 명령어를 통해 필요한 기계 구성 요소에 익숙해질 수 있습니다.",
-    "cabin.quest.1D1D1FEAF49C5E11.description4": " &6/c ponder kubejs:alchemical_laser",
+    "cabin.quest.1D1D1FEAF49C5E11.description4": " &6/ponder kubejs:alchemical_laser",
     "cabin.quest.1D1D1FEAF49C5E11.title": "연금술 레이저",
     "cabin.quest.1D4AA0F29FA698F2.title": "4x 발광 이끼",
     "cabin.quest.1D4B76A3C724C40D.title": "32x 뒤틀린 판자",

kubejs/assets/ftbquests/lang/pt_br.json

@@ -254,7 +254,7 @@
     "cabin.quest.1D1D1FEAF49C5E11.description1": "O Laser Alquímico desempenha um papel crucial no seu Laboratório.",
     "cabin.quest.1D1D1FEAF49C5E11.description2": "O Laser é a única forma de se obter catalisadores ou achar as dicas de suas receitas. Outro uso é para aplicação do Catalisador do Caos a um Reagente específico, causando uma Transmutação.",
     "cabin.quest.1D1D1FEAF49C5E11.description3": "Você pode se familiarizar com o maquinário necessário através do JEI ou através do comando",
-    "cabin.quest.1D1D1FEAF49C5E11.description4": " &6/c ponder kubejs:alchemical_laser",
+    "cabin.quest.1D1D1FEAF49C5E11.description4": " &6/ponder kubejs:alchemical_laser",
     "cabin.quest.1D1D1FEAF49C5E11.title": "O Laser Alquímico",
     "cabin.quest.1D4AA0F29FA698F2.title": "4x Líquens Brilhantes",
     "cabin.quest.1D4B76A3C724C40D.title": "32x Tábuas Corruptas",

kubejs/assets/ftbquests/lang/ru_ru.json

@@ -254,7 +254,7 @@
     "cabin.quest.1D1D1FEAF49C5E11.description1": "Главную роль в вашей лаборатории играет алхимический лазер.",
     "cabin.quest.1D1D1FEAF49C5E11.description2": "Лазер - это единственный способ получить катализаторы или найти необходимые подсказки к их рецепту. Другой способ использования - применение катализатора Хаоса к определенному реагенту, что приводит к трансмутации.",
     "cabin.quest.1D1D1FEAF49C5E11.description3": "Изобретатели могут ознакомиться с необходимыми компонентами прибора через JEI или написав комманду",
-    "cabin.quest.1D1D1FEAF49C5E11.description4": " &6/c ponder kubejs:alchemical_laser",
+    "cabin.quest.1D1D1FEAF49C5E11.description4": " &6/ponder kubejs:alchemical_laser",
     "cabin.quest.1D1D1FEAF49C5E11.title": "Алхимический лазер",
     "cabin.quest.1D4AA0F29FA698F2.title": "4x Светящийся лишайник",
     "cabin.quest.1D4B76A3C724C40D.title": "32x Доски из изогнутого дерева",

kubejs/assets/ftbquests/lang/zh_cn.json

@@ -732,7 +732,7 @@
     "cabin.quest.223BB57AD0239511.description2": "缠怨藤会向上生长，你可以使用动力收割机收获它们。",
     "cabin.quest.42F1A649D86DB86D.subtitle": "装置 31-2",
     "cabin.quest.38B063C8DE71E86D.title": "投币",
-    "cabin.quest.1D1D1FEAF49C5E11.description4": " &6/c ponder kubejs:alchemical_laser",
+    "cabin.quest.1D1D1FEAF49C5E11.description4": " &6/ponder kubejs:alchemical_laser",
     "cabin.quest.6B03056FA21424C0.title": "建造矿物处理流水线：",
     "cabin.quest.5326F6482C45D22A.description1": "在这里你可以将一枚金币兑换回一堆银币。",
     "cabin.quest.02B2E249421FAE58.title": "棋盘配方合成",

kubejs/client_scripts/bulkhide.js

@@ -20,6 +20,13 @@ JEIEvents.hideItems(event => {
 
     event.hide("architects_palette:withered_bone")
 
+    event.hide("tconstruct:steel_ingot")
+    event.hide("tconstruct:steel_nugget")
+    event.hide("occultism:silver_ingot")
+    event.hide("occultism:silver_ingot")
+    event.hide("thermal:copper_nugget")
+    event.hide("tconstruct:copper_nugget")
+
     let begoneEarth = [
         "tier_1_rover", "tier_2_rocket", "tier_3_rocket", "tier_4_rocket",
         "steel_cable", "desh_cable", "desh_fluid_pipe", "ostrum_fluid_pipe", "cable_duct", "fluid_pipe_duct",
@@ -190,7 +197,7 @@ JEIEvents.hideItems(event => {
     event.hide("sophisticatedbackpacks:advanced_magnet_upgrade")
     event.hide("sophisticatedstorage:magnet_upgrade")
     event.hide("sophisticatedstorage:advanced_magnet_upgrade")
-
+    event.hide("sophisticatedstorage:hopper_upgrade")
     event.hide("sophisticatedstorage:advanced_hopper_upgrade")
 
     event.hide('balancedflight:ascended_flight_ring')

kubejs/client_scripts/client_compatibility/createcasing.js

@@ -1,30 +1,21 @@
 if (Platform.isLoaded("createcasing")) {
     JEIEvents.hideItems(event => {
-        event.hide("createcasing:oak_shaft")
-        event.hide("createcasing:spruce_shaft")
-        event.hide("createcasing:birch_shaft")
-        event.hide("createcasing:jungle_shaft")
-        event.hide("createcasing:acacia_shaft")
-        event.hide("createcasing:dark_oak_shaft")
-        event.hide("createcasing:crimson_shaft")
-        event.hide("createcasing:warped_shaft")
+        let woods = ["oak", "spruce", "birch", "jungle", "acacia", "dark_oak", "crimson", "warped", "cherry", "bamboo", "mangrove"]
+        let types = ["shaft", "cogwheel", "large_cogwheel"]
+
+        woods.forEach(wood => {
+            types.forEach(type => {
+                event.hide(`createcasing:${wood}_${type}`)
+            })
+        })
+
         event.hide("createcasing:glass_shaft")
         event.hide("createcasing:brass_shaft")
-        event.hide("createcasing:oak_cogwheel")
-        event.hide("createcasing:spruce_cogwheel")
-        event.hide("createcasing:birch_cogwheel")
-        event.hide("createcasing:jungle_cogwheel")
-        event.hide("createcasing:acacia_cogwheel")
-        event.hide("createcasing:dark_oak_cogwheel")
-        event.hide("createcasing:crimson_cogwheel")
-        event.hide("createcasing:warped_cogwheel")
-        event.hide("createcasing:oak_large_cogwheel")
-        event.hide("createcasing:spruce_large_cogwheel")
-        event.hide("createcasing:birch_large_cogwheel")
-        event.hide("createcasing:jungle_large_cogwheel")
-        event.hide("createcasing:acacia_large_cogwheel")
-        event.hide("createcasing:dark_oak_large_cogwheel")
-        event.hide("createcasing:crimson_large_cogwheel")
-        event.hide("createcasing:warped_large_cogwheel")
+
+        let encasedcasings = [ "andesite", "railway", "creative", "brass", "copper", "industrial_iron", "refined_radiance", "weathered_iron", "shadow_steel"]
+
+        encasedcasings.forEach(casing => {
+            event.hide(`createcasing:${casing}_configurable_gearbox`)
+        })
     })
 }

kubejs/client_scripts/tooltips.js

@@ -107,5 +107,8 @@ ItemEvents.tooltip(tooltip => {
         }
     });
 
-    tooltip.add("trials:crafter", Text.red(Text.translatable("cabin.trials.crafter.deprecation.tooltip")))
+    let deprecated = ["trials:crafter", 'functionalstorage:puller_upgrade', 'functionalstorage:pusher_upgrade', 'functionalstorage:collector_upgrade', 'sophisticatedstorage:hopper_upgrade', 'sophisticatedstorage:advanced_hopper_upgrade']
+    deprecated.forEach(item => { tooltip.add(item, Text.red(Text.translatable("cabin.trials.deprecation.tooltip"))) })
+
+    tooltip.add("thermal:silver_ingot", (Text.translatable("item.silver.tooltip")))
 });