Various small fixes for 1.12

Browse Source

...

This commit is contained in:

Philipp Rustemeier

2018-03-14 22:37:46 +01:00

parent 489fb82fbd

commit 62c2a9e9b8

604 changed files with 299 additions and 130 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/main/resources/assets/wizardry/advancements/all_spells.json → src/main/resources/assets/ebwizardry/advancements/all_spells.json

src/main/resources/assets/wizardry/advancements/anger_wizard.json → src/main/resources/assets/ebwizardry/advancements/anger_wizard.json

src/main/resources/assets/wizardry/advancements/apprentice.json → src/main/resources/assets/ebwizardry/advancements/apprentice.json

src/main/resources/assets/wizardry/advancements/arcane_initiate.json → src/main/resources/assets/ebwizardry/advancements/arcane_initiate.json

src/main/resources/assets/wizardry/advancements/armour_set.json → src/main/resources/assets/ebwizardry/advancements/armour_set.json

src/main/resources/assets/wizardry/advancements/buy_master_spell.json → src/main/resources/assets/ebwizardry/advancements/buy_master_spell.json

src/main/resources/assets/wizardry/advancements/charge_creeper.json → src/main/resources/assets/ebwizardry/advancements/charge_creeper.json

src/main/resources/assets/wizardry/advancements/craft_flask.json → src/main/resources/assets/ebwizardry/advancements/craft_flask.json

src/main/resources/assets/wizardry/advancements/crystal.json → src/main/resources/assets/ebwizardry/advancements/crystal.json

src/main/resources/assets/wizardry/advancements/defeat_evil_wizard.json → src/main/resources/assets/ebwizardry/advancements/defeat_evil_wizard.json

src/main/resources/assets/wizardry/advancements/element_master.json → src/main/resources/assets/ebwizardry/advancements/element_master.json

src/main/resources/assets/wizardry/advancements/elemental.json → src/main/resources/assets/ebwizardry/advancements/elemental.json

src/main/resources/assets/wizardry/advancements/frankenstein.json → src/main/resources/assets/ebwizardry/advancements/frankenstein.json

src/main/resources/assets/wizardry/advancements/freeze_blaze.json → src/main/resources/assets/ebwizardry/advancements/freeze_blaze.json

src/main/resources/assets/wizardry/advancements/identify_spell.json → src/main/resources/assets/ebwizardry/advancements/identify_spell.json

src/main/resources/assets/wizardry/advancements/jam_wizard.json → src/main/resources/assets/ebwizardry/advancements/jam_wizard.json

src/main/resources/assets/wizardry/advancements/legendary.json → src/main/resources/assets/ebwizardry/advancements/legendary.json

src/main/resources/assets/wizardry/advancements/master.json → src/main/resources/assets/ebwizardry/advancements/master.json

src/main/resources/assets/wizardry/advancements/max_out_wand.json → src/main/resources/assets/ebwizardry/advancements/max_out_wand.json

src/main/resources/assets/wizardry/advancements/pig_tornado.json → src/main/resources/assets/ebwizardry/advancements/pig_tornado.json

src/main/resources/assets/wizardry/advancements/root.json → src/main/resources/assets/ebwizardry/advancements/root.json

src/main/resources/assets/wizardry/advancements/self_destruct.json → src/main/resources/assets/ebwizardry/advancements/self_destruct.json

src/main/resources/assets/wizardry/advancements/slime_skeleton.json → src/main/resources/assets/ebwizardry/advancements/slime_skeleton.json

src/main/resources/assets/wizardry/advancements/special_upgrade.json → src/main/resources/assets/ebwizardry/advancements/special_upgrade.json

src/main/resources/assets/wizardry/advancements/wizard_trade.json → src/main/resources/assets/ebwizardry/advancements/wizard_trade.json

src/main/resources/assets/wizardry/blockstates/arcane_workbench.json → src/main/resources/assets/ebwizardry/blockstates/arcane_workbench.json

src/main/resources/assets/wizardry/blockstates/crystal_block.json → src/main/resources/assets/ebwizardry/blockstates/crystal_block.json

src/main/resources/assets/wizardry/blockstates/crystal_flower.json → src/main/resources/assets/ebwizardry/blockstates/crystal_flower.json

src/main/resources/assets/wizardry/blockstates/crystal_ore.json → src/main/resources/assets/ebwizardry/blockstates/crystal_ore.json

src/main/resources/assets/wizardry/blockstates/ice_statue.json → src/main/resources/assets/ebwizardry/blockstates/ice_statue.json

src/main/resources/assets/wizardry/blockstates/magic_light.json → src/main/resources/assets/ebwizardry/blockstates/magic_light.json

src/main/resources/assets/wizardry/blockstates/meteor.json → src/main/resources/assets/ebwizardry/blockstates/meteor.json

src/main/resources/assets/wizardry/blockstates/petrified_stone.json → src/main/resources/assets/ebwizardry/blockstates/petrified_stone.json

src/main/resources/assets/wizardry/blockstates/snare.json → src/main/resources/assets/ebwizardry/blockstates/snare.json

