Finalize the A02-0012 build.

* Configuration Updates * The first 12 Labyrinth blocks from ZCM/CA now have recipes, utilizing the Mason's Workstation, the other Labyrinth blocks will receive crafting recipes in the next version. * Fixed stuff. * Updated and added mods. * Changed the MultiMC icon.
6 years ago · d33a8af90c
parent 80c5cc9306
commit d33a8af90c
50 changed files with 5877 additions and 4526 deletions
--- a/Changelog.txt
+++ b/Changelog.txt
@ -5,23 +5,44 @@ A02-0012:
 + Added 7 new types of Labyrinth blocks. [ZCM/CA]
 + Added 2 new types of Substitution blocks. [ZCM/CA]
 + Added new block types "Special Block", "Observation Glass" and "Observation Glass Pane". [ZCM/CA]
+ Added a new block called the "Composite Block" which serves as a crafting ingredient for the Labyrinth block and other decorative blocks. [ZCM/CA]
 * Changed the internal name of Composite Glass from 'altglass' to 'compositeglass'. [ZCM/CA]
 * Changed crafting method of Alterlitium Lamp to use Pedestal Crafting.
+* Replaced the textures for Synthetic Dirt and Synthetic Sand. [ZCM/CA]
 * More types of food now have nutritional values. [Nutrition]
 * Disabled the wooden trapdoors from the MalisisDoors mod in favor of the ones from Quark.
 * Finally fixed the wierding gadget falling over problem. [Weirding Gadget]
+* Fixed a crash when opening the Antique Atlas in the End dimension. [Antique Atlas]
+* Fixed a bug concerning some pipes and vanilla pistons. [Quark]
 * Fixed a typo in one of the zenscripts.
 * Fixed sunlime recipe not working.
+* Fixed Composite Glass and Observation Glass still absorbing light levels. [ZCM/CA]
 * Fixed some blocks in Composite Alterlite mod using the wrong namespace. [ZCM/CA]
 * The Substitution Block is now re-implemented in-game. [ZCM/CA]
 * Liquid Sol is now re-implemented in-game. [ZCM/CA]
