Merge branch '1.13.5' into master-ceu

planetme · Dec 14, 2024 · baac00b · baac00b
2 parents a0cc1e2 + b64dea8
commit baac00b
Show file tree

Hide file tree

Showing 18 changed files with 1,067 additions and 95 deletions.
diff --git a/config/LogFilters.conf b/config/LogFilters.conf
@@ -0,0 +1,85 @@
+# See https://github.com/coolsquid/LogFilters/blob/master/LogFilters.conf for examples
+"VintageFix" = [
+	{
+		type="regex"
+		filter=".*?"
+	}
+]
+"LoliASM" = [
+	{
+		type="regex"
+        filter=".*?"
+	}
+]
+"CustomLoadingScreen" = [
+	{
+		type="regex"
+		filter=".*?"
+	}
+]
+"industrialrenewal" = [
+	{
+		type="regex"
+		filter=".*?"
+	}
+]
+"cam72cam.immersiverailroading.registry.DefinitionManager:lambda$initModels$4:240" = [
+	{
+		type="regex"
+		filter=".*?"
+	}
+]
+"vazkii.patchouli.client.book.BookContents:loadJson:258" = [
+	{
+		type="regex"
+		filter=".*?"
+	}
+]
+"net.minecraft.client.resources.LanguageManager" = [
+	{
+		type="regex"
+		filter=".*?"
+	}
+]
+"net.minecraft.client.renderer.texture.TextureMap" = [
+	{
+		type="regex"
+		filter=".*?"
+	}
+]
+"com.personthecat.cavegenerator.CaveInit" = [
+	{
+		type="regex"
+		filter=".*?"
+	}
+]
+"com.personthecat.cavegenerator.config.PresetTester" = [
+	{
+		type="regex"
+		filter=".*?"
+	}
+]
+"com.personthecat.cavegenerator.config.PresetReader" = [
+	{
+		type="regex"
+		filter=".*?"
+	}
+]
+"org.embeddedt.vintagefix.dynamicresources.model.DynamicModelProvider" = [
+	{
+		type="regex"
+		filter=".*?"
+	}
+]
+"org.embeddedt.vintagefix.dynamicresources.model.DynamicBakedModelProvider" = [
+	{
+		type="regex"
+		filter=".*?"
+	}
+]
+"root" = [
+	{
+		type="contains"
+		filter="version check"
+	}
+]
diff --git a/config/betterquesting/DefaultQuests/Quests/3/489.json b/config/betterquesting/DefaultQuests/Quests/3/489.json
@@ -10,7 +10,7 @@
         "id:8": "forge:bucketfilled",
         "tag:10": {
           "Amount:3": 1000,
-          "FluidName:8": "iron_iii_chloride"
+          "FluidName:8": "iron_iii_chloride_solution"
         }
       },
       "name:8": "susy.quest.db.489.title",
@@ -24,7 +24,7 @@
       "requiredFluids:9": {
         "0:10": {
           "Amount:3": 1000,
-          "FluidName:8": "iron_iii_chloride"
+          "FluidName:8": "iron_iii_chloride_solution"
         }
       },
       "taskID:8": "bq_standard:fluid"

