Merge commit '053c30b'

Browse Source

...

This commit is contained in:

bri cassa

2023-06-04 23:00:43 +02:00

parent 1869d4b0c3 053c30b8b1

commit 19b8ea4028

329 changed files with 3031 additions and 1980 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

BIN

3d_armor/textures/3d_armor_boots_admin.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.2 KiB

BIN

3d_armor/textures/3d_armor_boots_admin_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 548 B

BIN

3d_armor/textures/3d_armor_boots_bronze.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 937 B

BIN

3d_armor/textures/3d_armor_boots_bronze_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 602 B

BIN

3d_armor/textures/3d_armor_boots_cactus.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 903 B

BIN

3d_armor/textures/3d_armor_boots_cactus_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 821 B

BIN

3d_armor/textures/3d_armor_boots_crystal.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 236 B

BIN

3d_armor/textures/3d_armor_boots_crystal_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.2 KiB

BIN

3d_armor/textures/3d_armor_boots_diamond.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 13 KiB

BIN

3d_armor/textures/3d_armor_boots_diamond_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 872 B

BIN

3d_armor/textures/3d_armor_boots_gold.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.2 KiB

BIN

3d_armor/textures/3d_armor_boots_gold_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 779 B

BIN

3d_armor/textures/3d_armor_boots_mithril.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 854 B

BIN

3d_armor/textures/3d_armor_boots_mithril_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 530 B

BIN

3d_armor/textures/3d_armor_boots_nether.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 324 B

BIN

3d_armor/textures/3d_armor_boots_nether_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 264 B

BIN

3d_armor/textures/3d_armor_boots_steel.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 11 KiB

BIN

3d_armor/textures/3d_armor_boots_steel_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 783 B

BIN

3d_armor/textures/3d_armor_boots_wood.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.2 KiB

BIN

3d_armor/textures/3d_armor_boots_wood_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 501 B

BIN

3d_armor/textures/3d_armor_chestplate_admin.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.8 KiB

BIN

3d_armor/textures/3d_armor_chestplate_admin_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.4 KiB

BIN

3d_armor/textures/3d_armor_chestplate_bronze.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 4.9 KiB

BIN

3d_armor/textures/3d_armor_chestplate_bronze_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.5 KiB

BIN

3d_armor/textures/3d_armor_chestplate_cactus.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.3 KiB

BIN

3d_armor/textures/3d_armor_chestplate_cactus_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.9 KiB

BIN

3d_armor/textures/3d_armor_chestplate_crystal.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 613 B

BIN

3d_armor/textures/3d_armor_chestplate_crystal_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.2 KiB

BIN

3d_armor/textures/3d_armor_chestplate_diamond.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 13 KiB

BIN

3d_armor/textures/3d_armor_chestplate_diamond_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.9 KiB

BIN

3d_armor/textures/3d_armor_chestplate_gold.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.6 KiB

BIN

3d_armor/textures/3d_armor_chestplate_gold_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.9 KiB

BIN

3d_armor/textures/3d_armor_chestplate_mithril.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.0 KiB

BIN

3d_armor/textures/3d_armor_chestplate_mithril_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.4 KiB

BIN

3d_armor/textures/3d_armor_chestplate_nether.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 581 B

BIN

3d_armor/textures/3d_armor_chestplate_nether_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 384 B

BIN

3d_armor/textures/3d_armor_chestplate_steel.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 11 KiB

BIN

3d_armor/textures/3d_armor_chestplate_steel_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.7 KiB

BIN

3d_armor/textures/3d_armor_chestplate_wood.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.8 KiB

BIN

3d_armor/textures/3d_armor_chestplate_wood_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.7 KiB

BIN

3d_armor/textures/3d_armor_helmet_admin.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.2 KiB

BIN

3d_armor/textures/3d_armor_helmet_admin_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 869 B

BIN

3d_armor/textures/3d_armor_helmet_bronze.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.4 KiB

BIN

3d_armor/textures/3d_armor_helmet_bronze_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 796 B

BIN

3d_armor/textures/3d_armor_helmet_cactus.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.5 KiB

BIN

3d_armor/textures/3d_armor_helmet_cactus_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.1 KiB

BIN

3d_armor/textures/3d_armor_helmet_crystal.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 494 B

BIN

3d_armor/textures/3d_armor_helmet_crystal_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 834 B

BIN

3d_armor/textures/3d_armor_helmet_diamond.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 13 KiB

BIN

3d_armor/textures/3d_armor_helmet_diamond_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.1 KiB

BIN