src/main/resources/assets/wizardry/blockstates/spectral_block.json → src/main/resources/assets/ebwizardry/blockstates/spectral_block.json

src/main/resources/assets/wizardry/blockstates/transportation_stone.json → src/main/resources/assets/ebwizardry/blockstates/transportation_stone.json

src/main/resources/assets/wizardry/blockstates/vanishing_cobweb.json → src/main/resources/assets/ebwizardry/blockstates/vanishing_cobweb.json

src/main/resources/assets/wizardry/lang/en_gb.lang → src/main/resources/assets/ebwizardry/lang/en_gb.lang

src/main/resources/assets/wizardry/lang/en_us.lang → src/main/resources/assets/ebwizardry/lang/en_us.lang

src/main/resources/assets/wizardry/lang/es_es.lang → src/main/resources/assets/ebwizardry/lang/es_es.lang

src/main/resources/assets/wizardry/lang/es_mx.lang → src/main/resources/assets/ebwizardry/lang/es_mx.lang

src/main/resources/assets/wizardry/lang/ru_ru.lang → src/main/resources/assets/ebwizardry/lang/ru_ru.lang

src/main/resources/assets/wizardry/loot_tables/chests/dungeon_additions.json → src/main/resources/assets/ebwizardry/loot_tables/chests/dungeon_additions.json

src/main/resources/assets/wizardry/loot_tables/chests/wizard_tower.json → src/main/resources/assets/ebwizardry/loot_tables/chests/wizard_tower.json

src/main/resources/assets/wizardry/loot_tables/entities/evil_wizard.json → src/main/resources/assets/ebwizardry/loot_tables/entities/evil_wizard.json

src/main/resources/assets/wizardry/loot_tables/entities/mob_additions.json → src/main/resources/assets/ebwizardry/loot_tables/entities/mob_additions.json

src/main/resources/assets/wizardry/loot_tables/subsets/arcane_tomes.json → src/main/resources/assets/ebwizardry/loot_tables/subsets/arcane_tomes.json

src/main/resources/assets/wizardry/loot_tables/subsets/novice_wands.json → src/main/resources/assets/ebwizardry/loot_tables/subsets/novice_wands.json

src/main/resources/assets/wizardry/loot_tables/subsets/wand_upgrades.json → src/main/resources/assets/ebwizardry/loot_tables/subsets/wand_upgrades.json

src/main/resources/assets/wizardry/loot_tables/subsets/wizard_armour.json → src/main/resources/assets/ebwizardry/loot_tables/subsets/wizard_armour.json

src/main/resources/assets/wizardry/models/block/arcane_workbench.json → src/main/resources/assets/ebwizardry/models/block/arcane_workbench.json

src/main/resources/assets/wizardry/models/block/crystal_block.json → src/main/resources/assets/ebwizardry/models/block/crystal_block.json

src/main/resources/assets/wizardry/models/block/crystal_flower.json → src/main/resources/assets/ebwizardry/models/block/crystal_flower.json

src/main/resources/assets/wizardry/models/block/crystal_ore.json → src/main/resources/assets/ebwizardry/models/block/crystal_ore.json

src/main/resources/assets/wizardry/models/block/ice_statue.json → src/main/resources/assets/ebwizardry/models/block/ice_statue.json

src/main/resources/assets/wizardry/models/block/magic_light.json → src/main/resources/assets/ebwizardry/models/block/magic_light.json

src/main/resources/assets/wizardry/models/block/meteor.json → src/main/resources/assets/ebwizardry/models/block/meteor.json

src/main/resources/assets/wizardry/models/block/petrified_stone.json → src/main/resources/assets/ebwizardry/models/block/petrified_stone.json

src/main/resources/assets/wizardry/models/block/snare.json → src/main/resources/assets/ebwizardry/models/block/snare.json

src/main/resources/assets/wizardry/models/block/spectral_block.json → src/main/resources/assets/ebwizardry/models/block/spectral_block.json

src/main/resources/assets/wizardry/models/block/transportation_stone.json → src/main/resources/assets/ebwizardry/models/block/transportation_stone.json

src/main/resources/assets/wizardry/models/block/vanishing_cobweb.json → src/main/resources/assets/ebwizardry/models/block/vanishing_cobweb.json

src/main/resources/assets/wizardry/models/item/advanced_earth_wand.json → src/main/resources/assets/ebwizardry/models/item/advanced_earth_wand.json

src/main/resources/assets/wizardry/models/item/advanced_fire_wand.json → src/main/resources/assets/ebwizardry/models/item/advanced_fire_wand.json

src/main/resources/assets/wizardry/models/item/advanced_healing_wand.json → src/main/resources/assets/ebwizardry/models/item/advanced_healing_wand.json

src/main/resources/assets/wizardry/models/item/advanced_ice_wand.json → src/main/resources/assets/ebwizardry/models/item/advanced_ice_wand.json

src/main/resources/assets/wizardry/models/item/advanced_lightning_wand.json → src/main/resources/assets/ebwizardry/models/item/advanced_lightning_wand.json

src/main/resources/assets/wizardry/models/item/advanced_necromancy_wand.json → src/main/resources/assets/ebwizardry/models/item/advanced_necromancy_wand.json

