DODSORFAS
/
minecraft-datapacks
1
0
Fork 0
Code Issues 15 Pull Requests 2 Projects Releases Wiki Activity

Merge branch 'MC-011' into 'master' 

MC-011: 1.14 beta textures 3.3

Closes #11

See merge request dodsorfas/minecraft-datapacks!7
This commit is contained in:
Daniel Løvbrøtte Olsen 2019-08-18 02:30:46 +00:00
parent 4065f1790a 974c8ee1b3
commit c67936c9ba
847 changed files with 131 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.gitlab-ci.yml
View File

@ -96,6 +96,24 @@ deploy:resourcepack:
- resourcepack/* - resourcepack/*
- .gitlab-ci.yml - .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: restart:
stage: restart stage: restart

BIN
resourcepack/assets/minecraft/textures/block/acacia_door_bottom.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 252 B

BIN
resourcepack/assets/minecraft/textures/block/acacia_door_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 264 B

BIN
resourcepack/assets/minecraft/textures/block/acacia_leaves.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 412 B

BIN
resourcepack/assets/minecraft/textures/block/acacia_log.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 387 B

BIN
resourcepack/assets/minecraft/textures/block/acacia_log_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 467 B

BIN
resourcepack/assets/minecraft/textures/block/acacia_planks.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 452 B

BIN
resourcepack/assets/minecraft/textures/block/acacia_sapling.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 232 B

BIN
resourcepack/assets/minecraft/textures/block/activator_rail.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 294 B

BIN
resourcepack/assets/minecraft/textures/block/activator_rail_on.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 295 B

BIN
resourcepack/assets/minecraft/textures/block/allium.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 367 B

BIN
resourcepack/assets/minecraft/textures/block/andesite.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 456 B

BIN
resourcepack/assets/minecraft/textures/block/anvil.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 236 B

BIN
resourcepack/assets/minecraft/textures/block/anvil_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 201 B

BIN
resourcepack/assets/minecraft/textures/block/attached_melon_stem.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 146 B

BIN
resourcepack/assets/minecraft/textures/block/azure_bluet.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 341 B

BIN
resourcepack/assets/minecraft/textures/block/beacon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 211 B

BIN
resourcepack/assets/minecraft/textures/block/bedrock.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 446 B

BIN
resourcepack/assets/minecraft/textures/block/beetroots_stage0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 127 B

BIN
resourcepack/assets/minecraft/textures/block/beetroots_stage1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 177 B

BIN
resourcepack/assets/minecraft/textures/block/beetroots_stage2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 345 B

BIN
resourcepack/assets/minecraft/textures/block/beetroots_stage3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 385 B

BIN
resourcepack/assets/minecraft/textures/block/birch_door_bottom.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 297 B

BIN
resourcepack/assets/minecraft/textures/block/birch_door_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 274 B

BIN
resourcepack/assets/minecraft/textures/block/birch_leaves.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 398 B

BIN
resourcepack/assets/minecraft/textures/block/birch_log.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 491 B

BIN
resourcepack/assets/minecraft/textures/block/birch_log_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 515 B

BIN
resourcepack/assets/minecraft/textures/block/birch_planks.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 468 B

BIN
resourcepack/assets/minecraft/textures/block/birch_sapling.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 223 B

BIN
resourcepack/assets/minecraft/textures/block/blue_orchid.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 280 B

BIN
resourcepack/assets/minecraft/textures/block/bone_block_side.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 167 B

BIN
resourcepack/assets/minecraft/textures/block/bone_block_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 242 B

BIN
resourcepack/assets/minecraft/textures/block/bookshelf.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 413 B

BIN
resourcepack/assets/minecraft/textures/block/brewing_stand.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 328 B

BIN
resourcepack/assets/minecraft/textures/block/brewing_stand_base.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 254 B

BIN
resourcepack/assets/minecraft/textures/block/bricks.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 266 B

BIN
resourcepack/assets/minecraft/textures/block/brown_mushroom.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 139 B

BIN
resourcepack/assets/minecraft/textures/block/brown_mushroom_block.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 221 B

BIN
resourcepack/assets/minecraft/textures/block/cactus_bottom.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 225 B

BIN
resourcepack/assets/minecraft/textures/block/cactus_side.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 458 B

BIN
resourcepack/assets/minecraft/textures/block/cactus_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 401 B

BIN
resourcepack/assets/minecraft/textures/block/cake_bottom.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 203 B

BIN
resourcepack/assets/minecraft/textures/block/cake_inner.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 200 B

BIN
resourcepack/assets/minecraft/textures/block/cake_side.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 189 B

BIN
resourcepack/assets/minecraft/textures/block/cake_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 237 B

BIN
resourcepack/assets/minecraft/textures/block/carrots_stage0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 138 B

BIN
resourcepack/assets/minecraft/textures/block/carrots_stage1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 233 B

BIN
resourcepack/assets/minecraft/textures/block/carrots_stage2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 323 B

BIN
resourcepack/assets/minecraft/textures/block/carrots_stage3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 416 B

BIN
resourcepack/assets/minecraft/textures/block/carved_pumpkin.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 277 B

BIN
resourcepack/assets/minecraft/textures/block/cauldron_bottom.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 136 B

BIN
resourcepack/assets/minecraft/textures/block/cauldron_inner.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 195 B

BIN
resourcepack/assets/minecraft/textures/block/cauldron_side.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 247 B

BIN
resourcepack/assets/minecraft/textures/block/cauldron_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 215 B

BIN
resourcepack/assets/minecraft/textures/block/chain_command_block_back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 480 B

6
resourcepack/assets/minecraft/textures/block/chain_command_block_back.png.mcmeta Normal file
View File

@ -0,0 +1,6 @@
{
"animation": {
"interpolate": true,
"frametime": 10
}
}

BIN
resourcepack/assets/minecraft/textures/block/chain_command_block_conditional.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 441 B

6
resourcepack/assets/minecraft/textures/block/chain_command_block_conditional.png.mcmeta Normal file
View File

@ -0,0 +1,6 @@
{
"animation": {
"interpolate": true,
"frametime": 10
}
}

BIN
resourcepack/assets/minecraft/textures/block/chain_command_block_front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 434 B

6
resourcepack/assets/minecraft/textures/block/chain_command_block_front.png.mcmeta Normal file
View File

@ -0,0 +1,6 @@
{
"animation": {
"interpolate": true,
"frametime": 10
}
}

BIN
resourcepack/assets/minecraft/textures/block/chain_command_block_side.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 467 B

6
resourcepack/assets/minecraft/textures/block/chain_command_block_side.png.mcmeta Normal file
View File

@ -0,0 +1,6 @@
{
"animation": {
"interpolate": true,
"frametime": 10
}
}

BIN
resourcepack/assets/minecraft/textures/block/chipped_anvil_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 240 B

BIN
resourcepack/assets/minecraft/textures/block/chiseled_quartz_block.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 251 B

BIN
resourcepack/assets/minecraft/textures/block/chiseled_quartz_block_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 259 B

BIN
resourcepack/assets/minecraft/textures/block/chiseled_red_sandstone.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 467 B

BIN
resourcepack/assets/minecraft/textures/block/chiseled_sandstone.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 445 B

BIN
resourcepack/assets/minecraft/textures/block/chiseled_stone_bricks.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 401 B

BIN
resourcepack/assets/minecraft/textures/block/chorus_flower.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 325 B

BIN
resourcepack/assets/minecraft/textures/block/chorus_flower_dead.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 328 B

BIN
resourcepack/assets/minecraft/textures/block/chorus_plant.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 300 B

BIN
resourcepack/assets/minecraft/textures/block/clay.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 278 B

BIN
resourcepack/assets/minecraft/textures/block/coal_block.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 222 B

BIN
resourcepack/assets/minecraft/textures/block/coal_ore.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 467 B

BIN
resourcepack/assets/minecraft/textures/block/cobblestone.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 557 B

BIN
resourcepack/assets/minecraft/textures/block/cobweb.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 212 B

BIN
resourcepack/assets/minecraft/textures/block/cocoa_stage0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 192 B

BIN
resourcepack/assets/minecraft/textures/block/cocoa_stage1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 202 B

BIN
resourcepack/assets/minecraft/textures/block/cocoa_stage2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 233 B

BIN
resourcepack/assets/minecraft/textures/block/command_block_back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 758 B

6
resourcepack/assets/minecraft/textures/block/command_block_back.png.mcmeta Normal file
View File

@ -0,0 +1,6 @@
{
"animation": {
"interpolate": true,
"frametime": 10
}
}

BIN
resourcepack/assets/minecraft/textures/block/command_block_conditional.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 688 B

6
resourcepack/assets/minecraft/textures/block/command_block_conditional.png.mcmeta Normal file
View File

@ -0,0 +1,6 @@
{
"animation": {
"interpolate": true,
"frametime": 10
}
}

BIN
resourcepack/assets/minecraft/textures/block/command_block_front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 716 B

6
resourcepack/assets/minecraft/textures/block/command_block_front.png.mcmeta Normal file
View File

@ -0,0 +1,6 @@
{
"animation": {
"interpolate": true,
"frametime": 10
}
}

BIN
resourcepack/assets/minecraft/textures/block/command_block_side.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 744 B

6
resourcepack/assets/minecraft/textures/block/command_block_side.png.mcmeta Normal file
View File

@ -0,0 +1,6 @@
{
"animation": {
"interpolate": true,
"frametime": 10
}
}

BIN
resourcepack/assets/minecraft/textures/block/comparator.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 279 B

BIN
resourcepack/assets/minecraft/textures/block/comparator_on.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 274 B

BIN
resourcepack/assets/minecraft/textures/block/cracked_stone_bricks.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 525 B

BIN
resourcepack/assets/minecraft/textures/block/crafting_table_front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 613 B

BIN
resourcepack/assets/minecraft/textures/block/crafting_table_side.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 559 B

BIN
resourcepack/assets/minecraft/textures/block/crafting_table_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 455 B

BIN
resourcepack/assets/minecraft/textures/block/cut_red_sandstone.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 372 B

BIN
resourcepack/assets/minecraft/textures/block/cut_sandstone.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 368 B

BIN
resourcepack/assets/minecraft/textures/block/damaged_anvil_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 252 B

BIN
resourcepack/assets/minecraft/textures/block/dandelion.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 222 B

BIN
resourcepack/assets/minecraft/textures/block/dark_oak_door_bottom.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 257 B

BIN
resourcepack/assets/minecraft/textures/block/dark_oak_door_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 271 B

BIN
resourcepack/assets/minecraft/textures/block/dark_oak_leaves.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 243 B

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