Update and adjustments.

master
YandolsZX 6 years ago
parent c3f06c1052
commit 99c73d5933
  1. 2
      .gitignore
  2. 1
      Changelog.txt
  3. 4
      config/Waystones.cfg
  4. 106
      config/antiqueatlas/biome_textures.json
  5. 2
      config/jei/worldSettings.cfg
  6. 6
      config/multimob/modInformation/allBiomeTypes.txt
  7. 23232
      config/multimob/modInformation/allBlockStates.txt
  8. 110
      config/multimob/modInformation/allBlocks.txt
  9. 6
      config/multimob/modInformation/allEntities.txt
  10. 140
      config/multimob/modInformation/allItems.txt
  11. 2
      config/splash.properties
  12. 10
      config/teastory.cfg
  13. 56
      config/triumph/documentation/Triumph.txt
  14. 16
      config/triumph/documentation/criteria/triggers/botania_tweaks/flower_generated_mana.txt
  15. 16
      config/triumph/documentation/criteria/triggers/immersiveengineering/multiblock_formed.txt
  16. 20
      config/triumph/documentation/criteria/triggers/minecraft/bred_animals.txt
  17. 16
      config/triumph/documentation/criteria/triggers/minecraft/construct_beacon.txt
  18. 12
      config/triumph/documentation/criteria/triggers/minecraft/cured_zombie_villager.txt
  19. 16
      config/triumph/documentation/criteria/triggers/minecraft/enchanted_item.txt
  20. 54
      config/triumph/documentation/criteria/triggers/minecraft/inventory_changed.txt
  21. 16
      config/triumph/documentation/criteria/triggers/minecraft/item_durability_changed.txt
  22. 16
      config/triumph/documentation/criteria/triggers/minecraft/levitation.txt
  23. 24
      config/triumph/documentation/criteria/triggers/minecraft/location.txt
  24. 84
      config/triumph/documentation/criteria/triggers/minecraft/nether_travel.txt
  25. 46
      config/triumph/documentation/criteria/triggers/minecraft/placed_block.txt
  26. 24
      config/triumph/documentation/criteria/triggers/minecraft/slept_in_bed.txt
  27. 16
      config/triumph/documentation/criteria/triggers/minecraft/villager_trade.txt
  28. 84
      config/triumph/documentation/criteria/triggers/triumph/left_click_block.txt
  29. 46
      config/triumph/documentation/criteria/triggers/triumph/player_break_block.txt
  30. 46
      config/triumph/documentation/criteria/triggers/triumph/player_destroy_block.txt
  31. 46
      config/triumph/documentation/criteria/triggers/triumph/player_harvest_block.txt
  32. 84
      config/triumph/documentation/criteria/triggers/triumph/right_click_block.txt
  33. 36
      config/triumph/documentation/criteria/triggers/triumph/right_click_item.txt
  34. 36
      config/triumph/documentation/dataObjects/DamageData.txt
  35. 32
      config/triumph/documentation/dataObjects/DamageSourceData.txt
  36. 66
      config/triumph/documentation/dataObjects/DistanceData.txt
  37. 38
      config/triumph/documentation/dataObjects/EntityData.txt
  38. 92
      config/triumph/documentation/dataObjects/LocationData.txt
  39. 46
      config/triumph/documentation/dataObjects/PotionEffectData.txt
  40. 356
      config/triumph/documentation/script/ScriptAdvancement.txt
  41. 2
      config/vanillafix.cfg
  42. 2
      config/weirdinggadget.cfg
  43. 8
      config/wings/ores.cfg
  44. BIN
      libraries/libloader mod state.obj
  45. BIN
      llibrary/debug/net.minecraft.server.MinecraftServer.class
  46. 6
      mods/zcm-na/assets/zcm_newalterlite/blockstates/alterlitiumore.json
  47. 1
      mods/zcm-na/assets/zcm_newalterlite/lang/en_US.lang
  48. 6
      mods/zcm-na/assets/zcm_newalterlite/models/block/alterlitiumore.json
  49. 6
      mods/zcm-na/assets/zcm_newalterlite/models/item/attunedpearl.json
  50. 6
      mods/zcm-na/assets/zcm_newalterlite/models/item/sunlime.json
  51. BIN
      mods/zcm-na/assets/zcm_newalterlite/textures/blocks/alterlitiumore.png
  52. BIN
      mods/zcm-na/assets/zcm_newalterlite/textures/items/attunedpearl.png
  53. BIN
      mods/zcm-na/assets/zcm_newalterlite/textures/items/sunlime.png
  54. 6
      mods/zcm-na/items.json
  55. 2
      options.txt
  56. 8
      patchouli_data.json
  57. 45
      scripts/01adjustments.zs
  58. 7
      scripts/05alterlitiumrecipes.zs
  59. 2
      scripts/recipes.zs

2
.gitignore vendored

