Merge branch 'release/v1.0-mc18w11a'

xmamo · Apr 8, 2018 · 5e99564 · 5e99564
2 parents c20f031 + c21d748
commit 5e99564
Show file tree

Hide file tree

Showing 361 changed files with 4,034 additions and 7,380 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,3 @@
 /.idea/
-/Fortress.dat
-/Mineshaft.dat
-/scoreboard.dat
-/villages.dat
-/villages_end.dat
-/villages_nether.dat
 
 __pycache__/
diff --git a/data/b7s/advancements/_biome_any.json b/data/b7s/advancements/_biome_any.json
diff --git a/data/b7s/advancements/_biome_beaches.json b/data/b7s/advancements/_biome_beaches.json
diff --git a/data/b7s/advancements/_biome_birch_forest.json b/data/b7s/advancements/_biome_birch_forest.json
diff --git a/data/b7s/advancements/_biome_birch_forest_hills.json b/data/b7s/advancements/_biome_birch_forest_hills.json
diff --git a/data/b7s/advancements/_biome_cold_beach.json b/data/b7s/advancements/_biome_cold_beach.json
diff --git a/data/b7s/advancements/_biome_deep_ocean.json b/data/b7s/advancements/_biome_deep_ocean.json
diff --git a/data/b7s/advancements/_biome_desert.json b/data/b7s/advancements/_biome_desert.json
diff --git a/data/b7s/advancements/_biome_desert_hills.json b/data/b7s/advancements/_biome_desert_hills.json
diff --git a/data/b7s/advancements/_biome_extreme_hills.json b/data/b7s/advancements/_biome_extreme_hills.json
diff --git a/data/b7s/advancements/_biome_extreme_hills_with_trees.json b/data/b7s/advancements/_biome_extreme_hills_with_trees.json
diff --git a/data/b7s/advancements/_biome_forest.json b/data/b7s/advancements/_biome_forest.json
diff --git a/data/b7s/advancements/_biome_forest_hills.json b/data/b7s/advancements/_biome_forest_hills.json
diff --git a/data/b7s/advancements/_biome_frozen_ocean.json b/data/b7s/advancements/_biome_frozen_ocean.json
diff --git a/data/b7s/advancements/_biome_frozen_river.json b/data/b7s/advancements/_biome_frozen_river.json
diff --git a/data/b7s/advancements/_biome_hell.json b/data/b7s/advancements/_biome_hell.json
diff --git a/data/b7s/advancements/_biome_ice_flats.json b/data/b7s/advancements/_biome_ice_flats.json
diff --git a/data/b7s/advancements/_biome_ice_mountains.json b/data/b7s/advancements/_biome_ice_mountains.json
diff --git a/data/b7s/advancements/_biome_jungle.json b/data/b7s/advancements/_biome_jungle.json
diff --git a/data/b7s/advancements/_biome_jungle_edge.json b/data/b7s/advancements/_biome_jungle_edge.json
diff --git a/data/b7s/advancements/_biome_jungle_hills.json b/data/b7s/advancements/_biome_jungle_hills.json
diff --git a/data/b7s/advancements/_biome_mesa.json b/data/b7s/advancements/_biome_mesa.json
diff --git a/data/b7s/advancements/_biome_mesa_clear_rock.json b/data/b7s/advancements/_biome_mesa_clear_rock.json
diff --git a/data/b7s/advancements/_biome_mesa_rock.json b/data/b7s/advancements/_biome_mesa_rock.json
diff --git a/data/b7s/advancements/_biome_mushroom_island.json b/data/b7s/advancements/_biome_mushroom_island.json
diff --git a/data/b7s/advancements/_biome_mushroom_island_shore.json b/data/b7s/advancements/_biome_mushroom_island_shore.json
diff --git a/data/b7s/advancements/_biome_mutated_birch_forest.json b/data/b7s/advancements/_biome_mutated_birch_forest.json