3d_armor/textures/3d_armor_helmet_gold.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.3 KiB

BIN

3d_armor/textures/3d_armor_helmet_gold_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 586 B

BIN

3d_armor/textures/3d_armor_helmet_mithril.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.7 KiB

BIN

3d_armor/textures/3d_armor_helmet_mithril_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 732 B

BIN

3d_armor/textures/3d_armor_helmet_nether.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 525 B

BIN

3d_armor/textures/3d_armor_helmet_nether_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 267 B

BIN

3d_armor/textures/3d_armor_helmet_steel.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 11 KiB

BIN

3d_armor/textures/3d_armor_helmet_steel_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.0 KiB

BIN

3d_armor/textures/3d_armor_helmet_wood.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 932 B

BIN

3d_armor/textures/3d_armor_helmet_wood_preview.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 471 B

BIN

3d_armor/textures/3d_armor_inv_boots_admin.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.2 KiB

BIN

3d_armor/textures/3d_armor_inv_boots_bronze.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.0 KiB

BIN

3d_armor/textures/3d_armor_inv_boots_cactus.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.9 KiB

BIN

3d_armor/textures/3d_armor_inv_boots_crystal.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 129 B

BIN

3d_armor/textures/3d_armor_inv_boots_diamond.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.3 KiB

BIN

3d_armor/textures/3d_armor_inv_boots_gold.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.9 KiB

BIN

3d_armor/textures/3d_armor_inv_boots_mithril.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.7 KiB

BIN

3d_armor/textures/3d_armor_inv_boots_nether.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 322 B

BIN

3d_armor/textures/3d_armor_inv_boots_steel.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.0 KiB

BIN

3d_armor/textures/3d_armor_inv_boots_wood.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.0 KiB

BIN

3d_armor/textures/3d_armor_inv_chestplate_admin.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.8 KiB

BIN

3d_armor/textures/3d_armor_inv_chestplate_bronze.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.9 KiB

BIN

3d_armor/textures/3d_armor_inv_chestplate_cactus.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.8 KiB

BIN

3d_armor/textures/3d_armor_inv_chestplate_crystal.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 142 B

BIN

3d_armor/textures/3d_armor_inv_chestplate_diamond.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.8 KiB

BIN

3d_armor/textures/3d_armor_inv_chestplate_gold.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.8 KiB

BIN

3d_armor/textures/3d_armor_inv_chestplate_mithril.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.2 KiB

BIN

3d_armor/textures/3d_armor_inv_chestplate_nether.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 386 B

BIN

3d_armor/textures/3d_armor_inv_chestplate_steel.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.9 KiB

BIN

3d_armor/textures/3d_armor_inv_chestplate_wood.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.2 KiB

BIN

3d_armor/textures/3d_armor_inv_helmet_admin.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.4 KiB

BIN

3d_armor/textures/3d_armor_inv_helmet_bronze.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.4 KiB

BIN

3d_armor/textures/3d_armor_inv_helmet_cactus.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.4 KiB

BIN

3d_armor/textures/3d_armor_inv_helmet_crystal.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 138 B

BIN

3d_armor/textures/3d_armor_inv_helmet_diamond.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.5 KiB

BIN

3d_armor/textures/3d_armor_inv_helmet_gold.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.8 KiB

BIN

3d_armor/textures/3d_armor_inv_helmet_mithril.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.1 KiB

BIN

3d_armor/textures/3d_armor_inv_helmet_nether.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 267 B

BIN

3d_armor/textures/3d_armor_inv_helmet_steel.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.4 KiB

BIN

3d_armor/textures/3d_armor_inv_helmet_wood.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.8 KiB

BIN

3d_armor/textures/3d_armor_inv_leggings_admin.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.3 KiB

BIN

3d_armor/textures/3d_armor_inv_leggings_bronze.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.3 KiB

BIN

3d_armor/textures/3d_armor_inv_leggings_cactus.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.2 KiB

BIN

3d_armor/textures/3d_armor_inv_leggings_crystal.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 154 B

BIN

3d_armor/textures/3d_armor_inv_leggings_diamond.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.3 KiB

BIN

3d_armor/textures/3d_armor_inv_leggings_gold.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.4 KiB

BIN

3d_armor/textures/3d_armor_inv_leggings_mithril.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.5 KiB

BIN

3d_armor/textures/3d_armor_inv_leggings_nether.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 297 B

BIN

3d_armor/textures/3d_armor_inv_leggings_steel.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.3 KiB

BIN

3d_armor/textures/3d_armor_inv_leggings_wood.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.8 KiB

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