diff --git a/config/betterquesting/DefaultQuests/Quests/3/501.json b/config/betterquesting/DefaultQuests/Quests/3/501.json
@@ -1,6 +1,5 @@
 {
   "preRequisites:11": [
-    378,
     506
   ],
   "properties:10": {

diff --git a/config/betterquesting/DefaultQuests/Quests/5/808.json b/config/betterquesting/DefaultQuests/Quests/5/808.json
@@ -21,11 +21,11 @@
       "index:3": 0,
       "requiredFluids:9": {
         "0:10": {
-          "Amount:3": 6500,
+          "Amount:3": 7000,
           "FluidName:8": "niobium_pentachloride"
         },
         "1:10": {
-          "Amount:3": 500,
+          "Amount:3": 1000,
           "FluidName:8": "tantalum_pentachloride"
         }
       },

diff --git a/config/betterquesting/DefaultQuests/Quests/MultipleQuestLine/536.json b/config/betterquesting/DefaultQuests/Quests/MultipleQuestLine/536.json
@@ -19,15 +19,14 @@
   "questID:3": 536,
   "tasks:9": {
     "0:10": {
+      "ignoreNBT:1": 1,
       "index:3": 0,
       "requiredItems:9": {
         "0:10": {
           "Count:3": 1,
           "OreDict:8": "drawerBasic",
           "id:8": "storagedrawers:basicdrawers",
-          "tag:10": {
-            "material:8": "oak"
-          }
+          "tag:10": {}
         }
       },
       "taskID:8": "bq_standard:retrieval"

diff --git a/config/betterquesting/resources/supersymmetry/lang/en_us.lang b/config/betterquesting/resources/supersymmetry/lang/en_us.lang
@@ -1651,7 +1651,7 @@ susy.quest.db.796.desc=In order to carry out the liquid-liquid extraction of tun
 susy.quest.db.797.title=Tungsten Metal
 susy.quest.db.797.desc=React the §6Tungsten Trioxide Dust§f with hydrogen to produce steam and tungsten dust.
 susy.quest.db.798.title=I Craved the Strength and Certainty of Tungstensteel
-susy.quest.db.798.desc=Mix your tungsten and steel in an EV Mixer to make the dust, and put it in an EBF with §bNichrome coils§r to produce the base metal for the §l§dIV Tier§r.
+susy.quest.db.798.desc=Mix your tungsten and steel in an EV Mixer to make the dust, and put it in an EBF with §bRTM Alloy coils§r to produce the base metal for the §l§dIV Tier§r.
 susy.quest.db.799.title=Molybdenum Beneficiation
 susy.quest.db.799.desc=In order to purify Molybdenite, no gravity separation is required. However, a multi-step §bfroth flotation§r setup is required, as well as a §6Nokes reagent§r, or sodium dithiophosphate. This reagent is very powerful, but is also consumed during the process of froth flotation.%n%nFirst, flotate with §ePotassium Amyl Xanthate§r, then flotate with §6Nokes reagent§r to remove the gangue and copper, respectively. This should yield flotated molybdenite dust, which is further purified.%n%n
 susy.quest.db.800.title=Molybdenum Purification

diff --git a/config/jei/itemBlacklist.cfg b/config/jei/itemBlacklist.cfg
@@ -14,13 +14,9 @@ advanced {
         fluid:lightly_steamcracked_heavy_fuel
         rftools:booster
         fluid:hydrocracked_butadiene
-        gregtech:machine:1643;
-        gregtech:machine:343;
-        gregtech:machine:222;
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_light_blue"}
         enchantment:enchantment.damage.arthropods.lvl5
         fluid:concrete_yellow
-        gregtech:machine:965;
         enchantment:enchantment.damage.arthropods.lvl1
         rftools:dump_module
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:novichok",grenade_skin:0}
@@ -34,41 +30,30 @@ advanced {
         rftools:space_chamber
         enchantment:enchantment.arrowKnockback.lvl2
         enchantment:enchantment.arrowKnockback.lvl1
-        gregtech:machine:1644;
         enchantment:enchantment.vanishing_curse.lvl1
         fluid:concrete_orange
         rftools:space_chamber_controller
         rftools:screen_controller
-        gregtech:machine:344;
-        gregtech:machine:223;
-        gregtech:machine:966;
         fluid:concrete_purple
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:smoke",grenade_skin:0}
-        gregtech:machine:1010;
         fluid:concrete_green
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_magenta"}
         rftools:simple_dialer
         fluid:concrete_lime
-        gregtech:machine:1645;
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_lime"}
         rftools:energy_module
         forge:bucketfilled:lightly_hydrocracked_gas;
         enchantment:enchantment.knockback.lvl1
         rftools:computer_module
         rftools:storage_control_module
-        gregtech:machine:345;
-        gregtech:machine:224;
         enchantment:enchantment.knockback.lvl2
         rftools:storage_module:6
         rftools:elevator
         forge:bucketfilled:severely_hydrocracked_gas;
         fluid:hydrocracked_butane
-        gregtech:machine:1011;
-        gregtech:machine:967;
         enchantment:enchantment.damage.all.lvl1
         enchantment:enchantment.damage.all.lvl3
         enchantment:enchantment.damage.all.lvl2
-        gregtech:machine:2027;
         enchantment:enchantment.damage.all.lvl5
         enchantment:enchantment.damage.all.lvl4
         rftools:machine_base
@@ -77,14 +62,11 @@ advanced {
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_yellow",grenade_skin:0}
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_purple",grenade_skin:0}
         rftools:matter_transmitter
-        gregtech:machine:346;
-        gregtech:machine:225;
         rftools:builder
         enchantment:enchantment.fishingSpeed.lvl1
         enchantment:enchantment.fishingSpeed.lvl2
         rftools:spawner
         rftools:dialing_device
-        gregtech:machine:1012;
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:chlorine",grenade_skin:0}
         forge:bucketfilled:hydrocracked_ethane;
         enchantment:enchantment.untouching.lvl1
@@ -94,21 +76,17 @@ advanced {
         enchantment:enchantment.frostWalker.lvl2
         fluid:hydrocracked_propene
         enchantment:enchantment.frostWalker.lvl1
-        gregtech:machine:335;
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:choke_smoke",grenade_skin:0}
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_green"}
         rftools:screen
         rftools:text_module
         enchantment:enchantment.waterWalker.lvl3
         enchantment:enchantment.waterWalker.lvl2
         enchantment:enchantment.waterWalker.lvl1
-        gregtech:machine:347;
-        gregtech:machine:226;
         forge:bucketfilled:gelatin_mixture;
         enchantment:enchantment.disjunction.lvl4
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:hydrochloric_acid",grenade_skin:0}
         enchantment:enchantment.disjunction.lvl5
-        gregtech:machine:162;
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:candyfloss",grenade_skin:0}
         fluid:concrete_brown
         fluid:concrete_magenta
@@ -120,16 +98,12 @@ advanced {
         enchantment:enchantment.disjunction.lvl1
         enchantment:enchantment.disjunction.lvl2
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:phosphine",grenade_skin:0}
-        gregtech:machine:1418;
         enchantment:enchantment.disjunction.lvl3
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:healing_vapor",grenade_skin:0}
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_red"}
         rftools:level_emitter
         fluid:concrete_white
         fluid:severely_hydrocracked_gas
-        gregtech:machine:336;
-        gregtech:machine:215;
-        gregtech:machine:227;
         enchantment:enchantment.protect.explosion.lvl3
         appliedenergistics2:facade
         enchantment:enchantment.protect.explosion.lvl2
@@ -146,13 +120,9 @@ advanced {
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_pink"}
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_gray",grenade_skin:0}
         enchantment:enchantment.digging.lvl1
-        gregtech:machine:163;
         enchantment:enchantment.digging.lvl2
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_cyan",grenade_skin:0}
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_light_blue",grenade_skin:0}
-        gregtech:machine:935;
-        gregtech:machine:337;
-        gregtech:machine:216;
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_lime",grenade_skin:0}
         fluid:lightly_steamcracked_light_fuel
         enchantment:enchantment.lootBonus.lvl2
@@ -171,33 +141,25 @@ advanced {
         gregtech:meta_item_1:310;
         forge:bucketfilled:nitro_fuel;
         enchantment:enchantment.fire.lvl1
-        gregtech:machine:164;
         enchantment:enchantment.damage.undead.lvl5
         rftools:machineinformation_module
         enchantment:enchantment.damage.undead.lvl4
         enchantment:enchantment.damage.undead.lvl3
         enchantment:enchantment.damage.undead.lvl2
         enchantment:enchantment.damage.undead.lvl1
-        gregtech:machine:338;
-        gregtech:machine:217;
         rftools:charged_porter
         fluid:heavy_fuel
-        gregtech:machine:936;
         enchantment:enchantment.oxygen.lvl1
         enchantment:enchantment.oxygen.lvl3
         enchantment:enchantment.oxygen.lvl2
         rftools:redstone_module
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:diborane",grenade_skin:0}
         rftools:projector
-        gregtech:machine:165;
         fluid:severely_hydrocracked_heavy_fuel
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_brown",grenade_skin:0}
         openmodularturrets:addon_meta:7
-        gregtech:machine:937;
         enchantment:enchantment.lootBonusFishing.lvl3
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:chloroform",grenade_skin:0}
-        gregtech:machine:339;
-        gregtech:machine:218;
         enchantment:enchantment.lootBonusFishing.lvl2
         enchantment:enchantment.lootBonusFishing.lvl1
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:choke_smoke"}
@@ -218,10 +180,8 @@ advanced {
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_pink",grenade_skin:0}
         fluid:severely_steamcracked_light_fuel
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_silver",grenade_skin:0}
-        gregtech:machine:166;
         rftools:machine_infuser
         fluid:sulfuric_heavy_fuel
-        gregtech:machine:219;
         enchantment:enchantment.thorns.lvl2
         rftools:matter_booster
         enchantment:enchantment.thorns.lvl3
@@ -239,8 +199,6 @@ advanced {
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:hydrogen_cyanide",grenade_skin:0}
         rftools:inventory_module
         rftools:fluidplus_module
-        gregtech:machine:167;
-        gregtech:machine:1007;
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:hydrogen_sulfide",grenade_skin:0}
         rftools:matter_receiver
         rftools:support_block
@@ -262,7 +220,6 @@ advanced {
         fluid:dichloroethane
         forge:bucketfilled:severely_hydrocracked_light_fuel;
         fluid:hydrocracked_butene
-        gregtech:machine:1008;
         chesttransporter:chesttransporter_tin
         rftools:space_chamber_card
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_magenta",grenade_skin:0}
@@ -303,7 +260,6 @@ advanced {
         rftools:shape_card
         enchantment:enchantment.arrowInfinite.lvl1
         enchantment:enchantment.binding_curse.lvl1
-        gregtech:machine:340;
         gregtech:meta_gem:1647;
         fluid:concrete_gray
         enchantment:enchantment.spaceBreathing.lvl1
@@ -314,18 +270,13 @@ advanced {
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_red",grenade_skin:0}
         fluid:severely_steamcracked_heavy_fuel
         fluid:concrete_blue
-        gregtech:machine:1640;
         enchantment:enchantment.lootBonusDigger.lvl3
         enchantment:enchantment.waterWorker.lvl1
         forge:bucketfilled:hydrocracked_propene;
         forge:bucketfilled:hydrocracked_butane;
         rftools:powercell_simple
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_silver"}
         fluid:severely_hydrocracked_light_fuel
-        gregtech:machine:1641;
-        gregtech:machine:341;
-        gregtech:machine:220;
-        gregtech:machine:951;
         rftools:locator
         rftools:ender_monitor
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:carbon_monoxide",grenade_skin:0}
@@ -334,17 +285,12 @@ advanced {
         fluid:hydrocracked_ethylene
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_orange",grenade_skin:0}
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:tear_gas",grenade_skin:0}
-        gregtech:machine:1642;
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_purple"}
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_green",grenade_skin:0}
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:sarin_gas",grenade_skin:0}
         geneticsreborn:grpotion
         rftools:composer
         rftools:counter_module
-        gregtech:machine:342;
-        gregtech:machine:221;
-        gcym:large_multiblock_casing:12
-        gregtech:machine:952;
         enchantment:enchantment.protect.all.lvl3
         gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:colored_smoke_white"}
         enchantment:enchantment.protect.all.lvl2

diff --git a/config/jei/jei.cfg b/config/jei/jei.cfg
@@ -52,6 +52,9 @@ misc {
     # Show user-hidden ingredients when the player is in creative mode [default: false]
     B:showHiddenIngredientsInCreative=false
 
+    # Skip showing HEI's progress bars on load, can save up to a few seconds when loading [default: false]
+    B:skipShowingProgressBar=false
+
     # Show when a recipe has been changed by adding it to the item's tooltip [default: true]
     B:tooltipShowRecipeBy=true
 }