@ -7,7 +7,7 @@
/downloads/*
/logs/*
/mods/*
!/mods/zcm-alterlite
!/mods/zcm-ca
!/mods/zcm-na
/saves/*
/screenshots/*

@ -27,6 +27,7 @@ A02-0008:
- Removed Bed Bugs mod (superseded by VanillaFix).
- Removed Felling mod.
- Removed Future MC mod.
- Removed Sleeping Overhaul as well as it's dependency TickrateChanger.
- Removed Third Person Camera Fix (superseded by VanillaFix).
----------------------------------------------------------------

@ -63,10 +63,10 @@ general {
B:"No Cooldown on Global Waystones"=true
# Whether the use of a warp stone or warp scroll should be interrupted by damage. Not supported when playing with Vivecraft!
B:"Reset Use On Damage"=false
B:"Reset Use On Damage"=true
# If enabled, only the owner of a waystone can rename it.
B:"Restrict Rename to Owner"=false
B:"Restrict Rename to Owner"=true
# If enabled, the player's spawnpoint will be set to the last activated waystone.
B:"Set Spawnpoint on Activation"=false

@ -1,69 +1,69 @@
{
"version": 2,
"data": {
"minecraft:plains": "PLAINS",
"minecraft:extreme_hills": "MOUNTAINS",
"minecraft:mutated_forest": "FOREST_FLOWERS",
"traverse:green_swamp": "SWAMP",
"minecraft:void": "END_VOID",
"minecraft:frozen_ocean": "ICE",
"minecraft:birch_forest_hills": "BIRCH_HILLS",
"minecraft:jungle_edge": "JUNGLE_EDGE",
"minecraft:roofed_forest": "DENSE_FOREST",
"minecraft:ice_flats": "SNOW",
"minecraft:ocean": "WATER",
"minecraft:desert_hills": "DESERT_HILLS",
"minecraft:smaller_extreme_hills": "MOUNTAINS",
"minecraft:hell": "CAVE_WALLS",
"minecraft:mutated_redwood_taiga_hills": "MEGA_SPRUCE_HILLS",
"minecraft:mutated_birch_forest": "TALL_BIRCH",
"minecraft:deep_ocean": "WATER",
"minecraft:forest": "FOREST",
"minecraft:desert": "DESERT",
"traverse:rocky_plateau": "MOUNTAINS_NAKED",
"minecraft:savanna_rock": "PLATEAU_SAVANNA",
"minecraft:mushroom_island": "MUSHROOM",
"minecraft:ice_flats": "SNOW",
"minecraft:stone_beach": "ROCK_SHORE",
"minecraft:beaches": "SHORE",
"minecraft:mutated_birch_forest_hills": "TALL_BIRCH_HILLS",
"minecraft:mutated_forest": "FOREST_FLOWERS",
"minecraft:mutated_plains": "SUNFLOWERS",
"minecraft:birch_forest": "BIRCH",
"minecraft:ice_mountains": "SNOW_HILLS",
"minecraft:mesa_clear_rock": "PLATEAU_MESA",
"minecraft:mutated_savanna": "SAVANNA_CLIFFS",
"minecraft:mutated_mesa": "BRYCE",
"minecraft:plains": "PLAINS",
"minecraft:mutated_desert": "DESERT",
"minecraft:mesa": "MESA",
"minecraft:swampland": "SWAMP",
"minecraft:mutated_extreme_hills_with_trees": "MOUNTAINS_SNOW_CAPS",
"minecraft:forest_hills": "FOREST_HILLS",
"minecraft:sky": "SHORE",
"minecraft:deep_ocean": "WATER",
"minecraft:forest": "FOREST",
"minecraft:mutated_savanna_rock": "PLATEAU_SAVANNA_M",
"minecraft:mutated_birch_forest": "TALL_BIRCH",
"minecraft:mutated_roofed_forest": "DENSE_FOREST_HILLS",
"minecraft:mutated_extreme_hills": "MOUNTAINS_SNOW_CAPS",
"minecraft:mutated_desert": "DESERT",
"minecraft:taiga_cold": "SNOW_PINES",
"minecraft:mutated_mesa": "BRYCE",
"minecraft:mutated_taiga": "PINES_HILLS",
"minecraft:mutated_taiga_cold": "SNOW_PINES_HILLS",
"minecraft:cold_beach": "SHORE",
"minecraft:mutated_ice_flats": "ICE_SPIKES",
"minecraft:mutated_savanna_rock": "PLATEAU_SAVANNA_M",
"minecraft:savanna": "SAVANNA",
"minecraft:mutated_mesa_rock": "PLATEAU_MESA_TREES_LOW",
"minecraft:mutated_mesa_clear_rock": "PLATEAU_MESA_LOW",
"minecraft:void": "END_VOID",
"minecraft:taiga_cold_hills": "SNOW_PINES_HILLS",
"minecraft:savanna_rock": "PLATEAU_SAVANNA",
"minecraft:jungle_hills": "JUNGLE_HILLS",
"traverse:rocky_plateau": "MOUNTAINS_NAKED",
"minecraft:mesa_clear_rock": "PLATEAU_MESA",
"minecraft:mutated_jungle_edge": "JUNGLE_EDGE_HILLS",
"minecraft:birch_forest_hills": "BIRCH_HILLS",
"minecraft:ocean": "WATER",
"minecraft:roofed_forest": "DENSE_FOREST",
"minecraft:frozen_river": "ICE",
"minecraft:redwood_taiga": "MEGA_TAIGA",
"minecraft:redwood_taiga_hills": "MEGA_TAIGA_HILLS",
"minecraft:mutated_jungle": "JUNGLE_CLIFFS",
"minecraft:mutated_taiga_cold": "SNOW_PINES_HILLS",
"minecraft:mutated_redwood_taiga": "MEGA_SPRUCE",
"minecraft:mesa_rock": "PLATEAU_MESA_TREES",
"minecraft:mutated_mesa_rock": "PLATEAU_MESA_TREES_LOW",
"minecraft:forest_hills": "FOREST_HILLS",
"minecraft:mutated_savanna": "SAVANNA_CLIFFS",
"minecraft:desert_hills": "DESERT_HILLS",
"minecraft:extreme_hills_with_trees": "MOUNTAINS_ALL",
"minecraft:mutated_taiga": "PINES_HILLS",
"minecraft:mutated_redwood_taiga_hills": "MEGA_SPRUCE_HILLS",
"minecraft:taiga_cold": "SNOW_PINES",
"minecraft:birch_forest": "BIRCH",
"minecraft:redwood_taiga_hills": "MEGA_TAIGA_HILLS",
"minecraft:stone_beach": "ROCK_SHORE",
"minecraft:hell": "CAVE_WALLS",
"minecraft:extreme_hills": "MOUNTAINS",
"minecraft:redwood_taiga": "MEGA_TAIGA",
"minecraft:ice_mountains": "SNOW_HILLS",
"minecraft:mutated_extreme_hills": "MOUNTAINS_SNOW_CAPS",
"minecraft:jungle": "JUNGLE",
"minecraft:mutated_extreme_hills_with_trees": "MOUNTAINS_SNOW_CAPS",
"minecraft:jungle_hills": "JUNGLE_HILLS",
"minecraft:savanna": "SAVANNA",
"minecraft:mutated_swampland": "SWAMP_HILLS",
"minecraft:frozen_ocean": "ICE",
"minecraft:mushroom_island_shore": "SHORE",
"minecraft:jungle_edge": "JUNGLE_EDGE",
"minecraft:mutated_jungle": "JUNGLE_CLIFFS",
"minecraft:taiga_hills": "PINES_HILLS",
"minecraft:mutated_ice_flats": "ICE_SPIKES",
"minecraft:river": "WATER",
"minecraft:mutated_swampland": "SWAMP_HILLS",
"traverse:green_swamp": "SWAMP",
"minecraft:extreme_hills_with_trees": "MOUNTAINS_ALL",
"minecraft:taiga": "PINES",
"minecraft:mutated_redwood_taiga": "MEGA_SPRUCE",
"minecraft:swampland": "SWAMP",
"minecraft:beaches": "SHORE",
"minecraft:mesa": "MESA",
"minecraft:mutated_mesa_clear_rock": "PLATEAU_MESA_LOW",
"minecraft:mutated_birch_forest_hills": "TALL_BIRCH_HILLS",
"minecraft:river": "WATER"
"minecraft:cold_beach": "SHORE",
"minecraft:mushroom_island": "MUSHROOM",
"minecraft:frozen_river": "ICE",
"minecraft:taiga_hills": "PINES_HILLS"
}
}

@ -11,7 +11,7 @@ world-1600429788 {
# Hide and unhide ingredients by clicking them in the list.
B:editEnabled=false
S:filterText=coin
S:filterText=barrel
# Show the list of ingredients next to open GUIs.
B:overlayEnabled=true

@ -1,14 +1,14 @@
OCEAN
WATER
OCEAN
PLAINS
DRY
HOT
SANDY
MOUNTAIN
HILLS
MOUNTAIN
FOREST
CONIFEROUS
COLD
CONIFEROUS
WET
SWAMP
RIVER

File diff suppressed because it is too large Load Diff

@ -718,59 +718,6 @@ quark:stone_basalt_slab_double
quark:stone_basalt_stairs
quark:basalt_wall
quark:smoker
quark:chute
quark:sugar_block
quark:redstone_randomizer
quark:iron_button
quark:gold_button
quark:ender_watcher
quark:iron_rod
quark:obsidian_pressure_plate
quark:rain_detector
quark:spruce_trapdoor
quark:birch_trapdoor
quark:jungle_trapdoor
quark:acacia_trapdoor
quark:dark_oak_trapdoor
quark:paper_wall
quark:paper_wall_big
quark:iron_ladder
quark:paper_lantern
quark:colored_flowerpot_white
quark:colored_flowerpot_orange
quark:colored_flowerpot_magenta
quark:colored_flowerpot_light_blue
quark:colored_flowerpot_yellow
quark:colored_flowerpot_lime
quark:colored_flowerpot_pink
quark:colored_flowerpot_gray
quark:colored_flowerpot_silver
quark:colored_flowerpot_cyan
quark:colored_flowerpot_purple
quark:colored_flowerpot_blue
quark:colored_flowerpot_brown
quark:colored_flowerpot_green
quark:colored_flowerpot_red
quark:colored_flowerpot_black
quark:custom_bookshelf
quark:lit_lamp
quark:custom_chest
quark:custom_chest_trap
quark:candle
quark:blaze_lantern
quark:nether_brick_fence_gate
quark:leaf_carpet
quark:spruce_pressure_plate
quark:birch_pressure_plate
quark:jungle_pressure_plate
quark:acacia_pressure_plate
quark:dark_oak_pressure_plate
quark:spruce_button
quark:birch_button
quark:jungle_button
quark:acacia_button
quark:dark_oak_button
quark:charcoal_block
quark:sandstone_new
quark:sandstone_bricks_stairs
quark:red_sandstone_bricks_stairs
@ -989,9 +936,62 @@ quark:polished_netherrack_bricks_slab
quark:polished_netherrack_bricks_slab_double
quark:polished_netherrack_bricks_wall
quark:quilted_wool
quark:spruce_trapdoor
quark:birch_trapdoor
quark:jungle_trapdoor
quark:acacia_trapdoor
quark:dark_oak_trapdoor
quark:paper_wall
quark:paper_wall_big
quark:iron_ladder
quark:paper_lantern
quark:colored_flowerpot_white
quark:colored_flowerpot_orange
quark:colored_flowerpot_magenta
quark:colored_flowerpot_light_blue
quark:colored_flowerpot_yellow
quark:colored_flowerpot_lime
quark:colored_flowerpot_pink
quark:colored_flowerpot_gray
quark:colored_flowerpot_silver
quark:colored_flowerpot_cyan
quark:colored_flowerpot_purple
quark:colored_flowerpot_blue
quark:colored_flowerpot_brown
quark:colored_flowerpot_green
quark:colored_flowerpot_red
quark:colored_flowerpot_black
quark:custom_bookshelf
quark:lit_lamp
quark:custom_chest
quark:custom_chest_trap
quark:candle
quark:blaze_lantern
quark:nether_brick_fence_gate
quark:leaf_carpet
quark:spruce_pressure_plate
quark:birch_pressure_plate
quark:jungle_pressure_plate
quark:acacia_pressure_plate
quark:dark_oak_pressure_plate
quark:spruce_button
quark:birch_button
quark:jungle_button
quark:acacia_button
quark:dark_oak_button
quark:charcoal_block
quark:glowstone_dust_block
quark:gunpowder_block
quark:black_ash
quark:chute
quark:sugar_block
quark:redstone_randomizer
quark:iron_button
quark:gold_button
quark:ender_watcher
quark:iron_rod
quark:obsidian_pressure_plate
quark:rain_detector
bettermuffling:muffling_block
bitcoin:bitcoin_ore
bitcoin:bitcoin_block
@ -1137,8 +1137,6 @@ immersiveengineering:fluidplantoil
immersiveengineering:fluidethanol
immersiveengineering:fluidbiodiesel
immersiveengineering:fluidconcrete
engineersdoors:trapdoor_steel
engineersdoors:trapdoor_treated
engineersdoors:door_concrete
engineersdoors:door_concrete_ornate
engineersdoors:door_concrete_reinforced
@ -1151,6 +1149,8 @@ engineersdoors:door_treated_reinforced
engineersdoors:fencegate_aluminium
engineersdoors:fencegate_steel
engineersdoors:fencegate_treated
engineersdoors:trapdoor_steel
engineersdoors:trapdoor_treated
extendedcrafting:storage
extendedcrafting:frame
extendedcrafting:lamp

@ -240,18 +240,18 @@ naturesaura:effect_inhibitor
naturesaura:mover_cart
quark:pirate
quark:archeologist
quark:seat
quark:chest_passenger
quark:totem_of_holding
quark:flat_item_frame
quark:colored_item_frame
quark:glass_item_frame
quark:chest_passenger
quark:seat
quark:arrow_ender
quark:arrow_explosive
quark:arrow_torch
quark:dragon_breath_bottle
quark:soul_powder
quark:parrot_egg
quark:totem_of_holding
betternether:firefly
thermalfoundation:blizz
thermalfoundation:blitz

@ -2080,64 +2080,6 @@ quark:stone_basalt_slab
quark:stone_basalt_stairs
quark:basalt_wall
quark:smoker
quark:chute
quark:sugar_block
quark:redstone_randomizer
quark:iron_button
quark:gold_button
quark:ender_watcher
quark:iron_rod
quark:obsidian_pressure_plate
quark:rain_detector
quark:soul_compass
quark:backpack
quark:spruce_trapdoor
quark:birch_trapdoor
quark:jungle_trapdoor
quark:acacia_trapdoor
quark:dark_oak_trapdoor
quark:paper_wall
quark:paper_wall_big
quark:iron_ladder
quark:paper_lantern
quark:colored_flowerpot_white
quark:colored_flowerpot_orange
quark:colored_flowerpot_magenta
quark:colored_flowerpot_light_blue
quark:colored_flowerpot_yellow
quark:colored_flowerpot_lime
quark:colored_flowerpot_pink
quark:colored_flowerpot_gray
quark:colored_flowerpot_silver
quark:colored_flowerpot_cyan
quark:colored_flowerpot_purple
quark:colored_flowerpot_blue
quark:colored_flowerpot_brown
quark:colored_flowerpot_green
quark:colored_flowerpot_red
quark:colored_flowerpot_black
quark:custom_bookshelf
quark:colored_item_frame
quark:lit_lamp
quark:custom_chest
quark:custom_chest_trap
quark:candle
quark:tallow
quark:blaze_lantern
quark:nether_brick_fence_gate
quark:leaf_carpet
quark:spruce_pressure_plate
quark:birch_pressure_plate
quark:jungle_pressure_plate
quark:acacia_pressure_plate
quark:dark_oak_pressure_plate
quark:spruce_button
quark:birch_button
quark:jungle_button
quark:acacia_button
quark:dark_oak_button
quark:charcoal_block
quark:glass_item_frame
quark:sandstone_new
quark:sandstone_bricks_stairs
quark:red_sandstone_bricks_stairs
@ -2303,6 +2245,53 @@ quark:polished_netherrack_bricks_slab
quark:polished_netherrack_bricks_wall
quark:trowel
quark:quilted_wool
quark:spruce_trapdoor
quark:birch_trapdoor
quark:jungle_trapdoor
quark:acacia_trapdoor
quark:dark_oak_trapdoor
quark:paper_wall
quark:paper_wall_big
quark:iron_ladder
quark:paper_lantern
quark:colored_flowerpot_white
quark:colored_flowerpot_orange
quark:colored_flowerpot_magenta
quark:colored_flowerpot_light_blue
quark:colored_flowerpot_yellow
quark:colored_flowerpot_lime
quark:colored_flowerpot_pink
quark:colored_flowerpot_gray
quark:colored_flowerpot_silver
quark:colored_flowerpot_cyan
quark:colored_flowerpot_purple
quark:colored_flowerpot_blue
quark:colored_flowerpot_brown
quark:colored_flowerpot_green
quark:colored_flowerpot_red
quark:colored_flowerpot_black
quark:custom_bookshelf
quark:colored_item_frame
quark:lit_lamp
quark:custom_chest
quark:custom_chest_trap
quark:candle
quark:tallow
quark:blaze_lantern
quark:nether_brick_fence_gate
quark:leaf_carpet
quark:spruce_pressure_plate
quark:birch_pressure_plate
quark:jungle_pressure_plate
quark:acacia_pressure_plate
quark:dark_oak_pressure_plate
quark:spruce_button
quark:birch_button
quark:jungle_button
quark:acacia_button
quark:dark_oak_button
quark:charcoal_block
quark:glass_item_frame
quark:glowstone_dust_block
quark:gunpowder_block
quark:arrow_ender
@ -2315,6 +2304,17 @@ quark:ancient_tome
quark:soul_powder
quark:parrot_egg
quark:enderdragon_scale
quark:chute
quark:sugar_block
quark:redstone_randomizer
quark:iron_button
quark:gold_button
quark:ender_watcher
quark:iron_rod
quark:obsidian_pressure_plate
quark:rain_detector
quark:soul_compass
quark:backpack
bettermuffling:muffling_block
bitcoin:bitcoin_ore
bitcoin:bitcoin_block
@ -2554,8 +2554,6 @@ immersiveengineering:powerpack
immersiveengineering:shield
immersiveengineering:maintenance_kit
immersiveengineering:fake_icon
engineersdoors:trapdoor_steel
engineersdoors:trapdoor_treated
engineersdoors:door_concrete
engineersdoors:door_concrete_ornate
engineersdoors:door_concrete_reinforced
@ -2568,6 +2566,8 @@ engineersdoors:door_treated_reinforced
engineersdoors:fencegate_aluminium
engineersdoors:fencegate_steel
engineersdoors:fencegate_treated
engineersdoors:trapdoor_steel
engineersdoors:trapdoor_treated
extendedcrafting:storage
extendedcrafting:frame
extendedcrafting:lamp
@ -2748,15 +2748,6 @@ stevescarts:blockmetalstorage
stevescarts:modularcart
stevescarts:modulecomponents
stevescarts:cartmodule
storagedrawers:basicdrawers
storagedrawers:keybutton
storagedrawers:compdrawers
storagedrawers:controller
storagedrawers:controllerslave
storagedrawers:trim
storagedrawers:framingtable
storagedrawers:customdrawers
storagedrawers:customtrim
storagedrawers:upgrade_template
storagedrawers:upgrade_storage
storagedrawers:upgrade_one_stack
@ -2770,6 +2761,15 @@ storagedrawers:shroud_key
storagedrawers:personal_key
storagedrawers:quantify_key
storagedrawers:tape
storagedrawers:basicdrawers
storagedrawers:keybutton
storagedrawers:compdrawers
storagedrawers:controller
storagedrawers:controllerslave
storagedrawers:trim
storagedrawers:framingtable
storagedrawers:customdrawers
storagedrawers:customtrim
traverse:red_autumnal_leaves
traverse:red_autumnal_sapling
traverse:brown_autumnal_leaves
@ -2892,6 +2892,8 @@ zcm_comalterlite:belt
zcm_newalterlite:alterlitium
zcm_newalterlite:emptyscroll
zcm_newalterlite:parchment
zcm_newalterlite:attunedpearl
zcm_newalterlite:sunlime
zcm_newalterlite:alterlitiumore
zcm_newalterlite:alterlitiumblock
aroma1997sdimension:portalframe

@ -1,5 +1,5 @@
#Splash screen properties
#Wed May 01 06:04:30 SGT 2019
#Thu May 02 04:40:32 SGT 2019
background=0x41454A
memoryGood=0x1E2D41
font=0xCCCCCC

@ -43,7 +43,7 @@ general {
# The ticks of the effect of black tea. (1 second = 20 ticks)
# Min: 0
# Max: 72000
I:BlackTeaDrinksEffectTime=3600
I:BlackTeaDrinksEffectTime=7200
# The effect of green tea.
S:GreenTeaDrinksEffect=teastory:agility
@ -51,7 +51,7 @@ general {
# The ticks of the effect of green tea. (1 second = 20 ticks)
# Min: 0
# Max: 72000
I:GreenTeaDrinksEffectTime=3600
I:GreenTeaDrinksEffectTime=7200
# The effect of lemon tea.
S:LemonTeaDrinksEffect=minecraft:regeneration
@ -59,7 +59,7 @@ general {
# The ticks of the effect of lemon tea. (1 second = 20 ticks)
# Min: 0
# Max: 72000
I:LemonTeaDrinksEffectTime=800
I:LemonTeaDrinksEffectTime=1200
# The effect of matcha.
S:MatchaDrinksEffect=minecraft:absorption
@ -75,7 +75,7 @@ general {
# The ticks of the effect of milk tea. (1 second = 20 ticks)
# Min: 0
# Max: 72000
I:MilkTeaDrinksEffectTime=800
I:MilkTeaDrinksEffectTime=600
# The effect of oolong tea.
S:OolongTeaDrinksEffect=teastory:photosynthesis
@ -83,7 +83,7 @@ general {
# The ticks of the effect of oolong tea. (1 second = 20 ticks)
# Min: 0
# Max: 72000
I:OolongTeaDrinksEffectTime=3600
I:OolongTeaDrinksEffectTime=7200
# The effect of pu'er tea.
S:PuerTeaDrinksEffect=teastory:life_drain

@ -3,13 +3,13 @@ and documentation will be printed.
keepAdvancements:
pageOrder:
Arguments:
String array
Default Values:
true
Usage:
Array of root advancement resource location
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.
Forces an order for advancement pages in the gui. Any not added to this array are ordered alphabetically.
allowDragging:
Arguments:
@ -19,34 +19,10 @@ allowDragging:
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.
removeModAdvancements:
Arguments:
boolean
Default Values:
true
Notes:
Used to set whether Triumph should remove mod advancements.
removeAdvancements:
Arguments:
String array
Default Values:
true
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.
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.
removeVanillaAdvancements:
Arguments:
boolean
@ -77,3 +53,27 @@ printDocumentation:
Notes:
Used to set whether Triumph should print config documentation.
removeModAdvancements:
Arguments:
boolean
Default Values:
true
Notes:
Used to set whether Triumph should remove mod advancements.
removeAdvancements:
Arguments:
String array
Default Values:
true
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.
keepAdvancements:
Arguments:
String array
Default Values:
true
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.

@ -4,14 +4,6 @@ of mana with a certain flower.
setRequiredMana:
Arguments:
long
Usage:
required mana
Notes:
Sets the required mana for the flower to have generated.
setFlower:
Arguments:
String
@ -20,6 +12,14 @@ setFlower:
Notes:
Sets the required flower.
setRequiredMana:
Arguments:
long
Usage:
required mana
Notes:
Sets the required mana for the flower to have generated.
setCount:
Arguments:
int

@ -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

@ -3,6 +3,10 @@ trigger.
getParentData:
Notes:
Returns the EntityData object for the parent so functions can be called on it.
setParentType:
Arguments:
String
@ -11,33 +15,29 @@ setParentType:
Notes:
Sets the parent entity type.
setPartnerType:
setChildType:
Arguments:
String
Usage:
entity type
Notes:
Sets the partner entity type.
getPartnerData:
Notes:
Returns the EntityData object for the partner so functions can be called on it.
Sets the child entity type.
getChildData:
Notes:
Returns the EntityData object for the child so functions can be called on it.
setChildType:
setPartnerType:
Arguments:
String
Usage:
entity type
Notes:
Sets the child entity type.
Sets the partner entity type.
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.
setCount:
Arguments:

@ -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

@ -3,6 +3,10 @@ criteria trigger.
getVillagerData:
Notes:
Returns the EntityData object for the villager so functions can be called on it.
setVillagerType:
Arguments:
String
@ -11,10 +15,6 @@ setVillagerType:
Notes:
Sets the villager entity type.
getZombieData:
Notes:
Returns the EntityData object for the zombie so functions can be called on it.
setZombieType:
Arguments:
String
@ -23,9 +23,9 @@ setZombieType:
Notes:
Sets the zombie entity type.
getVillagerData:
getZombieData:
Notes:
Returns the EntityData object for the villager so functions can be called on it.
Returns the EntityData object for the zombie so functions can be called on it.
setCount:
Arguments:

@ -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

@ -11,13 +11,13 @@ addItem:
Notes:
Adds a required item.
setOccupiedMinMax:
setFullMin:
Arguments:
float, float
float
Usage:
min, max
min
Notes:
Sets the min and max values for occupied inventory slots.
Sets the min value for full inventory slots.
setOccupiedMin:
Arguments:
@ -27,29 +27,21 @@ setOccupiedMin:
Notes:
Sets the min value for occupied inventory slots.
setOccupiedMax:
Arguments:
float
Usage:
max
Notes:
Sets the max value for occupied inventory slots.
setEmptyMin:
setEmptyMinMax:
Arguments:
float
float, float
Usage:
min
min, max
Notes:
Sets the min value for empty 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.
setFullMinMax:
Arguments:
@ -59,6 +51,14 @@ setFullMinMax:
Notes:
Sets the min and max values for full inventory slots.
setEmptyMin:
Arguments:
float
Usage:
min
Notes:
Sets the min value for empty inventory slots.
setFullMax:
Arguments:
float
@ -67,21 +67,21 @@ setFullMax:
Notes:
Sets the max value for full inventory slots.
setEmptyMinMax:
setOccupiedMax:
Arguments:
float, float
float
Usage:
min, max
max
Notes:
Sets the min and max values for empty inventory slots.
Sets the max value for occupied inventory slots.
setEmptyMax:
setOccupiedMinMax:
Arguments:
float
float, float
Usage:
max
min, max
Notes:
Sets the max value for empty inventory slots.
Sets the min and max values for occupied inventory slots.
setCount:
Arguments:

@ -3,14 +3,6 @@ criteria trigger.
setItem:
Arguments:
ItemBlockData
Usage:
item data
Notes:
Sets the required item.
setDurabilityMax:
Arguments:
float
@ -59,6 +51,14 @@ setDurabilityMinMax:
Notes:
Sets the min and max item durability.
setItem:
Arguments:
ItemBlockData
Usage:
item data
Notes:
Sets the required item.
setCount:
Arguments:
int

@ -2,13 +2,9 @@ These are the functions which can be called on a minecraft:levitation criteria t
setDurationMinMax:
Arguments:
float, float
Usage:
min, max
getDistanceData:
Notes:
Sets the min and max duration.
Returns the DistanceData object so functions can be called on it.
setDurationMin:
Arguments:
@ -26,9 +22,13 @@ setDurationMax:
Notes:
Sets the max duration.
getDistanceData:
setDurationMinMax:
Arguments:
float, float
Usage:
min, max
Notes:
Returns the DistanceData object so functions can be called on it.
Sets the min and max duration.
setCount:
Arguments:

@ -10,13 +10,17 @@ setFeature:
Notes:
Sets the feature id. Used for things like structures.
setDimID:
setWorldType:
Arguments:
int
String
Usage:
dimension id
WorldType id
Notes:
Sets the dimension id.
Sets the WorldType id.
getLocationData:
Notes:
Returns the LocationData object so functions can be called on it.
setBiome:
Arguments:
@ -26,17 +30,13 @@ setBiome:
Notes:
Sets the biome id. Can be an int or String.
setWorldType:
setDimID:
Arguments:
String
int
Usage:
WorldType id
Notes:
Sets the WorldType id.
getLocationData:
dimension id
Notes:
Returns the LocationData object so functions can be called on it.
Sets the dimension id.
setGeneratorOptions:
Arguments:

@ -3,45 +3,25 @@ trigger.
setEnteredGeneratorOptions:
Arguments:
String
Usage:
generator string
getDistanceData:
Notes:
Sets the generator options string.
Returns the DistanceData object so functions can be called on it.
setEnteredWorldType:
setEnteredBiome:
Arguments:
String
Non_Null_Biome_ID
Usage:
WorldType id
biome id
Notes:
Sets the WorldType id.
Sets the biome id for the entered location. Can be an int or String.
setEnteredFeature:
setExitedFeature:
Arguments:
String
Usage:
feature id
Notes:
Sets the feature id for the entered location. Used for things like structures.
setExitedWorldType:
Arguments:
String
Usage:
WorldType id
Notes:
Sets the WorldType id.
setExitedGeneratorOptions:
Arguments:
String
Usage:
generator string
Notes:
Sets the generator options string.
Sets the feature id for the exited location. Used for things like structures.
getEnteredData:
Notes:
@ -63,13 +43,9 @@ setExitedBiome:
Notes:
Sets the biome id for the exited location. Can be an int or String.
setExitedFeature:
Arguments:
String
Usage:
feature id
getExitedData:
Notes:
Sets the feature id for the exited location. Used for things like structures.
Returns the LocationData object for the exited location so functions can be called on it.
setExitedDimID:
Arguments:
@ -79,21 +55,45 @@ setExitedDimID:
Notes:
Sets the dimension id.
setEnteredBiome:
setEnteredFeature:
Arguments:
Non_Null_Biome_ID
String
Usage:
biome id
feature id
Notes:
Sets the biome id for the entered location. Can be an int or String.
Sets the feature id for the entered location. Used for things like structures.
getExitedData:
setEnteredWorldType:
Arguments:
String
Usage:
WorldType id
Notes:
Returns the LocationData object for the exited location so functions can be called on it.
Sets the WorldType id.
getDistanceData:
setEnteredGeneratorOptions:
Arguments:
String
Usage:
generator string
Notes:
Returns the DistanceData object so functions can be called on it.
Sets the generator options string.
setExitedWorldType:
Arguments:
String
Usage:
WorldType id
Notes:
Sets the WorldType id.
setExitedGeneratorOptions:
Arguments:
String
Usage:
generator string
Notes:
Sets the generator options string.
setCount:
Arguments:

@ -10,21 +10,25 @@ setFeature:
Notes:
Sets the feature id. Used for things like structures.
setItem:
setWorldType:
Arguments:
ItemBlockData
String
Usage:
item data
WorldType id
Notes:
Sets the required item.
Sets the WorldType id.
setBlock:
getLocationData:
Notes:
Returns the LocationData object so functions can be called on it.
setBiome:
Arguments:
ItemBlockData
Non_Null_Biome_ID
Usage:
block data
biome id
Notes:
Sets the required block.
Sets the biome id. Can be an int or String.
setDimID:
Arguments:
@ -34,33 +38,29 @@ setDimID:
Notes:
Sets the dimension id.
setBiome:
setBlock:
Arguments:
Non_Null_Biome_ID
ItemBlockData
Usage:
biome id
block data
Notes:
Sets the biome id. Can be an int or String.
Sets the required block.
setWorldType:
setGeneratorOptions:
Arguments:
String
Usage:
WorldType id
Notes:
Sets the WorldType id.
getLocationData:
generator string
Notes:
Returns the LocationData object so functions can be called on it.
Sets the generator options string.
setGeneratorOptions:
setItem:
Arguments:
String
ItemBlockData
Usage:
generator string
item data
Notes:
Sets the generator options string.
Sets the required item.
setCount:
Arguments:

@ -10,13 +10,17 @@ setFeature:
Notes:
Sets the feature id. Used for things like structures.
setDimID:
setWorldType:
Arguments:
int
String
Usage:
dimension id
WorldType id
Notes:
Sets the dimension id.
Sets the WorldType id.
getLocationData:
Notes:
Returns the LocationData object so functions can be called on it.
setBiome:
Arguments:
@ -26,17 +30,13 @@ setBiome:
Notes:
Sets the biome id. Can be an int or String.
setWorldType:
setDimID:
Arguments:
String
int
Usage:
WorldType id
Notes:
Sets the WorldType id.
getLocationData:
dimension id
Notes:
Returns the LocationData object so functions can be called on it.
Sets the dimension id.
setGeneratorOptions:
Arguments:

@ -3,14 +3,6 @@ trigger.
setItem:
Arguments:
ItemBlockData
Usage:
item data
Notes:
Sets the required item that must be traded for from the villager.
getEntityData:
Notes:
Returns the EntityData object so functions can be called on it.
@ -23,6 +15,14 @@ setEntityType:
Notes:
Sets the entity type.
setItem:
Arguments:
ItemBlockData
Usage:
item data
Notes:
Sets the required item that must be traded for from the villager.
setCount:
Arguments:
int

@ -11,13 +11,33 @@ setFeature:
Notes:
Sets the feature id. Used for things like structures.
setItem:
setWorldType:
Arguments:
ItemBlockData
String
Usage: