aboutsummaryrefslogtreecommitdiff
path: root/signs/textures
diff options
context:
space:
mode:
authororwell96 <orwell@bleipb.de>2018-12-03 23:17:35 +0100
committerorwell96 <orwell@bleipb.de>2018-12-03 23:17:35 +0100
commit8928f78ee6305e29ed8d3b9395fcb6564c984fdf (patch)
treecd250c2b98d7131158e3744efe238780cec73fec /signs/textures
parenteccdad46ef2b38cd061aab7ae6bcb252a67c2218 (diff)
parenta3e0d36a68247cac40349d9089fe3c71546d75e8 (diff)
downloaddisplay_modpack-master.tar.gz
display_modpack-master.tar.bz2
display_modpack-master.zip
Merge remote-tracking branch 'upstream/master'HEADmaster
Resolved conflicts by reordering of files
Diffstat (limited to 'signs/textures')
-rw-r--r--signs/textures/signs_label.pngbin0 -> 404 bytes
-rw-r--r--signs/textures/signs_label_medium_inventory.pngbin0 -> 406 bytes
-rw-r--r--signs/textures/signs_label_small_inventory.pngbin0 -> 417 bytes
-rw-r--r--signs/textures/signs_wooden.pngbin0 -> 574 bytes
-rw-r--r--signs/textures/signs_wooden_direction_inventory.pngbin0 -> 710 bytes
-rw-r--r--signs/textures/signs_wooden_inventory.pngbin606 -> 581 bytes
-rw-r--r--signs/textures/signs_wooden_long.pngbin0 -> 524 bytes
-rw-r--r--signs/textures/signs_wooden_long_inventory.pngbin0 -> 636 bytes
8 files changed, 0 insertions, 0 deletions
diff --git a/signs/textures/signs_label.png b/signs/textures/signs_label.png
new file mode 100644
index 0000000..4cf7edc
--- /dev/null
+++ b/signs/textures/signs_label.png
Binary files differ
diff --git a/signs/textures/signs_label_medium_inventory.png b/signs/textures/signs_label_medium_inventory.png
new file mode 100644
index 0000000..9622201
--- /dev/null
+++ b/signs/textures/signs_label_medium_inventory.png
Binary files differ
diff --git a/signs/textures/signs_label_small_inventory.png b/signs/textures/signs_label_small_inventory.png
new file mode 100644
index 0000000..2dd60af
--- /dev/null
+++ b/signs/textures/signs_label_small_inventory.png
Binary files differ
diff --git a/signs/textures/signs_wooden.png b/signs/textures/signs_wooden.png
new file mode 100644
index 0000000..164948a
--- /dev/null
+++ b/signs/textures/signs_wooden.png
Binary files differ
diff --git a/signs/textures/signs_wooden_direction_inventory.png b/signs/textures/signs_wooden_direction_inventory.png
new file mode 100644
index 0000000..c4be3af
--- /dev/null
+++ b/signs/textures/signs_wooden_direction_inventory.png
Binary files differ
diff --git a/signs/textures/signs_wooden_inventory.png b/signs/textures/signs_wooden_inventory.png
index d997480..bb7e949 100644
--- a/signs/textures/signs_wooden_inventory.png
+++ b/signs/textures/signs_wooden_inventory.png
Binary files differ
diff --git a/signs/textures/signs_wooden_long.png b/signs/textures/signs_wooden_long.png
new file mode 100644
index 0000000..c23a56a
--- /dev/null
+++ b/signs/textures/signs_wooden_long.png
Binary files differ
diff --git a/signs/textures/signs_wooden_long_inventory.png b/signs/textures/signs_wooden_long_inventory.png
new file mode 100644
index 0000000..78d2545
--- /dev/null
+++ b/signs/textures/signs_wooden_long_inventory.png
Binary files differ