Merge branch 'MC-011' into 'master'

MC-011: 1.14 beta textures 3.3 Closes #11 See merge request dodsorfas/minecraft-datapacks!7
2019-08-18 02:30:46 +00:00 · 2019-08-18 02:30:46 +00:00 · c67936c9ba
commit c67936c9ba
parent 4065f1790a 974c8ee1b3
847 changed files with 131 additions and 0 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -95,6 +95,24 @@ deploy:resourcepack:
      - resourcepack/**/*
      - resourcepack/*
      - .gitlab-ci.yml
+      
+pages:
+  stage: deploy
+  script:
+  - mkdir public
+  - mv resourcepack-out/resourcepack.zip public/dodsorfas_resources.zip
+  artifacts:
+    paths:
+    - public
+  only:
+    refs:
+      - master
+    changes:
+      - resourcepack/**/*
+      - resourcepack/*
+      - .gitlab-ci.yml
+
+

 restart:
  stage: restart
--- a/resourcepack/assets/minecraft/textures/block/acacia_door_bottom.png
+++ b/resourcepack/assets/minecraft/textures/block/acacia_door_bottom.png
--- a/resourcepack/assets/minecraft/textures/block/acacia_door_top.png
+++ b/resourcepack/assets/minecraft/textures/block/acacia_door_top.png
--- a/resourcepack/assets/minecraft/textures/block/acacia_leaves.png
+++ b/resourcepack/assets/minecraft/textures/block/acacia_leaves.png
--- a/resourcepack/assets/minecraft/textures/block/acacia_log.png
+++ b/resourcepack/assets/minecraft/textures/block/acacia_log.png
--- a/resourcepack/assets/minecraft/textures/block/acacia_log_top.png
+++ b/resourcepack/assets/minecraft/textures/block/acacia_log_top.png
--- a/resourcepack/assets/minecraft/textures/block/acacia_planks.png
+++ b/resourcepack/assets/minecraft/textures/block/acacia_planks.png
--- a/resourcepack/assets/minecraft/textures/block/acacia_sapling.png
+++ b/resourcepack/assets/minecraft/textures/block/acacia_sapling.png
--- a/resourcepack/assets/minecraft/textures/block/activator_rail.png
+++ b/resourcepack/assets/minecraft/textures/block/activator_rail.png
--- a/resourcepack/assets/minecraft/textures/block/activator_rail_on.png
+++ b/resourcepack/assets/minecraft/textures/block/activator_rail_on.png
--- a/resourcepack/assets/minecraft/textures/block/allium.png
+++ b/resourcepack/assets/minecraft/textures/block/allium.png
--- a/resourcepack/assets/minecraft/textures/block/andesite.png
+++ b/resourcepack/assets/minecraft/textures/block/andesite.png
--- a/resourcepack/assets/minecraft/textures/block/anvil.png
+++ b/resourcepack/assets/minecraft/textures/block/anvil.png
--- a/resourcepack/assets/minecraft/textures/block/anvil_top.png
+++ b/resourcepack/assets/minecraft/textures/block/anvil_top.png
--- a/resourcepack/assets/minecraft/textures/block/attached_melon_stem.png
+++ b/resourcepack/assets/minecraft/textures/block/attached_melon_stem.png
--- a/resourcepack/assets/minecraft/textures/block/azure_bluet.png
+++ b/resourcepack/assets/minecraft/textures/block/azure_bluet.png
--- a/resourcepack/assets/minecraft/textures/block/beacon.png
+++ b/resourcepack/assets/minecraft/textures/block/beacon.png
--- a/resourcepack/assets/minecraft/textures/block/bedrock.png
+++ b/resourcepack/assets/minecraft/textures/block/bedrock.png
--- a/resourcepack/assets/minecraft/textures/block/beetroots_stage0.png
+++ b/resourcepack/assets/minecraft/textures/block/beetroots_stage0.png
--- a/resourcepack/assets/minecraft/textures/block/beetroots_stage1.png
+++ b/resourcepack/assets/minecraft/textures/block/beetroots_stage1.png
--- a/resourcepack/assets/minecraft/textures/block/beetroots_stage2.png
+++ b/resourcepack/assets/minecraft/textures/block/beetroots_stage2.png
--- a/resourcepack/assets/minecraft/textures/block/beetroots_stage3.png
+++ b/resourcepack/assets/minecraft/textures/block/beetroots_stage3.png
--- a/resourcepack/assets/minecraft/textures/block/birch_door_bottom.png
+++ b/resourcepack/assets/minecraft/textures/block/birch_door_bottom.png
--- a/resourcepack/assets/minecraft/textures/block/birch_door_top.png
+++ b/resourcepack/assets/minecraft/textures/block/birch_door_top.png
--- a/resourcepack/assets/minecraft/textures/block/birch_leaves.png
+++ b/resourcepack/assets/minecraft/textures/block/birch_leaves.png
--- a/resourcepack/assets/minecraft/textures/block/birch_log.png
+++ b/resourcepack/assets/minecraft/textures/block/birch_log.png
--- a/resourcepack/assets/minecraft/textures/block/birch_log_top.png
+++ b/resourcepack/assets/minecraft/textures/block/birch_log_top.png
--- a/resourcepack/assets/minecraft/textures/block/birch_planks.png
+++ b/resourcepack/assets/minecraft/textures/block/birch_planks.png
--- a/resourcepack/assets/minecraft/textures/block/birch_sapling.png
+++ b/resourcepack/assets/minecraft/textures/block/birch_sapling.png
--- a/resourcepack/assets/minecraft/textures/block/blue_orchid.png
+++ b/resourcepack/assets/minecraft/textures/block/blue_orchid.png
--- a/resourcepack/assets/minecraft/textures/block/bone_block_side.png
+++ b/resourcepack/assets/minecraft/textures/block/bone_block_side.png
--- a/resourcepack/assets/minecraft/textures/block/bone_block_top.png
+++ b/resourcepack/assets/minecraft/textures/block/bone_block_top.png
--- a/resourcepack/assets/minecraft/textures/block/bookshelf.png
+++ b/resourcepack/assets/minecraft/textures/block/bookshelf.png
--- a/resourcepack/assets/minecraft/textures/block/brewing_stand.png
+++ b/resourcepack/assets/minecraft/textures/block/brewing_stand.png
--- a/resourcepack/assets/minecraft/textures/block/brewing_stand_base.png
+++ b/resourcepack/assets/minecraft/textures/block/brewing_stand_base.png
--- a/resourcepack/assets/minecraft/textures/block/bricks.png
+++ b/resourcepack/assets/minecraft/textures/block/bricks.png
--- a/resourcepack/assets/minecraft/textures/block/brown_mushroom.png
+++ b/resourcepack/assets/minecraft/textures/block/brown_mushroom.png
--- a/resourcepack/assets/minecraft/textures/block/brown_mushroom_block.png
+++ b/resourcepack/assets/minecraft/textures/block/brown_mushroom_block.png
--- a/resourcepack/assets/minecraft/textures/block/cactus_bottom.png
+++ b/resourcepack/assets/minecraft/textures/block/cactus_bottom.png
--- a/resourcepack/assets/minecraft/textures/block/cactus_side.png
+++ b/resourcepack/assets/minecraft/textures/block/cactus_side.png
--- a/resourcepack/assets/minecraft/textures/block/cactus_top.png
+++ b/resourcepack/assets/minecraft/textures/block/cactus_top.png
--- a/resourcepack/assets/minecraft/textures/block/cake_bottom.png
+++ b/resourcepack/assets/minecraft/textures/block/cake_bottom.png
--- a/resourcepack/assets/minecraft/textures/block/cake_inner.png
+++ b/resourcepack/assets/minecraft/textures/block/cake_inner.png
--- a/resourcepack/assets/minecraft/textures/block/cake_side.png
+++ b/resourcepack/assets/minecraft/textures/block/cake_side.png
--- a/resourcepack/assets/minecraft/textures/block/cake_top.png
+++ b/resourcepack/assets/minecraft/textures/block/cake_top.png
--- a/resourcepack/assets/minecraft/textures/block/carrots_stage0.png
+++ b/resourcepack/assets/minecraft/textures/block/carrots_stage0.png
--- a/resourcepack/assets/minecraft/textures/block/carrots_stage1.png
+++ b/resourcepack/assets/minecraft/textures/block/carrots_stage1.png
--- a/resourcepack/assets/minecraft/textures/block/carrots_stage2.png
+++ b/resourcepack/assets/minecraft/textures/block/carrots_stage2.png
--- a/resourcepack/assets/minecraft/textures/block/carrots_stage3.png
+++ b/resourcepack/assets/minecraft/textures/block/carrots_stage3.png
--- a/resourcepack/assets/minecraft/textures/block/carved_pumpkin.png
+++ b/resourcepack/assets/minecraft/textures/block/carved_pumpkin.png
--- a/resourcepack/assets/minecraft/textures/block/cauldron_bottom.png
+++ b/resourcepack/assets/minecraft/textures/block/cauldron_bottom.png
--- a/resourcepack/assets/minecraft/textures/block/cauldron_inner.png
+++ b/resourcepack/assets/minecraft/textures/block/cauldron_inner.png
--- a/resourcepack/assets/minecraft/textures/block/cauldron_side.png
+++ b/resourcepack/assets/minecraft/textures/block/cauldron_side.png
--- a/resourcepack/assets/minecraft/textures/block/cauldron_top.png
+++ b/resourcepack/assets/minecraft/textures/block/cauldron_top.png
--- a/resourcepack/assets/minecraft/textures/block/chain_command_block_back.png
+++ b/resourcepack/assets/minecraft/textures/block/chain_command_block_back.png
--- a/resourcepack/assets/minecraft/textures/block/chain_command_block_back.png.mcmeta
+++ b/resourcepack/assets/minecraft/textures/block/chain_command_block_back.png.mcmeta
@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": true,
+    "frametime": 10
+  }
+}
--- a/resourcepack/assets/minecraft/textures/block/chain_command_block_conditional.png
+++ b/resourcepack/assets/minecraft/textures/block/chain_command_block_conditional.png
--- a/resourcepack/assets/minecraft/textures/block/chain_command_block_conditional.png.mcmeta
+++ b/resourcepack/assets/minecraft/textures/block/chain_command_block_conditional.png.mcmeta
@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": true,
+    "frametime": 10
+  }
+}
--- a/resourcepack/assets/minecraft/textures/block/chain_command_block_front.png
+++ b/resourcepack/assets/minecraft/textures/block/chain_command_block_front.png
--- a/resourcepack/assets/minecraft/textures/block/chain_command_block_front.png.mcmeta
+++ b/resourcepack/assets/minecraft/textures/block/chain_command_block_front.png.mcmeta
@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": true,
+    "frametime": 10
+  }
+}
--- a/resourcepack/assets/minecraft/textures/block/chain_command_block_side.png
+++ b/resourcepack/assets/minecraft/textures/block/chain_command_block_side.png
--- a/resourcepack/assets/minecraft/textures/block/chain_command_block_side.png.mcmeta
+++ b/resourcepack/assets/minecraft/textures/block/chain_command_block_side.png.mcmeta
@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": true,
+    "frametime": 10
+  }
+}
--- a/resourcepack/assets/minecraft/textures/block/chipped_anvil_top.png
+++ b/resourcepack/assets/minecraft/textures/block/chipped_anvil_top.png
--- a/resourcepack/assets/minecraft/textures/block/chiseled_quartz_block.png
+++ b/resourcepack/assets/minecraft/textures/block/chiseled_quartz_block.png
--- a/resourcepack/assets/minecraft/textures/block/chiseled_quartz_block_top.png
+++ b/resourcepack/assets/minecraft/textures/block/chiseled_quartz_block_top.png
--- a/resourcepack/assets/minecraft/textures/block/chiseled_red_sandstone.png
+++ b/resourcepack/assets/minecraft/textures/block/chiseled_red_sandstone.png
--- a/resourcepack/assets/minecraft/textures/block/chiseled_sandstone.png
+++ b/resourcepack/assets/minecraft/textures/block/chiseled_sandstone.png
--- a/resourcepack/assets/minecraft/textures/block/chiseled_stone_bricks.png
+++ b/resourcepack/assets/minecraft/textures/block/chiseled_stone_bricks.png
--- a/resourcepack/assets/minecraft/textures/block/chorus_flower.png
+++ b/resourcepack/assets/minecraft/textures/block/chorus_flower.png
--- a/resourcepack/assets/minecraft/textures/block/chorus_flower_dead.png
+++ b/resourcepack/assets/minecraft/textures/block/chorus_flower_dead.png
--- a/resourcepack/assets/minecraft/textures/block/chorus_plant.png
+++ b/resourcepack/assets/minecraft/textures/block/chorus_plant.png
--- a/resourcepack/assets/minecraft/textures/block/clay.png
+++ b/resourcepack/assets/minecraft/textures/block/clay.png
--- a/resourcepack/assets/minecraft/textures/block/coal_block.png
+++ b/resourcepack/assets/minecraft/textures/block/coal_block.png
--- a/resourcepack/assets/minecraft/textures/block/coal_ore.png
+++ b/resourcepack/assets/minecraft/textures/block/coal_ore.png
--- a/resourcepack/assets/minecraft/textures/block/cobblestone.png
+++ b/resourcepack/assets/minecraft/textures/block/cobblestone.png
--- a/resourcepack/assets/minecraft/textures/block/cobweb.png
+++ b/resourcepack/assets/minecraft/textures/block/cobweb.png
--- a/resourcepack/assets/minecraft/textures/block/cocoa_stage0.png
+++ b/resourcepack/assets/minecraft/textures/block/cocoa_stage0.png
--- a/resourcepack/assets/minecraft/textures/block/cocoa_stage1.png
+++ b/resourcepack/assets/minecraft/textures/block/cocoa_stage1.png
--- a/resourcepack/assets/minecraft/textures/block/cocoa_stage2.png
+++ b/resourcepack/assets/minecraft/textures/block/cocoa_stage2.png
--- a/resourcepack/assets/minecraft/textures/block/command_block_back.png
+++ b/resourcepack/assets/minecraft/textures/block/command_block_back.png
--- a/resourcepack/assets/minecraft/textures/block/command_block_back.png.mcmeta
+++ b/resourcepack/assets/minecraft/textures/block/command_block_back.png.mcmeta
@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": true,
+    "frametime": 10
+  }
+}
--- a/resourcepack/assets/minecraft/textures/block/command_block_conditional.png
+++ b/resourcepack/assets/minecraft/textures/block/command_block_conditional.png
--- a/resourcepack/assets/minecraft/textures/block/command_block_conditional.png.mcmeta
+++ b/resourcepack/assets/minecraft/textures/block/command_block_conditional.png.mcmeta
@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": true,
+    "frametime": 10
+  }
+}
--- a/resourcepack/assets/minecraft/textures/block/command_block_front.png
+++ b/resourcepack/assets/minecraft/textures/block/command_block_front.png
--- a/resourcepack/assets/minecraft/textures/block/command_block_front.png.mcmeta
+++ b/resourcepack/assets/minecraft/textures/block/command_block_front.png.mcmeta
@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": true,
+    "frametime": 10
+  }
+}
--- a/resourcepack/assets/minecraft/textures/block/command_block_side.png
+++ b/resourcepack/assets/minecraft/textures/block/command_block_side.png
--- a/resourcepack/assets/minecraft/textures/block/command_block_side.png.mcmeta
+++ b/resourcepack/assets/minecraft/textures/block/command_block_side.png.mcmeta
@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": true,
+    "frametime": 10
+  }
+}
--- a/resourcepack/assets/minecraft/textures/block/comparator.png
+++ b/resourcepack/assets/minecraft/textures/block/comparator.png
--- a/resourcepack/assets/minecraft/textures/block/comparator_on.png
+++ b/resourcepack/assets/minecraft/textures/block/comparator_on.png
--- a/resourcepack/assets/minecraft/textures/block/cracked_stone_bricks.png
+++ b/resourcepack/assets/minecraft/textures/block/cracked_stone_bricks.png
--- a/resourcepack/assets/minecraft/textures/block/crafting_table_front.png
+++ b/resourcepack/assets/minecraft/textures/block/crafting_table_front.png
--- a/resourcepack/assets/minecraft/textures/block/crafting_table_side.png
+++ b/resourcepack/assets/minecraft/textures/block/crafting_table_side.png
--- a/resourcepack/assets/minecraft/textures/block/crafting_table_top.png
+++ b/resourcepack/assets/minecraft/textures/block/crafting_table_top.png
--- a/resourcepack/assets/minecraft/textures/block/cut_red_sandstone.png
+++ b/resourcepack/assets/minecraft/textures/block/cut_red_sandstone.png
--- a/resourcepack/assets/minecraft/textures/block/cut_sandstone.png
+++ b/resourcepack/assets/minecraft/textures/block/cut_sandstone.png
--- a/resourcepack/assets/minecraft/textures/block/damaged_anvil_top.png
+++ b/resourcepack/assets/minecraft/textures/block/damaged_anvil_top.png
--- a/resourcepack/assets/minecraft/textures/block/dandelion.png
+++ b/resourcepack/assets/minecraft/textures/block/dandelion.png
--- a/resourcepack/assets/minecraft/textures/block/dark_oak_door_bottom.png
+++ b/resourcepack/assets/minecraft/textures/block/dark_oak_door_bottom.png
--- a/resourcepack/assets/minecraft/textures/block/dark_oak_door_top.png
+++ b/resourcepack/assets/minecraft/textures/block/dark_oak_door_top.png
--- a/resourcepack/assets/minecraft/textures/block/dark_oak_leaves.png
+++ b/resourcepack/assets/minecraft/textures/block/dark_oak_leaves.png
--- a/Show More
+++ b/Show More