+* The first 12 Labyrinth blocks now have recipes, utilizing the Mason's Workstation.
+  * The other Labyrinth blocks will receive crafting recipes in the next version.
+* Changed the MultiMC pack icon.

 + Added Pipe Master mod.
 + ADded Portal Gun mod (as well as an alternative to it's dependency).
 + Added Waddles mod.
-* Updated Composite Alterlite mod 1.0.6 to 1.0.8.
-* Updated Nutrition mod from 4.0.0 to 4.3.0.
-* Updated Weirding Gaddet mod from 2.0.13 to 2.1.16.
+
+* Updated mods: 
+  * Antique Atlas: from 4.5.0. to 4.5.1.
+  * Charms: from 1.0.0-beta3 to 1.0.1.
+  * Composite Alterlite: from 1.0.6 to 1.0.8.
+  * Compact Machines: from 3.0.17-b267 to 3.0.18-b278.
+  * Engineer's Decor: from 1.0.4-b7 to 1.0.5-b1.
+  * FastFurnace: from 1.3.0 to 1.3.1.
+  * FastWorkbench: from 1.7.0 to  1.7.1.
+  * McJtyLib: from 3.5.0 to 3.5.2.
+  * Nutrition: from 4.0.0 to 4.3.0.
+  * Phosphor: from 0.2.2(build43) to 0.2.4(build46).
+  * Quark: from 1.5-148 to 1.5-150.
+  * The Lost Cities: from 2.0.18 to 2.0.19.
+  * Toast Control: from 1.8.0 to 1.8.1.
+  * Weirding Gaddet: from 2.0.13 to 2.1.16.

 ----------------------------------------------------------------
 A02-0011:
--- a/config/Waddles.cfg
+++ b/config/Waddles.cfg
@ -0,0 +1,40 @@
+# Configuration file
+
+general {
+    B:"Enable that penguins drop fish (0 - 2 Raw fish)"=false
+    B:"Penguins should drop experience?"=true
+}
+
+
+##########################################################################################################
+# spawn chances
+#--------------------------------------------------------------------------------------------------------#
+# Configure penguins spawn weight & min/max group size. Set weight to 0 to disable.
+##########################################################################################################
+
+"spawn chances" {
+
+    adelie_penguin {
+        I:Max=4
+        I:Min=1
+        I:Weight=2
+
+        "spawnable biomes" {
+            # BiomeDictionary types to exclude [default: [FOREST], [MOUNTAIN], [NETHER]]
+            S:Exclude <
+                FOREST
+                MOUNTAIN
+                NETHER
+             >
+
+            # BiomeDictionary types to include [default: [SNOWY]]
+            S:Include <
+                SNOWY
+             >
+        }
+
+    }
+
+}
+
+
--- a/config/antiqueatlas/biome_textures.json
+++ b/config/antiqueatlas/biome_textures.json
@ -1,85 +1,92 @@
 {
  "version": 2,
  "data": {
-    "minecraft:jungle_edge": "JUNGLE_EDGE",
-    "minecraft:taiga_hills": "PINES_HILLS",
-    "minecraft:redwood_taiga": "MEGA_TAIGA",
+    "aroma1997sdimension:miningbiome": "PLAINS",
+    "minecraft:beaches": "SHORE",
+    "minecraft:birch_forest": "BIRCH",
+    "minecraft:birch_forest_hills": "BIRCH_HILLS",
+    "minecraft:cold_beach": "SHORE",
    "minecraft:deep_ocean": "WATER",
-    "minecraft:sky": "SHORE",
-    "minecraft:ice_mountains": "SNOW_HILLS",
-    "minecraft:plains": "PLAINS",
-    "minecraft:redwood_taiga_hills": "MEGA_TAIGA_HILLS",
-    "traverse:rocky_plains": "HILLS",
-    "minecraft:mushroom_island_shore": "SHORE",
-    "traverse:canyon": "PLAINS",
-    "minecraft:mutated_taiga": "PINES_HILLS",
+    "minecraft:desert": "DESERT",
+    "minecraft:desert_hills": "DESERT_HILLS",
+    "minecraft:extreme_hills": "MOUNTAINS",
+    "minecraft:extreme_hills_with_trees": "MOUNTAINS_ALL",
    "minecraft:forest": "FOREST",
-    "traverse:birch_forested_hills": "FOREST_HILLS",
-    "minecraft:smaller_extreme_hills": "MOUNTAINS",
-    "minecraft:ocean": "WATER",
+    "minecraft:forest_hills": "FOREST_HILLS",
+    "minecraft:frozen_ocean": "ICE",
+    "minecraft:frozen_river": "ICE",
+    "minecraft:hell": "CAVE_WALLS",
    "minecraft:ice_flats": "SNOW",
-    "minecraft:mutated_swampland": "SWAMP_HILLS",
-    "minecraft:roofed_forest": "DENSE_FOREST",
+    "minecraft:ice_mountains": "SNOW_HILLS",
+    "minecraft:jungle": "JUNGLE",
+    "minecraft:jungle_edge": "JUNGLE_EDGE",
+    "minecraft:jungle_hills": "JUNGLE_HILLS",
    "minecraft:mesa": "MESA",
-    "minecraft:mutated_roofed_forest": "DENSE_FOREST_HILLS",
-    "traverse:woodlands": "PLAINS",
-    "minecraft:swampland": "SWAMP",
-    "traverse:temperate_rainforest": "PINES",
-    "minecraft:mutated_redwood_taiga": "MEGA_SPRUCE",
+    "minecraft:mesa_clear_rock": "PLATEAU_MESA",
    "minecraft:mesa_rock": "PLATEAU_MESA_TREES",
-    "minecraft:savanna_rock": "PLATEAU_SAVANNA",
-    "minecraft:extreme_hills_with_trees": "MOUNTAINS_ALL",
-    "minecraft:hell": "CAVE_WALLS",
+    "minecraft:mushroom_island": "MUSHROOM",
+    "minecraft:mushroom_island_shore": "SHORE",
    "minecraft:mutated_birch_forest": "TALL_BIRCH",
+    "minecraft:mutated_birch_forest_hills": "TALL_BIRCH_HILLS",
+    "minecraft:mutated_desert": "DESERT",
+    "minecraft:mutated_extreme_hills": "MOUNTAINS_SNOW_CAPS",
+    "minecraft:mutated_extreme_hills_with_trees": "MOUNTAINS_SNOW_CAPS",
+    "minecraft:mutated_forest": "FOREST_FLOWERS",
    "minecraft:mutated_ice_flats": "ICE_SPIKES",
-    "traverse:crag_cliffs": "PLAINS",
-    "traverse:thicket": "DENSE_FOREST",
-    "minecraft:taiga": "PINES",
-    "minecraft:mutated_taiga_cold": "SNOW_PINES_HILLS",
-    "minecraft:taiga_cold": "SNOW_PINES",
+    "minecraft:mutated_jungle": "JUNGLE_CLIFFS",
+    "minecraft:mutated_jungle_edge": "JUNGLE_EDGE_HILLS",
+    "minecraft:mutated_mesa": "BRYCE",
+    "minecraft:mutated_mesa_clear_rock": "PLATEAU_MESA_LOW",
+    "minecraft:mutated_mesa_rock": "PLATEAU_MESA_TREES_LOW",
+    "minecraft:mutated_plains": "SUNFLOWERS",
+    "minecraft:mutated_redwood_taiga": "MEGA_SPRUCE",
+    "minecraft:mutated_redwood_taiga_hills": "MEGA_SPRUCE_HILLS",
+    "minecraft:mutated_roofed_forest": "DENSE_FOREST_HILLS",
    "minecraft:mutated_savanna": "SAVANNA_CLIFFS",
+    "minecraft:mutated_savanna_rock": "PLATEAU_SAVANNA_M",
+    "minecraft:mutated_swampland": "SWAMP_HILLS",
+    "minecraft:mutated_taiga": "PINES_HILLS",
+    "minecraft:mutated_taiga_cold": "SNOW_PINES_HILLS",
+    "minecraft:ocean": "WATER",
+    "minecraft:plains": "PLAINS",
+    "minecraft:redwood_taiga": "MEGA_TAIGA",
+    "minecraft:redwood_taiga_hills": "MEGA_TAIGA_HILLS",
    "minecraft:river": "WATER",
-    "minecraft:mutated_redwood_taiga_hills": "MEGA_SPRUCE_HILLS",
-    "minecraft:mutated_extreme_hills_with_trees": "MOUNTAINS_SNOW_CAPS",
+    "minecraft:roofed_forest": "DENSE_FOREST",
+    "minecraft:savanna": "SAVANNA",
+    "minecraft:savanna_rock": "PLATEAU_SAVANNA",
+    "minecraft:sky": "SHORE",
+    "minecraft:smaller_extreme_hills": "MOUNTAINS",
    "minecraft:stone_beach": "ROCK_SHORE",
+    "minecraft:swampland": "SWAMP",
+    "minecraft:taiga": "PINES",
+    "minecraft:taiga_cold": "SNOW_PINES",
    "minecraft:taiga_cold_hills": "SNOW_PINES_HILLS",
+    "minecraft:taiga_hills": "PINES_HILLS",
+    "minecraft:void": "END_VOID",
+    "traverse:arid_highland": "MOUNTAINS_NAKED",
+    "traverse:autumnal_wooded_hills": "FOREST_HILLS",
+    "traverse:autumnal_woods": "FOREST",
+    "traverse:badlands": "DESERT",
+    "traverse:birch_forested_hills": "FOREST_HILLS",
+    "traverse:canyon": "PLAINS",
    "traverse:cliffs": "MOUNTAINS_NAKED",
-    "minecraft:mutated_mesa_clear_rock": "PLATEAU_MESA_LOW",
-    "minecraft:forest_hills": "FOREST_HILLS",
+    "traverse:crag_cliffs": "PLAINS",
+    "traverse:desert_shrubland": "PLAINS",
    "traverse:forested_hills": "FOREST_HILLS",
-    "minecraft:extreme_hills": "MOUNTAINS",
-    "minecraft:savanna": "SAVANNA",
-    "minecraft:mutated_savanna_rock": "PLATEAU_SAVANNA_M",
-    "minecraft:mutated_mesa": "BRYCE",
    "traverse:glacier": "MOUNTAINS_NAKED",
-    "minecraft:mutated_extreme_hills": "MOUNTAINS_SNOW_CAPS",
-    "minecraft:mutated_desert": "DESERT",
-    "minecraft:mutated_jungle": "JUNGLE_CLIFFS",
-    "minecraft:mutated_mesa_rock": "PLATEAU_MESA_TREES_LOW",
-    "minecraft:mutated_jungle_edge": "JUNGLE_EDGE_HILLS",
-    "minecraft:desert": "DESERT",
-    "traverse:badlands": "DESERT",
+    "traverse:glacier_spikes": "MOUNTAINS_NAKED",
    "traverse:green_swamp": "SWAMP",
-    "minecraft:mutated_forest": "FOREST_FLOWERS",
-    "minecraft:beaches": "SHORE",
-    "minecraft:jungle_hills": "JUNGLE_HILLS",
-    "minecraft:frozen_river": "ICE",
-    "minecraft:birch_forest": "BIRCH",
-    "aroma1997sdimension:miningbiome": "PLAINS",
-    "minecraft:cold_beach": "SHORE",
    "traverse:lush_hills": "HILLS",
-    "traverse:rocky_plateau": "MOUNTAINS_NAKED",
-    "minecraft:frozen_ocean": "ICE",
-    "minecraft:mesa_clear_rock": "PLATEAU_MESA",
    "traverse:meadow": "PLAINS",
    "traverse:mini_jungle": "JUNGLE",
-    "minecraft:desert_hills": "DESERT_HILLS",
-    "minecraft:mutated_plains": "SUNFLOWERS",
-    "minecraft:void": "END_VOID",
-    "minecraft:jungle": "JUNGLE",
-    "minecraft:mutated_birch_forest_hills": "TALL_BIRCH_HILLS",
-    "minecraft:birch_forest_hills": "BIRCH_HILLS",
-    "traverse:autumnal_woods": "FOREST",
-    "minecraft:mushroom_island": "MUSHROOM"
+    "traverse:mountainous_desert": "MOUNTAINS_NAKED",
+    "traverse:red_desert": "PLAINS",
+    "traverse:rocky_plains": "HILLS",
+    "traverse:rocky_plateau": "MOUNTAINS_NAKED",
+    "traverse:snowy_coniferous_forest": "PINES",
+    "traverse:temperate_rainforest": "PINES",
+    "traverse:thicket": "DENSE_FOREST",
+    "traverse:woodlands": "PLAINS"
  }
 }
--- a/config/charm.cfg
+++ b/config/charm.cfg
@ -210,6 +210,13 @@ charmloot {
    abandonedcrates {
        # Chance (out of 1.0) of a crate generating in a chunk, if it is possible to do so.
        D:"Generate crate chance"=0.28
+
+        # Number of blocks below the start depth where a crate may spawn.
+        # For Cubic Chunks you may want to set this value quite high.
+        I:"Maximum depth"=32
+
+        # Crate will spawn lower than this number of blocks below the surface.
+        I:"Start depth"=16
    }

    totemofreturning {
@ -536,13 +543,8 @@ charmworld {
    }

    spectre {
-        # Light level at which a Spectre disappears.
        I:"Despawn light level"=8
-
-        # Maximum depth at which Spectres can spawn.
        I:"Spawn depth"=24
-
-        # The higher this value, the more Spectres will spawn.
        I:"Spawn weight"=0
    }

@ -628,6 +630,12 @@ charmworld {

        # Chance (out of 1.0) of items and blocks considered 'valuable' to spawn.
        D:"Valuable chance"=0.05
+
+        # Number of passes that the generator will erode structures in a zombie village chunk.
+        I:"Zombie village erosion damage"=512
+
+        # If true, zombie villages have damaged and eroded buildings and structures.
+        B:"Zombie villages are eroded"=true
    }

    vindicatorsinroofedforest {
--- a/config/engineersdecor.cfg
+++ b/config/engineersdecor.cfg
@ -27,6 +27,12 @@ general {
        # Disable history refabrication feature of the treated wood crafting table.
        B:"Without crafting table history"=false

+        # Disable small electrical pass-through furnace.
+        B:"Without electrical furnace"=false
+
+        # Disable the passive fluid accumulator.
+        B:"Without fluid accumulator"=false
+
        # Disable small lab furnace.
        B:"Without lab furnace"=false

@ -54,6 +60,9 @@ general {
        # Disable treated wood table, stool, windowsill, pole, etc.
        B:"Without tr. wood furniture"=false

+        # Disable check valve, and redstone controlled valves.
+        B:"Without valves"=false
+
        # Disable all mod wall blocks.
        B:"Without walls"=false

@ -98,6 +107,16 @@ general {
        # Enables small quick-move arrows from/to player/block storage. Makes the UI a bit too busy, therefore disabled by default.
        B:"Crafting table: Move buttons"=false

+        # Defines how much RF per tick the the electrical furnace consumed (average) for smelting. The feeders transferring items from/to adjacent have this consumption/8 for each stack transaction. The default value is only slightly higher than a furnace with an IE external heater (and no burning fuel inside).The config value can be changed on-the-fly for tuning.
+        # Min: 10
+        # Max: 256
+        I:"E-furnace: Power consumption"=16
+
+        # Defines, in percent, how fast the electrical furnace smelts compared to a vanilla furnace. 100% means vanilla furnace speed, 150% means the electrical furnace is faster. The value can be changed on-the-fly for tuning.
+        # Min: 50
+        # Max: 500
+        I:"E-furnace: Smelting speed %"=200
+
        # Defines the energy consumption (per tick) for speeding up the smelting process. If IE is installed, an external heater has to be inserted into an auxiliary slot of the lab furnace. The power source needs to be able to provide at least 4 times this consumption (fixed threshold value). The value can be changed on-the-fly for tuning. The default value corresponds to the IE heater consumption.
        # Min: 16
        # Max: 256
--- a/config/fastfurnace.cfg
+++ b/config/fastfurnace.cfg
@ -0,0 +1,8 @@
+# Configuration file
+
+general {
+    # If the furnace uses nbt-sensitive output matching. [default: true]
+    B:"Strict Matching"=true
+}
+
+
--- a/config/jei/worldSettings.cfg
+++ b/config/jei/worldSettings.cfg
@ -11,7 +11,7 @@ world-1600429788 {

    # Hide and unhide ingredients by clicking them in the list.
    B:editEnabled=false
-    S:filterText=@composite
+    S:filterText=

    # Show the list of ingredients next to open GUIs.
    B:overlayEnabled=true
--- a/config/multimob/modInformation/allBiomeTypes.txt
+++ b/config/multimob/modInformation/allBiomeTypes.txt
@ -1,16 +1,16 @@
-OCEAN
 WATER
+OCEAN
 PLAINS
-HOT
 SANDY
+HOT
 DRY
-HILLS
 MOUNTAIN
+HILLS
 FOREST
 COLD
 CONIFEROUS
-SWAMP
 WET
+SWAMP
 RIVER
 NETHER
 END
@ -19,8 +19,8 @@ WASTELAND
 RARE
 MUSHROOM
 BEACH
-DENSE
 JUNGLE
+DENSE
 SPOOKY
 SPARSE
 SAVANNA
--- a/config/multimob/modInformation/allEntities.txt
+++ b/config/multimob/modInformation/allEntities.txt
@ -238,20 +238,20 @@ animania:cart
 animania:tiller
 naturesaura:effect_inhibitor
 naturesaura:mover_cart
-quark:totem_of_holding
-quark:arrow_ender
-quark:arrow_explosive
-quark:arrow_torch
-quark:dragon_breath_bottle
-quark:soul_powder
-quark:parrot_egg
 quark:pirate
 quark:archeologist
 quark:chest_passenger
+quark:totem_of_holding
 quark:flat_item_frame
 quark:colored_item_frame
 quark:glass_item_frame
 quark:seat
+quark:arrow_ender
+quark:arrow_explosive
+quark:arrow_torch
+quark:dragon_breath_bottle
+quark:soul_powder
+quark:parrot_egg
 betternether:firefly
 thermalfoundation:blizz
 thermalfoundation:blitz
@ -327,6 +327,7 @@ stevescarts:cake
 teastory:entity
 farmingforblockheads:merchant
 metalchests:minecart_metal_chest
+waddles:adelie_penguin
 trumpetskeleton:trumpet_skeleton
 thermaldynamics:transport
 coroutil:bat_smart
--- a/config/pipemaster/settings.cfg
+++ b/config/pipemaster/settings.cfg
@ -0,0 +1,26 @@
+# Configuration file
+
+pipegoggles {
+    # How long to cache nearby pipes [range: 0 ~ 1000, default: 5]
+    I:cacheTTL=5
+
+    # How thick the lines should be drawn [range: 0.1 ~ 5.0, default: 1.5]
+    S:lineWidth=1.5
+
+    # Color of the first pipe outlines (RGBA in hex) [default: FF000080]
+    S:optimizerAColorHex=FF000080
+
+    # Color of the second pipe outlines (RGBA in hex) [default: 00FF0080]
+    S:optimizerBColorHex=00FF0080
+
+    # Color of the third pipe outlines (RGBA in hex) [default: 0000FF80]
+    S:optimizerCColorHex=0000FF80
+
+    # Color of the fourth pipe outlines (RGBA in hex) [default: FFFF0080]
+    S:optimizerDColorHex=FFFF0080
+
+    # Comma separated list of valid range values. Please note that high values can have significant impact on FPS! [default: 4,8,16]
+    S:validRanges=4,8,16
+}
+
+
--- a/config/quark.cfg
+++ b/config/quark.cfg
@ -373,7 +373,7 @@ client {
         >

        # This feature disables itself if any of the following mods are loaded: 
-        #  - toughasnails
+        #  - sereneseasons
        # This is done to prevent content overlap.
        # You can turn this on to force the feature to be loaded even if the above mods are also loaded.
        B:"Force Enabled"=false
@ -757,6 +757,12 @@ management {
            minecraft:trapped_chest
         >

+        # Allow anything with 'chest' in its block identifier to be used as a dropoff inventory?
+        B:"Dropoff to Any Chest Block"=true
+
+        # Allow anything with 'chest' in its TileEntity identifier to be used as a dropoff inventory?
+        B:"Dropoff to Any Chest Tile"=true
+
        # GUIs in which the chest buttons should be forced to show up. Use the "Debug Classnames" option to find the names.
        S:"Forced GUIs" <
         >
--- a/config/splash.properties
+++ b/config/splash.properties
@ -1,5 +1,5 @@
 #Splash screen properties
-#Mon May 06 02:31:52 SGT 2019
+#Sun May 12 07:24:04 SGT 2019
 background=0x41454A
 memoryGood=0x1E2D41
 font=0xCCCCCC
--- a/config/triumph/documentation/Triumph.txt
+++ b/config/triumph/documentation/Triumph.txt
@ -3,13 +3,13 @@ and documentation will be printed.



-removeModAdvancements:
+allowDragging:
    Arguments:
        boolean
    Default Values:
-        true
+        false
    Notes:
-        Used to set whether Triumph should remove mod advancements.
+        Sets whether advancements can be dragged around in the gui. End positions will be saved to script files when the mouse button is released, but advancements must be reloaded to refresh positions after the gui is closed.

 removeAdvancements:
    Arguments:
@ -19,21 +19,13 @@ removeAdvancements:
    Notes:
        Used to set advancements that should be removed. Can contain both mod ids and advancement ids. If anything is set in this array, everything else will be kept.

-pageOrder:
-    Arguments:
-        String array
-    Usage:
-        Array of root advancement resource location
-    Notes:
-        Forces an order for advancement pages in the gui. Any not added to this array are ordered alphabetically.
-
-allowDragging:
+removeModAdvancements:
    Arguments:
        boolean
    Default Values:
-        false
+        true
    Notes:
-        Sets whether advancements can be dragged around in the gui. End positions will be saved to script files when the mouse button is released, but advancements must be reloaded to refresh positions after the gui is closed.
+        Used to set whether Triumph should remove mod advancements.

 keepAdvancements:
    Arguments:
@ -43,37 +35,45 @@ keepAdvancements:
    Notes:
        Used to set advancements that should be kept. Can contain both mod ids and advancement ids. If anything is set in this array, everything else will be removed.

-printDefaultConfigs:
+removeVanillaAdvancements:
    Arguments:
        boolean
    Default Values:
        true
    Notes:
-        Used to set whether Triumph should print default config files. This will replace files. Always backup first!
+        Used to set whether Triumph should remove vanilla advancements.

-printDocumentation:
+forceReloadFunctions:
    Arguments:
        boolean
-    Default Values:
-        true
    Notes:
-        Used to set whether Triumph should print config documentation.
+        No longer does anything. Simply here to avoid script errors. Will be removed fully in a future update.

-removeVanillaAdvancements:
+printDefaultConfigs:
    Arguments:
        boolean
    Default Values:
        true
    Notes:
-        Used to set whether Triumph should remove vanilla advancements.
+        Used to set whether Triumph should print default config files. This will replace files. Always backup first!

-forceReloadFunctions:
+printDocumentation:
    Arguments:
        boolean
+    Default Values:
+        true
    Notes:
-        No longer does anything. Simply here to avoid script errors. Will be removed fully in a future update.
+        Used to set whether Triumph should print config documentation.

 useNewParentCompletionCriteriaNames:
    Notes:
        Tells the mod to use the new naming scheme for parent completion criteria generated with 'setRequiresParents()', instead of the old one. 'Completed Title' vs 'completedParent1'

+pageOrder:
+    Arguments:
+        String array
+    Usage:
+        Array of root advancement resource location
+    Notes:
+        Forces an order for advancement pages in the gui. Any not added to this array are ordered alphabetically.
+
--- a/config/triumph/documentation/criteria/triggers/botania_tweaks/flower_generated_mana.txt
+++ b/config/triumph/documentation/criteria/triggers/botania_tweaks/flower_generated_mana.txt
@ -4,14 +4,6 @@ of mana with a certain flower.



-setFlower:
-    Arguments:
-        String
-    Usage:
-        flower name
-    Notes:
-        Sets the required flower.
-
 setRequiredMana:
    Arguments:
        long
@ -20,6 +12,14 @@ setRequiredMana:
    Notes:
        Sets the required mana for the flower to have generated.

+setFlower:
+    Arguments:
+        String
+    Usage:
+        flower name
+    Notes:
+        Sets the required flower.
+
 setCount:
    Arguments:
        int
--- a/config/triumph/documentation/criteria/triggers/immersiveengineering/multiblock_formed.txt
+++ b/config/triumph/documentation/criteria/triggers/immersiveengineering/multiblock_formed.txt
@ -4,14 +4,6 @@ multiblock.



-setItem:
-    Arguments:
-        ItemBlockData
-    Usage:
-        item data
-    Notes:
-        Sets the required item.
-
 setMultiblock:
    Arguments:
        String
@ -20,6 +12,14 @@ setMultiblock:
    Notes:
        Sets the id for the multiblock this trigger will be triggerd by the formation of.

+setItem:
+    Arguments:
+        ItemBlockData
+    Usage:
+        item data
+    Notes:
+        Sets the required item.
+
 setCount:
    Arguments:
        int
--- a/config/triumph/documentation/criteria/triggers/minecraft/bred_animals.txt
+++ b/config/triumph/documentation/criteria/triggers/minecraft/bred_animals.txt
@ -3,21 +3,21 @@ trigger.



-setPartnerType:
+setParentType:
    Arguments:
        String
    Usage:
        entity type
    Notes:
-        Sets the partner entity type.
+        Sets the parent entity type.

 getChildData:
    Notes:
        Returns the EntityData object for the child so functions can be called on it.

-getParentData:
+getPartnerData:
    Notes:
-        Returns the EntityData object for the parent so functions can be called on it.
+        Returns the EntityData object for the partner so functions can be called on it.

 setChildType:
    Arguments:
@ -27,17 +27,17 @@ setChildType:
    Notes:
        Sets the child entity type.

-getPartnerData:
-    Notes:
-        Returns the EntityData object for the partner so functions can be called on it.
-
-setParentType:
+setPartnerType:
    Arguments:
        String
    Usage:
        entity type
    Notes:
-        Sets the parent entity type.
+        Sets the partner entity type.
+
+getParentData:
+    Notes:
+        Returns the EntityData object for the parent so functions can be called on it.

 setCount:
    Arguments:
--- a/config/triumph/documentation/criteria/triggers/minecraft/changed_dimension.txt
+++ b/config/triumph/documentation/criteria/triggers/minecraft/changed_dimension.txt
@ -3,21 +3,21 @@ trigger.



-setDimensionOrigin:
+setDimensionDestination:
    Arguments:
        String
    Usage:
        dimension type
    Notes:
-        Sets the origin dimension type. Vanilla options are "overworld", "the_nether", "the_end"
+        Sets the destination dimension type. Vanilla options are "overworld", "the_nether", "the_end"

-setDimensionDestination:
+setDimensionOrigin:
    Arguments:
        String
    Usage:
        dimension type
    Notes:
-        Sets the destination dimension type. Vanilla options are "overworld", "the_nether", "the_end"
+        Sets the origin dimension type. Vanilla options are "overworld", "the_nether", "the_end"

 setCount:
    Arguments:
--- a/config/triumph/documentation/criteria/triggers/minecraft/construct_beacon.txt
+++ b/config/triumph/documentation/criteria/triggers/minecraft/construct_beacon.txt
@ -3,14 +3,6 @@ trigger.



-setLevelsMinMax:
-    Arguments:
-        float, float
-    Usage:
-        min, max
-    Notes:
-        Sets the min and max levels for the beacon.
-
 setLevelsMax:
    Arguments:
        float
@ -27,6 +19,14 @@ setLevelsMin:
    Notes:
        Sets the min levels for the beacon.

+setLevelsMinMax:
+    Arguments:
+        float, float
+    Usage:
+        min, max
+    Notes:
+        Sets the min and max levels for the beacon.
+
 setCount:
    Arguments:
        int
--- a/config/triumph/documentation/criteria/triggers/minecraft/cured_zombie_villager.txt
+++ b/config/triumph/documentation/criteria/triggers/minecraft/cured_zombie_villager.txt
@ -7,13 +7,9 @@ getZombieData:
    Notes:
        Returns the EntityData object for the zombie so functions can be called on it.

-setZombieType:
-    Arguments:
-        String
-    Usage:
-        entity type
+getVillagerData:
    Notes:
-        Sets the zombie entity type.
+        Returns the EntityData object for the villager so functions can be called on it.

 setVillagerType:
    Arguments:
@ -23,9 +19,13 @@ setVillagerType:
    Notes:
        Sets the villager entity type.

-getVillagerData:
+setZombieType:
+    Arguments:
+        String
+    Usage:
+        entity type
    Notes:
-        Returns the EntityData object for the villager so functions can be called on it.
+        Sets the zombie entity type.

 setCount:
    Arguments:
--- a/config/triumph/documentation/criteria/triggers/minecraft/enchanted_item.txt
+++ b/config/triumph/documentation/criteria/triggers/minecraft/enchanted_item.txt
@ -11,14 +11,6 @@ setItem:
    Notes:
        Sets the required item.

-setLevelsMinMax:
-    Arguments:
-        float, float
-    Usage:
-        min, max
-    Notes:
-        Sets the min and max level for the enchantment.
-
 setLevelsMax:
    Arguments:
        float
@ -35,6 +27,14 @@ setLevelsMin:
    Notes:
        Sets the min level for the enchantment.

+setLevelsMinMax:
+    Arguments:
+        float, float
+    Usage:
+        min, max
+    Notes:
+        Sets the min and max level for the enchantment.
+
 setCount:
    Arguments:
        int
--- a/config/triumph/documentation/criteria/triggers/minecraft/inventory_changed.txt
+++ b/config/triumph/documentation/criteria/triggers/minecraft/inventory_changed.txt
@ -19,14 +19,6 @@ setOccupiedMinMax:
    Notes:
        Sets the min and max values for occupied inventory slots.

-setOccupiedMin:
-    Arguments:
-        float
-    Usage:
-        min
-    Notes:
-        Sets the min value for occupied inventory slots.
-
 setOccupiedMax:
    Arguments:
        float
@ -35,37 +27,37 @@ setOccupiedMax:
    Notes:
        Sets the max value for occupied inventory slots.

-setFullMinMax:
+setEmptyMinMax:
    Arguments:
        float, float
    Usage:
        min, max
    Notes:
-        Sets the min and max values for full inventory slots.
+        Sets the min and max values for empty inventory slots.

-setFullMin:
+setEmptyMax:
    Arguments:
        float
    Usage:
-        min
+        max
    Notes:
-        Sets the min value for full inventory slots.
+        Sets the max value for empty inventory slots.

-setFullMax:
+setFullMinMax:
    Arguments:
-        float
+        float, float
    Usage:
-        max
+        min, max
    Notes:
-        Sets the max value for full inventory slots.
+        Sets the min and max values for full inventory slots.

-setEmptyMinMax:
+setOccupiedMin:
    Arguments:
-        float, float
+        float
    Usage:
-        min, max
+        min
    Notes:
-        Sets the min and max values for empty inventory slots.
+        Sets the min value for occupied inventory slots.

 setEmptyMin:
    Arguments:
@ -75,13 +67,21 @@ setEmptyMin:
    Notes:
        Sets the min value for empty inventory slots.

-setEmptyMax:
+setFullMax:
    Arguments:
        float
    Usage:
        max
    Notes:
-        Sets the max value for empty inventory slots.
+        Sets the max value for full inventory slots.
+
+setFullMin:
+    Arguments:
+        float
+    Usage:
+        min
+    Notes:
+        Sets the min value for full inventory slots.

 setCount:
    Arguments:
--- a/config/triumph/documentation/criteria/triggers/minecraft/item_durability_changed.txt
+++ b/config/triumph/documentation/criteria/triggers/minecraft/item_durability_changed.txt
@ -11,6 +11,14 @@ setItem:
    Notes:
        Sets the required item.

+setDurabilityMinMax:
+    Arguments:
+        float, float
+    Usage:
+        min, max
+    Notes:
+        Sets the min and max item durability.
+
 setDurabilityMin:
    Arguments:
        float
@ -19,13 +27,13 @@ setDurabilityMin:
    Notes:
        Sets the min item durability.

-setDurabilityMax:
+setDeltaMin:
    Arguments:
        float
    Usage:
-        max
+        min
    Notes:
-        Sets the max item durability.
+        Sets the min delta.

 setDeltaMinMax:
    Arguments:
@ -35,13 +43,13 @@ setDeltaMinMax:
    Notes:
        Sets the min and max delta.

-setDeltaMin:
+setDurabilityMax:
    Arguments:
        float
    Usage:
-        min
+        max
    Notes:
-        Sets the min delta.
+        Sets the max item durability.

 setDeltaMax:
    Arguments:
@ -51,14 +59,6 @@ setDeltaMax:
    Notes:
        Sets the max delta.

-setDurabilityMinMax:
-    Arguments:
-        float, float
-    Usage:
-        min, max
-    Notes:
-        Sets the min and max item durability.
-
 setCount:
    Arguments:
        int
--- a/config/triumph/documentation/criteria/triggers/minecraft/levitation.txt
+++ b/config/triumph/documentation/criteria/triggers/minecraft/levitation.txt
@ -14,21 +14,21 @@ getDistanceData:
    Notes:
        Returns the DistanceData object so functions can be called on it.

-setDurationMin:
+setDurationMax:
    Arguments:
        float
    Usage:
-        min
+        max
    Notes:
-        Sets the min duration.
+        Sets the max duration.

-setDurationMax:
+setDurationMin:
    Arguments:
        float
    Usage:
-        max
+        min
    Notes:
-        Sets the max duration.
+        Sets the min duration.

 setCount:
    Arguments:
--- a/config/triumph/documentation/criteria/triggers/minecraft/location.txt
+++ b/config/triumph/documentation/criteria/triggers/minecraft/location.txt
@ -10,6 +10,14 @@ setFeature:
    Notes:
        Sets the feature id. Used for things like structures.

+setBiome:
+    Arguments:
+        Non_Null_Biome_ID
+    Usage:
+        biome id
+    Notes:
+        Sets the biome id. Can be an int or String.
+
 setGeneratorOptions:
    Arguments:
        String
@ -18,13 +26,9 @@ setGeneratorOptions:
    Notes:
        Sets the generator options string.

-setBiome:
-    Arguments:
-        Non_Null_Biome_ID
-    Usage:
-        biome id
+getLocationData:
    Notes:
-        Sets the biome id. Can be an int or String.
+        Returns the LocationData object so functions can be called on it.

 setWorldType:
    Arguments:
@ -42,10 +46,6 @@ setDimID:
    Notes:
        Sets the dimension id.

-getLocationData:
-    Notes:
-        Returns the LocationData object so functions can be called on it.
-
 setCount:
    Arguments:
        int
--- a/config/triumph/documentation/criteria/triggers/minecraft/nether_travel.txt
+++ b/config/triumph/documentation/criteria/triggers/minecraft/nether_travel.txt
@ -3,14 +3,6 @@ trigger.



-setEnteredGeneratorOptions:
-    Arguments:
-        String
-    Usage:
-        generator string
-    Notes:
-        Sets the generator options string.
-
 setEnteredWorldType:
    Arguments:
        String
@ -19,7 +11,7 @@ setEnteredWorldType:
    Notes:
        Sets the WorldType id.

-setExitedGeneratorOptions:
+setEnteredGeneratorOptions:
    Arguments:
        String
    Usage:
@ -27,14 +19,6 @@ setExitedGeneratorOptions:
    Notes:
        Sets the generator options string.

-setExitedWorldType:
-    Arguments:
-        String
-    Usage:
-        WorldType id
-    Notes:
-        Sets the WorldType id.
-
 setEnteredFeature:
    Arguments:
        String
@ -43,21 +27,21 @@ setEnteredFeature:
    Notes:
        Sets the feature id for the entered location. Used for things like structures.

-setEnteredBiome:
+setExitedGeneratorOptions:
    Arguments:
-        Non_Null_Biome_ID
+        String
    Usage:
-        biome id
+        generator string
    Notes:
-        Sets the biome id for the entered location. Can be an int or String.
+        Sets the generator options string.

-setExitedFeature:
+setExitedWorldType:
    Arguments:
        String
    Usage:
-        feature id
+        WorldType id
    Notes:
-        Sets the feature id for the exited location. Used for things like structures.
+        Sets the WorldType id.

 setExitedDimID:
    Arguments:
@ -67,21 +51,25 @@ setExitedDimID:
    Notes:
        Sets the dimension id.

-getDistanceData:
+setEnteredDimID:
+    Arguments:
+        int
+    Usage:
+        dimension id
    Notes:
-        Returns the DistanceData object so functions can be called on it.
+        Sets the dimension id.

 getExitedData:
    Notes:
        Returns the LocationData object for the exited location so functions can be called on it.

-setEnteredDimID:
+setExitedFeature:
    Arguments:
-        int
+        String
    Usage:
-        dimension id
+        feature id
    Notes:
-        Sets the dimension id.
+        Sets the feature id for the exited location. Used for things like structures.

 getEnteredData:
    Notes:
@ -95,6 +83,18 @@ setExitedBiome:
    Notes:
        Sets the biome id for the exited location. Can be an int or String.

+setEnteredBiome:
+    Arguments:
+        Non_Null_Biome_ID
+    Usage:
+        biome id
+    Notes:
+        Sets the biome id for the entered location. Can be an int or String.
+
+getDistanceData:
+    Notes:
+        Returns the DistanceData object so functions can be called on it.
+
 setCount:
    Arguments:
        int
--- a/config/triumph/documentation/criteria/triggers/minecraft/placed_block.txt
+++ b/config/triumph/documentation/criteria/triggers/minecraft/placed_block.txt
@ -26,6 +26,14 @@ setBlock:
    Notes:
        Sets the required block.

+setBiome:
+    Arguments:
+        Non_Null_Biome_ID
+    Usage:
+        biome id
+    Notes:
+        Sets the biome id. Can be an int or String.
+
 setGeneratorOptions:
    Arguments:
        String
@ -34,13 +42,9 @@ setGeneratorOptions:
    Notes:
        Sets the generator options string.

-setBiome:
-    Arguments:
-        Non_Null_Biome_ID
-    Usage:
-        biome id
+getLocationData:
    Notes:
-        Sets the biome id. Can be an int or String.
+        Returns the LocationData object so functions can be called on it.

 setWorldType:
    Arguments:
@ -58,10 +62,6 @@ setDimID:
    Notes:
        Sets the dimension id.

-getLocationData:
-    Notes:
-        Returns the LocationData object so functions can be called on it.
-
 setCount:
    Arguments:
        int
--- a/config/triumph/documentation/criteria/triggers/minecraft/slept_in_bed.txt
+++ b/config/triumph/documentation/criteria/triggers/minecraft/slept_in_bed.txt
@ -10,6 +10,14 @@ setFeature:
    Notes:
        Sets the feature id. Used for things like structures.

+setBiome:
+    Arguments:
+        Non_Null_Biome_ID
+    Usage:
+        biome id
+    Notes:
+        Sets the biome id. Can be an int or String.
+
 setGeneratorOptions:
    Arguments:
        String
@ -18,13 +26,9 @@ setGeneratorOptions:
    Notes:
        Sets the generator options string.

-setBiome:
-    Arguments:
-        Non_Null_Biome_ID
-    Usage:
-        biome id
+getLocationData:
    Notes:
-        Sets the biome id. Can be an int or String.
+        Returns the LocationData object so functions can be called on it.

 setWorldType:
    Arguments:
@ -42,10 +46,6 @@ setDimID:
    Notes:
        Sets the dimension id.

-getLocationData:
-    Notes:
-        Returns the LocationData object so functions can be called on it.
-
 setCount:
    Arguments:
        int
--- a/config/triumph/documentation/criteria/triggers/triumph/left_click_block.txt
+++ b/config/triumph/documentation/criteria/triggers/triumph/left_click_block.txt
@ -27,6 +27,14 @@ setBlock:
    Notes:
        Sets the required block.

+setBiome:
+    Arguments:
+        Non_Null_Biome_ID
+    Usage:
+        biome id
+    Notes:
+        Sets the biome id. Can be an int or String.
+
 setGeneratorOptions:
    Arguments:
        String
@ -35,13 +43,33 @@ setGeneratorOptions:
    Notes:
        Sets the generator options string.

-setBiome:
+getLocationData:
+    Notes:
+        Returns the LocationData object so functions can be called on it.
+
+setWorldType:
    Arguments:
-        Non_Null_Biome_ID
+        String
    Usage:
-        biome id
+        WorldType id
    Notes:
-        Sets the biome id. Can be an int or String.
+        Sets the WorldType id.
+
+setDimID:
+    Arguments:
+        int
+    Usage:
+        dimension id
+    Notes:
+        Sets the dimension id.
+
+setHitXMinMax:
+    Arguments:
+        float, float
+    Usage:
+        min, max
+    Notes:
+        Sets the min and max X coordinates for the interaction location on the block.

 setHitXMin:
    Arguments:
@ -59,13 +87,13 @@ setHitYMinMax:
    Notes:
        Sets the min and max Y coordinates for the interaction location on the block.

-setHitZMax:
+setHitYMin:
    Arguments:
        float
    Usage:
-        max
+        min
    Notes:
-        Sets the max Z coordinate for the interaction location on the block.
+        Sets the min Y coordinate for the interaction location on the block.

 setHitYMax:
    Arguments:
@ -75,14 +103,6 @@ setHitYMax:
    Notes:
        Sets the max Y coordinate for the interaction location on the block.

-setHitZMinMax:
-    Arguments:
-        float, float
-    Usage:
-        min, max
-    Notes:
-        Sets the min and max Z coordinates for the interaction location on the block.
-
 setHitXMax:
    Arguments:
        float
@ -91,14 +111,6 @@ setHitXMax:
    Notes:
        Sets the max X coordinate for the interaction location on the block.

-setHitXMinMax:
-    Arguments:
-        float, float
-    Usage:
-        min, max
-    Notes:
-        Sets the min and max X coordinates for the interaction location on the block.
-
 setHitZMin:
    Arguments:
        float
@ -107,33 +119,21 @@ setHitZMin:
    Notes:
        Sets the min Z coordinate for the interaction location on the block.

-setHitYMin:
-    Arguments:
-        float
-    Usage:
-        min
-    Notes:
-        Sets the min Y coordinate for the interaction location on the block.
-
-setWorldType:
+setHitZMinMax:
    Arguments:
-        String
+        float, float
    Usage:
-        WorldType id
+        min, max
    Notes:
-        Sets the WorldType id.
+        Sets the min and max Z coordinates for the interaction location on the block.

-setDimID:
+setHitZMax:
    Arguments:
-        int
+        float
    Usage:
-        dimension id
-    Notes:
-        Sets the dimension id.
-
-getLocationData:
+        max
    Notes:
-        Returns the LocationData object so functions can be called on it.
+        Sets the max Z coordinate for the interaction location on the block.

 setCount:
    Arguments:
--- a/config/triumph/documentation/criteria/triggers/triumph/player_break_block.txt
+++ b/config/triumph/documentation/criteria/triggers/triumph/player_break_block.txt
@ -28,6 +28,14 @@ setBlock:
    Notes:
        Sets the required block.

+setBiome: