diff options
| author | orwell96 <orwell@bleipb.de> | 2018-12-03 23:17:35 +0100 |
|---|---|---|
| committer | orwell96 <orwell@bleipb.de> | 2018-12-03 23:17:35 +0100 |
| commit | 8928f78ee6305e29ed8d3b9395fcb6564c984fdf (patch) | |
| tree | cd250c2b98d7131158e3744efe238780cec73fec /signs/textures | |
| parent | eccdad46ef2b38cd061aab7ae6bcb252a67c2218 (diff) | |
| parent | a3e0d36a68247cac40349d9089fe3c71546d75e8 (diff) | |
| download | display_modpack-master.tar.gz display_modpack-master.tar.bz2 display_modpack-master.zip | |
Resolved conflicts by reordering of files
Diffstat (limited to 'signs/textures')
| -rw-r--r-- | signs/textures/signs_label.png | bin | 0 -> 404 bytes |
| -rw-r--r-- | signs/textures/signs_label_medium_inventory.png | bin | 0 -> 406 bytes |
| -rw-r--r-- | signs/textures/signs_label_small_inventory.png | bin | 0 -> 417 bytes |
| -rw-r--r-- | signs/textures/signs_wooden.png | bin | 0 -> 574 bytes |
| -rw-r--r-- | signs/textures/signs_wooden_direction_inventory.png | bin | 0 -> 710 bytes |
| -rw-r--r-- | signs/textures/signs_wooden_inventory.png | bin | 606 -> 581 bytes |
| -rw-r--r-- | signs/textures/signs_wooden_long.png | bin | 0 -> 524 bytes |
| -rw-r--r-- | signs/textures/signs_wooden_long_inventory.png | bin | 0 -> 636 bytes |
8 files changed, 0 insertions, 0 deletions
diff --git a/signs/textures/signs_label.png b/signs/textures/signs_label.png Binary files differnew file mode 100644 index 0000000..4cf7edc --- /dev/null +++ b/signs/textures/signs_label.png diff --git a/signs/textures/signs_label_medium_inventory.png b/signs/textures/signs_label_medium_inventory.png Binary files differnew file mode 100644 index 0000000..9622201 --- /dev/null +++ b/signs/textures/signs_label_medium_inventory.png diff --git a/signs/textures/signs_label_small_inventory.png b/signs/textures/signs_label_small_inventory.png Binary files differnew file mode 100644 index 0000000..2dd60af --- /dev/null +++ b/signs/textures/signs_label_small_inventory.png diff --git a/signs/textures/signs_wooden.png b/signs/textures/signs_wooden.png Binary files differnew file mode 100644 index 0000000..164948a --- /dev/null +++ b/signs/textures/signs_wooden.png diff --git a/signs/textures/signs_wooden_direction_inventory.png b/signs/textures/signs_wooden_direction_inventory.png Binary files differnew file mode 100644 index 0000000..c4be3af --- /dev/null +++ b/signs/textures/signs_wooden_direction_inventory.png diff --git a/signs/textures/signs_wooden_inventory.png b/signs/textures/signs_wooden_inventory.png Binary files differindex d997480..bb7e949 100644 --- a/signs/textures/signs_wooden_inventory.png +++ b/signs/textures/signs_wooden_inventory.png diff --git a/signs/textures/signs_wooden_long.png b/signs/textures/signs_wooden_long.png Binary files differnew file mode 100644 index 0000000..c23a56a --- /dev/null +++ b/signs/textures/signs_wooden_long.png diff --git a/signs/textures/signs_wooden_long_inventory.png b/signs/textures/signs_wooden_long_inventory.png Binary files differnew file mode 100644 index 0000000..78d2545 --- /dev/null +++ b/signs/textures/signs_wooden_long_inventory.png |