src/main/resources/assets/wizardry/models/item/advanced_sorcery_wand.json → src/main/resources/assets/ebwizardry/models/item/advanced_sorcery_wand.json

src/main/resources/assets/wizardry/models/item/advanced_wand.json → src/main/resources/assets/ebwizardry/models/item/advanced_wand.json

src/main/resources/assets/wizardry/models/item/apprentice_earth_wand.json → src/main/resources/assets/ebwizardry/models/item/apprentice_earth_wand.json

src/main/resources/assets/wizardry/models/item/apprentice_fire_wand.json → src/main/resources/assets/ebwizardry/models/item/apprentice_fire_wand.json

src/main/resources/assets/wizardry/models/item/apprentice_healing_wand.json → src/main/resources/assets/ebwizardry/models/item/apprentice_healing_wand.json

src/main/resources/assets/wizardry/models/item/apprentice_ice_wand.json → src/main/resources/assets/ebwizardry/models/item/apprentice_ice_wand.json

src/main/resources/assets/wizardry/models/item/apprentice_lightning_wand.json → src/main/resources/assets/ebwizardry/models/item/apprentice_lightning_wand.json

src/main/resources/assets/wizardry/models/item/apprentice_necromancy_wand.json → src/main/resources/assets/ebwizardry/models/item/apprentice_necromancy_wand.json

src/main/resources/assets/wizardry/models/item/apprentice_sorcery_wand.json → src/main/resources/assets/ebwizardry/models/item/apprentice_sorcery_wand.json

src/main/resources/assets/wizardry/models/item/apprentice_wand.json → src/main/resources/assets/ebwizardry/models/item/apprentice_wand.json

src/main/resources/assets/wizardry/models/item/arcane_tome.json → src/main/resources/assets/ebwizardry/models/item/arcane_tome.json

src/main/resources/assets/wizardry/models/item/arcane_workbench.json → src/main/resources/assets/ebwizardry/models/item/arcane_workbench.json

src/main/resources/assets/wizardry/models/item/armour_upgrade.json → src/main/resources/assets/ebwizardry/models/item/armour_upgrade.json

src/main/resources/assets/wizardry/models/item/attunement_upgrade.json → src/main/resources/assets/ebwizardry/models/item/attunement_upgrade.json

src/main/resources/assets/wizardry/models/item/basic_earth_wand.json → src/main/resources/assets/ebwizardry/models/item/basic_earth_wand.json

src/main/resources/assets/wizardry/models/item/basic_fire_wand.json → src/main/resources/assets/ebwizardry/models/item/basic_fire_wand.json

src/main/resources/assets/wizardry/models/item/basic_healing_wand.json → src/main/resources/assets/ebwizardry/models/item/basic_healing_wand.json

src/main/resources/assets/wizardry/models/item/basic_ice_wand.json → src/main/resources/assets/ebwizardry/models/item/basic_ice_wand.json

src/main/resources/assets/wizardry/models/item/basic_lightning_wand.json → src/main/resources/assets/ebwizardry/models/item/basic_lightning_wand.json

src/main/resources/assets/wizardry/models/item/basic_necromancy_wand.json → src/main/resources/assets/ebwizardry/models/item/basic_necromancy_wand.json

src/main/resources/assets/wizardry/models/item/basic_sorcery_wand.json → src/main/resources/assets/ebwizardry/models/item/basic_sorcery_wand.json

src/main/resources/assets/wizardry/models/item/blank_scroll.json → src/main/resources/assets/ebwizardry/models/item/blank_scroll.json

src/main/resources/assets/wizardry/models/item/blast_upgrade.json → src/main/resources/assets/ebwizardry/models/item/blast_upgrade.json

src/main/resources/assets/wizardry/models/item/condenser_upgrade.json → src/main/resources/assets/ebwizardry/models/item/condenser_upgrade.json

src/main/resources/assets/wizardry/models/item/cooldown_upgrade.json → src/main/resources/assets/ebwizardry/models/item/cooldown_upgrade.json

src/main/resources/assets/wizardry/models/item/crystal_block.json → src/main/resources/assets/ebwizardry/models/item/crystal_block.json

src/main/resources/assets/wizardry/models/item/crystal_flower.json → src/main/resources/assets/ebwizardry/models/item/crystal_flower.json

src/main/resources/assets/wizardry/models/item/crystal_ore.json → src/main/resources/assets/ebwizardry/models/item/crystal_ore.json

src/main/resources/assets/wizardry/models/item/duration_upgrade.json → src/main/resources/assets/ebwizardry/models/item/duration_upgrade.json

src/main/resources/assets/wizardry/models/item/firebomb.json → src/main/resources/assets/ebwizardry/models/item/firebomb.json

src/main/resources/assets/wizardry/models/item/flaming_axe.json → src/main/resources/assets/ebwizardry/models/item/flaming_axe.json

src/main/resources/assets/wizardry/models/item/frost_axe.json → src/main/resources/assets/ebwizardry/models/item/frost_axe.json

Some files were not shown because too many files have changed in this diff Show More