From 24a2a946b35279605e645349bd6b82e9e60aac88 Mon Sep 17 00:00:00 2001 From: Normand Briere <nbriere@noware.ca> Date: Wed, 14 Aug 2019 23:35:34 -0400 Subject: [PATCH] Fix textures in jar. --- ObjEditor.java | 4 ++-- textures/D&R/Dreams&Reality/Something Like Paradise.jpg | 0 textures/D&R/Dreams&Reality/icons/Something Like Paradise.jpg | 0 textures/D&R/Dreams&Reality/Saigon Sunset.jpg | 0 textures/D&R/Dreams&Reality/icons/Tranquility.jpg | 0 textures/D&R/Dreams&Reality/icons/Saigon Sunset.jpg | 0 textures/D&R/Dreams&Reality/Tranquility.jpg | 0 textures/D&R/Dreams&Reality/Atlantica.jpg | 0 textures/D&R/Dreams&Reality/Haunted.jpg | 0 textures/D&R/Dreams&Reality/icons/Wasteland.jpg | 0 textures/D&R/Dreams&Reality/White Noise.jpg | 0 textures/D&R/Dreams&Reality/icons/Cold December.jpg | 0 textures/D&R/Dreams&Reality/Safe Haven.jpg | 0 textures/D&R/Dreams&Reality/icons/Dream Castle.jpg | 0 textures/D&R/Dreams&Reality/icons/Ancient.jpg | 0 textures/D&R/Dreams&Reality/The Darkness.jpg | 0 textures/D&R/Dreams&Reality/icons/The Darkness.jpg | 0 textures/D&R/Dreams&Reality/icons/Haunted.jpg | 0 textures/D&R/Dreams&Reality/icons/Ruins Of Atlantis.jpg | 0 textures/D&R/Dreams&Reality/icons/Prehistoria.jpg | 0 textures/D&R/Dreams&Reality/Realm Of Fire.jpg | 0 textures/D&R/Dreams&Reality/icons/The Mediterranean.jpg | 0 textures/D&R/Dreams&Reality/icons/Realm Of Fire.jpg | 0 textures/D&R/Dreams&Reality/icons/Emerald Jungle.jpg | 0 textures/D&R/Dreams&Reality/icons/Lost.jpg | 0 textures/D&R/Dreams&Reality/icons/Island Getaway.jpg | 0 textures/D&R/Dreams&Reality/Prehistoria.jpg | 0 textures/D&R/Dreams&Reality/Mount Olympus.jpg | 0 textures/D&R/Dreams&Reality/Emerald Jungle.jpg | 0 textures/D&R/Dreams&Reality/Enchantment.jpg | 0 textures/D&R/Dreams&Reality/icons/Enchantment.jpg | 0 textures/D&R/Dreams&Reality/icons/Purple Peace.jpg | 0 textures/D&R/Dreams&Reality/Ruins Of Atlantis.jpg | 0 textures/D&R/Dreams&Reality/Ruined.jpg | 0 textures/D&R/Dreams&Reality/Ancient.jpg | 0 textures/D&R/Dreams&Reality/Lost.jpg | 0 GroupEditor.java | 21 +++++++++++---------- textures/D&R/Dreams&Reality/Island Getaway.jpg | 0 textures/D&R/Dreams&Reality/icons/Mount Olympus.jpg | 0 Wav.java | 2 +- textures/D&R/Dreams&Reality/Sun Touched.jpg | 0 textures/D&R/Dreams&Reality/Forbidden Forest.jpg | 0 textures/D&R/Dreams&Reality/The Mediterranean.jpg | 0 textures/D&R/Dreams&Reality/The Clearing.jpg | 0 textures/D&R/Dreams&Reality/Wasteland.jpg | 0 textures/D&R/Dreams&Reality/icons/The Clearing.jpg | 0 textures/D&R/Dreams&Reality/Araenia Rising.jpg | 0 textures/D&R/Dreams&Reality/Dream Castle.jpg | 0 textures/D&R/Dreams&Reality/Solitary.jpg | 0 textures/D&R/Dreams&Reality/icons/A Fairytale.jpg | 0 textures/D&R/Dreams&Reality/icons/Atlantica.jpg | 0 textures/D&R/Dreams&Reality/icons/Sun Touched.jpg | 0 textures/D&R/Dreams&Reality/icons/White Noise.jpg | 0 Grafreed.java | 3 +++ textures/D&R/Dreams&Reality/icons/Forbidden Forest.jpg | 0 /dev/null | 0 textures/D&R/Dreams&Reality/icons/Ruined.jpg | 0 textures/D&R/Dreams&Reality/Aztec Sun.jpg | 0 textures/D&R/Dreams&Reality/icons/Safe Haven.jpg | 0 textures/D&R/Dreams&Reality/icons/Solitary.jpg | 0 textures/D&R/Dreams&Reality/icons/Araenia Rising.jpg | 0 textures/D&R/Dreams&Reality/A Fairytale.jpg | 0 textures/D&R/Dreams&Reality/Cold December.jpg | 0 textures/D&R/Dreams&Reality/Purple Peace.jpg | 0 textures/D&R/Dreams&Reality/icons/Aztec Sun.jpg | 0 65 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Dreams&Reality/icons/A Fairytale.jpg b/Dreams&Reality/icons/A Fairytale.jpg deleted file mode 100644 index 5a0ecee..0000000 --- a/Dreams&Reality/icons/A Fairytale.jpg +++ /dev/null Binary files differ diff --git a/Dreams&Reality/icons/Atlantica.jpg b/Dreams&Reality/icons/Atlantica.jpg deleted file mode 100644 index 22e48cc..0000000 --- a/Dreams&Reality/icons/Atlantica.jpg +++ /dev/null Binary files differ diff --git a/Dreams&Reality/icons/Lost.jpg b/Dreams&Reality/icons/Lost.jpg deleted file mode 100644 index 30fad84..0000000 --- a/Dreams&Reality/icons/Lost.jpg +++ /dev/null Binary files differ diff --git a/Dreams&Reality/icons/Ruins Of Atlantis.jpg b/Dreams&Reality/icons/Ruins Of Atlantis.jpg deleted file mode 100644 index b2bdfe8..0000000 --- a/Dreams&Reality/icons/Ruins Of Atlantis.jpg +++ /dev/null Binary files differ diff --git a/Dreams&Reality/icons/The Darkness.jpg b/Dreams&Reality/icons/The Darkness.jpg deleted file mode 100644 index b5b81f2..0000000 --- a/Dreams&Reality/icons/The Darkness.jpg +++ /dev/null Binary files differ diff --git a/Dreams&Reality/icons/The Mediterranean.jpg b/Dreams&Reality/icons/The Mediterranean.jpg deleted file mode 100644 index ab05fd2..0000000 --- a/Dreams&Reality/icons/The Mediterranean.jpg +++ /dev/null Binary files differ diff --git a/Grafreed.java b/Grafreed.java index 40118a6..77a2921 100644 --- a/Grafreed.java +++ b/Grafreed.java @@ -955,6 +955,8 @@ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream); readobj = (Object3D) p.readObject(); + p.close(); + zstream.close(); istream.close(); readobj.ResetDisplayList(); @@ -968,6 +970,7 @@ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream); readobj = (Object3D) p.readObject(); + p.close(); istream.close(); readobj.ResetDisplayList(); diff --git a/GroupEditor.java b/GroupEditor.java index b32dee9..651e8a8 100644 --- a/GroupEditor.java +++ b/GroupEditor.java @@ -928,7 +928,7 @@ JTabbedPane resourcecontainer; cGridBag currenttab; - boolean added; // patch for jar + //boolean added; // patch for jar int tabcount = 0; int colcount = 0; @@ -940,17 +940,19 @@ public void ResourceCallBack(String[] path) { - for (int i = 0; i < path.length; i++) - System.out.print(path[i] + "/"); - System.out.println(); +// for (int i = 0; i < path.length; i++) +// System.out.print(path[i] + "/"); +// System.out.println(); if (//rowcount == 0 || - path.length == 1) + path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store")) { currenttab = new cGridBag(); - added = false; String tabname = path[0]; // String.valueOf((char)('A'+tabcount)); currenttab.setName(tabname); + //added = false; + resourcecontainer.add(currenttab); + resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname); rowcount = 1; colcount = 0; texturecount = 0; @@ -958,12 +960,11 @@ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg")) { - if (!added) + //if (!added) { - added = true; - resourcecontainer.add(currenttab); + //added = true; String tabname = path[0]; // String.valueOf((char)('A'+tabcount)); - resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname); + currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname)); } AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab); diff --git a/ObjEditor.java b/ObjEditor.java index c07bcab..9f18912 100644 --- a/ObjEditor.java +++ b/ObjEditor.java @@ -1789,7 +1789,7 @@ frame.getContentPane().setLayout(new BorderLayout()); /**/ - JTabbedPane worldPane = new JTabbedPane(); + //JTabbedPane worldPane = new JTabbedPane(); //worldPane.add(bigPanel); //worldPane.add(worldPanel); /**/ @@ -5550,7 +5550,7 @@ copy.versionlist = new Object3D[100]; copy.versionindex = -1; - Save(true); + //Save(true); } //? SetUndoStates(); diff --git a/Wav.java b/Wav.java index d548db5..88821c3 100644 --- a/Wav.java +++ b/Wav.java @@ -109,7 +109,7 @@ static int minutes = 10; - static byte[] theStream = new byte[44100*2 * 60 * minutes]; + static byte[] theStream = new byte[0]; // 44100*2 * 60 * minutes]; static int cursor = 0; // +735 per frame = 44100 Hz / 120 Hz * 2 (for 16 bits) diff --git a/Dreams&Reality/A Fairytale.jpg b/textures/D&R/Dreams&Reality/A Fairytale.jpg similarity index 100% rename from Dreams&Reality/A Fairytale.jpg rename to textures/D&R/Dreams&Reality/A Fairytale.jpg Binary files differ diff --git a/Dreams&Reality/Ancient.jpg b/textures/D&R/Dreams&Reality/Ancient.jpg similarity index 100% rename from Dreams&Reality/Ancient.jpg rename to textures/D&R/Dreams&Reality/Ancient.jpg Binary files differ diff --git a/Dreams&Reality/Araenia Rising.jpg b/textures/D&R/Dreams&Reality/Araenia Rising.jpg similarity index 100% rename from Dreams&Reality/Araenia Rising.jpg rename to textures/D&R/Dreams&Reality/Araenia Rising.jpg Binary files differ diff --git a/Dreams&Reality/Atlantica.jpg b/textures/D&R/Dreams&Reality/Atlantica.jpg similarity index 100% rename from Dreams&Reality/Atlantica.jpg rename to textures/D&R/Dreams&Reality/Atlantica.jpg Binary files differ diff --git a/Dreams&Reality/Aztec Sun.jpg b/textures/D&R/Dreams&Reality/Aztec Sun.jpg similarity index 100% rename from Dreams&Reality/Aztec Sun.jpg rename to textures/D&R/Dreams&Reality/Aztec Sun.jpg Binary files differ diff --git a/Dreams&Reality/Cold December.jpg b/textures/D&R/Dreams&Reality/Cold December.jpg similarity index 100% rename from Dreams&Reality/Cold December.jpg rename to textures/D&R/Dreams&Reality/Cold December.jpg Binary files differ diff --git a/Dreams&Reality/Dream Castle.jpg b/textures/D&R/Dreams&Reality/Dream Castle.jpg similarity index 100% rename from Dreams&Reality/Dream Castle.jpg rename to textures/D&R/Dreams&Reality/Dream Castle.jpg Binary files differ diff --git a/Dreams&Reality/Emerald Jungle.jpg b/textures/D&R/Dreams&Reality/Emerald Jungle.jpg similarity index 100% rename from Dreams&Reality/Emerald Jungle.jpg rename to textures/D&R/Dreams&Reality/Emerald Jungle.jpg Binary files differ diff --git a/Dreams&Reality/Enchantment.jpg b/textures/D&R/Dreams&Reality/Enchantment.jpg similarity index 100% rename from Dreams&Reality/Enchantment.jpg rename to textures/D&R/Dreams&Reality/Enchantment.jpg Binary files differ diff --git a/Dreams&Reality/Forbidden Forest.jpg b/textures/D&R/Dreams&Reality/Forbidden Forest.jpg similarity index 100% rename from Dreams&Reality/Forbidden Forest.jpg rename to textures/D&R/Dreams&Reality/Forbidden Forest.jpg Binary files differ diff --git a/Dreams&Reality/Haunted.jpg b/textures/D&R/Dreams&Reality/Haunted.jpg similarity index 100% rename from Dreams&Reality/Haunted.jpg rename to textures/D&R/Dreams&Reality/Haunted.jpg Binary files differ diff --git a/Dreams&Reality/Island Getaway.jpg b/textures/D&R/Dreams&Reality/Island Getaway.jpg similarity index 100% rename from Dreams&Reality/Island Getaway.jpg rename to textures/D&R/Dreams&Reality/Island Getaway.jpg Binary files differ diff --git a/Dreams&Reality/Lost.jpg b/textures/D&R/Dreams&Reality/Lost.jpg similarity index 100% rename from Dreams&Reality/Lost.jpg rename to textures/D&R/Dreams&Reality/Lost.jpg Binary files differ diff --git a/Dreams&Reality/Mount Olympus.jpg b/textures/D&R/Dreams&Reality/Mount Olympus.jpg similarity index 100% rename from Dreams&Reality/Mount Olympus.jpg rename to textures/D&R/Dreams&Reality/Mount Olympus.jpg Binary files differ diff --git a/Dreams&Reality/Prehistoria.jpg b/textures/D&R/Dreams&Reality/Prehistoria.jpg similarity index 100% rename from Dreams&Reality/Prehistoria.jpg rename to textures/D&R/Dreams&Reality/Prehistoria.jpg Binary files differ diff --git a/Dreams&Reality/Purple Peace.jpg b/textures/D&R/Dreams&Reality/Purple Peace.jpg similarity index 100% rename from Dreams&Reality/Purple Peace.jpg rename to textures/D&R/Dreams&Reality/Purple Peace.jpg Binary files differ diff --git a/Dreams&Reality/Realm Of Fire.jpg b/textures/D&R/Dreams&Reality/Realm Of Fire.jpg similarity index 100% rename from Dreams&Reality/Realm Of Fire.jpg rename to textures/D&R/Dreams&Reality/Realm Of Fire.jpg Binary files differ diff --git a/Dreams&Reality/Ruined.jpg b/textures/D&R/Dreams&Reality/Ruined.jpg similarity index 100% rename from Dreams&Reality/Ruined.jpg rename to textures/D&R/Dreams&Reality/Ruined.jpg Binary files differ diff --git a/Dreams&Reality/Ruins Of Atlantis.jpg b/textures/D&R/Dreams&Reality/Ruins Of Atlantis.jpg similarity index 100% rename from Dreams&Reality/Ruins Of Atlantis.jpg rename to textures/D&R/Dreams&Reality/Ruins Of Atlantis.jpg Binary files differ diff --git a/Dreams&Reality/Safe Haven.jpg b/textures/D&R/Dreams&Reality/Safe Haven.jpg similarity index 100% rename from Dreams&Reality/Safe Haven.jpg rename to textures/D&R/Dreams&Reality/Safe Haven.jpg Binary files differ diff --git a/Dreams&Reality/Saigon Sunset.jpg b/textures/D&R/Dreams&Reality/Saigon Sunset.jpg similarity index 100% rename from Dreams&Reality/Saigon Sunset.jpg rename to textures/D&R/Dreams&Reality/Saigon Sunset.jpg Binary files differ diff --git a/Dreams&Reality/Solitary.jpg b/textures/D&R/Dreams&Reality/Solitary.jpg similarity index 100% rename from Dreams&Reality/Solitary.jpg rename to textures/D&R/Dreams&Reality/Solitary.jpg Binary files differ diff --git a/Dreams&Reality/Something Like Paradise.jpg b/textures/D&R/Dreams&Reality/Something Like Paradise.jpg similarity index 100% rename from Dreams&Reality/Something Like Paradise.jpg rename to textures/D&R/Dreams&Reality/Something Like Paradise.jpg Binary files differ diff --git a/Dreams&Reality/Sun Touched.jpg b/textures/D&R/Dreams&Reality/Sun Touched.jpg similarity index 100% rename from Dreams&Reality/Sun Touched.jpg rename to textures/D&R/Dreams&Reality/Sun Touched.jpg Binary files differ diff --git a/Dreams&Reality/The Clearing.jpg b/textures/D&R/Dreams&Reality/The Clearing.jpg similarity index 100% rename from Dreams&Reality/The Clearing.jpg rename to textures/D&R/Dreams&Reality/The Clearing.jpg Binary files differ diff --git a/Dreams&Reality/The Darkness.jpg b/textures/D&R/Dreams&Reality/The Darkness.jpg similarity index 100% rename from Dreams&Reality/The Darkness.jpg rename to textures/D&R/Dreams&Reality/The Darkness.jpg Binary files differ diff --git a/Dreams&Reality/The Mediterranean.jpg b/textures/D&R/Dreams&Reality/The Mediterranean.jpg similarity index 100% rename from Dreams&Reality/The Mediterranean.jpg rename to textures/D&R/Dreams&Reality/The Mediterranean.jpg Binary files differ diff --git a/Dreams&Reality/Tranquility.jpg b/textures/D&R/Dreams&Reality/Tranquility.jpg similarity index 100% rename from Dreams&Reality/Tranquility.jpg rename to textures/D&R/Dreams&Reality/Tranquility.jpg Binary files differ diff --git a/Dreams&Reality/Wasteland.jpg b/textures/D&R/Dreams&Reality/Wasteland.jpg similarity index 100% rename from Dreams&Reality/Wasteland.jpg rename to textures/D&R/Dreams&Reality/Wasteland.jpg Binary files differ diff --git a/Dreams&Reality/White Noise.jpg b/textures/D&R/Dreams&Reality/White Noise.jpg similarity index 100% rename from Dreams&Reality/White Noise.jpg rename to textures/D&R/Dreams&Reality/White Noise.jpg Binary files differ diff --git a/Dreams&Reality/icons/Aztec Sun.jpg b/textures/D&R/Dreams&Reality/icons/A Fairytale.jpg similarity index 79% copy from Dreams&Reality/icons/Aztec Sun.jpg copy to textures/D&R/Dreams&Reality/icons/A Fairytale.jpg index a06bb64..aca5210 100644 --- a/Dreams&Reality/icons/Aztec Sun.jpg +++ b/textures/D&R/Dreams&Reality/icons/A Fairytale.jpg Binary files differ diff --git a/Dreams&Reality/icons/Ancient.jpg b/textures/D&R/Dreams&Reality/icons/Ancient.jpg similarity index 80% rename from Dreams&Reality/icons/Ancient.jpg rename to textures/D&R/Dreams&Reality/icons/Ancient.jpg index 0b5176e..5633751 100644 --- a/Dreams&Reality/icons/Ancient.jpg +++ b/textures/D&R/Dreams&Reality/icons/Ancient.jpg Binary files differ diff --git a/Dreams&Reality/icons/Araenia Rising.jpg b/textures/D&R/Dreams&Reality/icons/Araenia Rising.jpg similarity index 81% rename from Dreams&Reality/icons/Araenia Rising.jpg rename to textures/D&R/Dreams&Reality/icons/Araenia Rising.jpg index b0e920c..60b1936 100644 --- a/Dreams&Reality/icons/Araenia Rising.jpg +++ b/textures/D&R/Dreams&Reality/icons/Araenia Rising.jpg Binary files differ diff --git a/Dreams&Reality/icons/Aztec Sun.jpg b/textures/D&R/Dreams&Reality/icons/Atlantica.jpg similarity index 82% copy from Dreams&Reality/icons/Aztec Sun.jpg copy to textures/D&R/Dreams&Reality/icons/Atlantica.jpg index a06bb64..31ed6ef 100644 --- a/Dreams&Reality/icons/Aztec Sun.jpg +++ b/textures/D&R/Dreams&Reality/icons/Atlantica.jpg Binary files differ diff --git a/Dreams&Reality/icons/Aztec Sun.jpg b/textures/D&R/Dreams&Reality/icons/Aztec Sun.jpg similarity index 79% copy from Dreams&Reality/icons/Aztec Sun.jpg copy to textures/D&R/Dreams&Reality/icons/Aztec Sun.jpg index a06bb64..2bcbcde 100644 --- a/Dreams&Reality/icons/Aztec Sun.jpg +++ b/textures/D&R/Dreams&Reality/icons/Aztec Sun.jpg Binary files differ diff --git a/Dreams&Reality/icons/Cold December.jpg b/textures/D&R/Dreams&Reality/icons/Cold December.jpg similarity index 83% rename from Dreams&Reality/icons/Cold December.jpg rename to textures/D&R/Dreams&Reality/icons/Cold December.jpg index bee02b2..30c40cf 100644 --- a/Dreams&Reality/icons/Cold December.jpg +++ b/textures/D&R/Dreams&Reality/icons/Cold December.jpg Binary files differ diff --git a/Dreams&Reality/icons/Dream Castle.jpg b/textures/D&R/Dreams&Reality/icons/Dream Castle.jpg similarity index 74% rename from Dreams&Reality/icons/Dream Castle.jpg rename to textures/D&R/Dreams&Reality/icons/Dream Castle.jpg index b906b3e..600dc81 100644 --- a/Dreams&Reality/icons/Dream Castle.jpg +++ b/textures/D&R/Dreams&Reality/icons/Dream Castle.jpg Binary files differ diff --git a/Dreams&Reality/icons/Emerald Jungle.jpg b/textures/D&R/Dreams&Reality/icons/Emerald Jungle.jpg similarity index 80% rename from Dreams&Reality/icons/Emerald Jungle.jpg rename to textures/D&R/Dreams&Reality/icons/Emerald Jungle.jpg index 11b3e0f..1415189 100644 --- a/Dreams&Reality/icons/Emerald Jungle.jpg +++ b/textures/D&R/Dreams&Reality/icons/Emerald Jungle.jpg Binary files differ diff --git a/Dreams&Reality/icons/Enchantment.jpg b/textures/D&R/Dreams&Reality/icons/Enchantment.jpg similarity index 91% rename from Dreams&Reality/icons/Enchantment.jpg rename to textures/D&R/Dreams&Reality/icons/Enchantment.jpg index 54f892c..02ea802 100644 --- a/Dreams&Reality/icons/Enchantment.jpg +++ b/textures/D&R/Dreams&Reality/icons/Enchantment.jpg Binary files differ diff --git a/Dreams&Reality/icons/Forbidden Forest.jpg b/textures/D&R/Dreams&Reality/icons/Forbidden Forest.jpg similarity index 81% rename from Dreams&Reality/icons/Forbidden Forest.jpg rename to textures/D&R/Dreams&Reality/icons/Forbidden Forest.jpg index 4715f21..0b8c1aa 100644 --- a/Dreams&Reality/icons/Forbidden Forest.jpg +++ b/textures/D&R/Dreams&Reality/icons/Forbidden Forest.jpg Binary files differ diff --git a/Dreams&Reality/icons/Haunted.jpg b/textures/D&R/Dreams&Reality/icons/Haunted.jpg similarity index 80% rename from Dreams&Reality/icons/Haunted.jpg rename to textures/D&R/Dreams&Reality/icons/Haunted.jpg index c014a20..98e1738 100644 --- a/Dreams&Reality/icons/Haunted.jpg +++ b/textures/D&R/Dreams&Reality/icons/Haunted.jpg Binary files differ diff --git a/Dreams&Reality/icons/Island Getaway.jpg b/textures/D&R/Dreams&Reality/icons/Island Getaway.jpg similarity index 78% rename from Dreams&Reality/icons/Island Getaway.jpg rename to textures/D&R/Dreams&Reality/icons/Island Getaway.jpg index 3263335..cc975f1 100644 --- a/Dreams&Reality/icons/Island Getaway.jpg +++ b/textures/D&R/Dreams&Reality/icons/Island Getaway.jpg Binary files differ diff --git a/Dreams&Reality/icons/Solitary.jpg b/textures/D&R/Dreams&Reality/icons/Lost.jpg similarity index 92% rename from Dreams&Reality/icons/Solitary.jpg rename to textures/D&R/Dreams&Reality/icons/Lost.jpg index d4887a9..8984ef6 100644 --- a/Dreams&Reality/icons/Solitary.jpg +++ b/textures/D&R/Dreams&Reality/icons/Lost.jpg Binary files differ diff --git a/Dreams&Reality/icons/Mount Olympus.jpg b/textures/D&R/Dreams&Reality/icons/Mount Olympus.jpg similarity index 77% rename from Dreams&Reality/icons/Mount Olympus.jpg rename to textures/D&R/Dreams&Reality/icons/Mount Olympus.jpg index caa5d1e..75b84e5 100644 --- a/Dreams&Reality/icons/Mount Olympus.jpg +++ b/textures/D&R/Dreams&Reality/icons/Mount Olympus.jpg Binary files differ diff --git a/Dreams&Reality/icons/Prehistoria.jpg b/textures/D&R/Dreams&Reality/icons/Prehistoria.jpg similarity index 78% rename from Dreams&Reality/icons/Prehistoria.jpg rename to textures/D&R/Dreams&Reality/icons/Prehistoria.jpg index 03532d6..1ae9eab 100644 --- a/Dreams&Reality/icons/Prehistoria.jpg +++ b/textures/D&R/Dreams&Reality/icons/Prehistoria.jpg Binary files differ diff --git a/Dreams&Reality/icons/Purple Peace.jpg b/textures/D&R/Dreams&Reality/icons/Purple Peace.jpg similarity index 75% rename from Dreams&Reality/icons/Purple Peace.jpg rename to textures/D&R/Dreams&Reality/icons/Purple Peace.jpg index eaf6981..d2df9ee 100644 --- a/Dreams&Reality/icons/Purple Peace.jpg +++ b/textures/D&R/Dreams&Reality/icons/Purple Peace.jpg Binary files differ diff --git a/Dreams&Reality/icons/Realm Of Fire.jpg b/textures/D&R/Dreams&Reality/icons/Realm Of Fire.jpg similarity index 78% rename from Dreams&Reality/icons/Realm Of Fire.jpg rename to textures/D&R/Dreams&Reality/icons/Realm Of Fire.jpg index 36f3e96..4e0c21f 100644 --- a/Dreams&Reality/icons/Realm Of Fire.jpg +++ b/textures/D&R/Dreams&Reality/icons/Realm Of Fire.jpg Binary files differ diff --git a/Dreams&Reality/icons/Ruined.jpg b/textures/D&R/Dreams&Reality/icons/Ruined.jpg similarity index 77% rename from Dreams&Reality/icons/Ruined.jpg rename to textures/D&R/Dreams&Reality/icons/Ruined.jpg index dc26816..d59de3d 100644 --- a/Dreams&Reality/icons/Ruined.jpg +++ b/textures/D&R/Dreams&Reality/icons/Ruined.jpg Binary files differ diff --git a/Dreams&Reality/icons/Aztec Sun.jpg b/textures/D&R/Dreams&Reality/icons/Ruins Of Atlantis.jpg similarity index 85% copy from Dreams&Reality/icons/Aztec Sun.jpg copy to textures/D&R/Dreams&Reality/icons/Ruins Of Atlantis.jpg index a06bb64..87af8e6 100644 --- a/Dreams&Reality/icons/Aztec Sun.jpg +++ b/textures/D&R/Dreams&Reality/icons/Ruins Of Atlantis.jpg Binary files differ diff --git a/Dreams&Reality/icons/Safe Haven.jpg b/textures/D&R/Dreams&Reality/icons/Safe Haven.jpg similarity index 79% rename from Dreams&Reality/icons/Safe Haven.jpg rename to textures/D&R/Dreams&Reality/icons/Safe Haven.jpg index 95ec6ee..fc3c448 100644 --- a/Dreams&Reality/icons/Safe Haven.jpg +++ b/textures/D&R/Dreams&Reality/icons/Safe Haven.jpg Binary files differ diff --git a/Dreams&Reality/icons/Saigon Sunset.jpg b/textures/D&R/Dreams&Reality/icons/Saigon Sunset.jpg similarity index 81% rename from Dreams&Reality/icons/Saigon Sunset.jpg rename to textures/D&R/Dreams&Reality/icons/Saigon Sunset.jpg index af25700..abff5ce 100644 --- a/Dreams&Reality/icons/Saigon Sunset.jpg +++ b/textures/D&R/Dreams&Reality/icons/Saigon Sunset.jpg Binary files differ diff --git a/Dreams&Reality/icons/Solitary.jpg b/textures/D&R/Dreams&Reality/icons/Solitary.jpg similarity index 91% copy from Dreams&Reality/icons/Solitary.jpg copy to textures/D&R/Dreams&Reality/icons/Solitary.jpg index d4887a9..15b364c 100644 --- a/Dreams&Reality/icons/Solitary.jpg +++ b/textures/D&R/Dreams&Reality/icons/Solitary.jpg Binary files differ diff --git a/Dreams&Reality/icons/Something Like Paradise.jpg b/textures/D&R/Dreams&Reality/icons/Something Like Paradise.jpg similarity index 74% rename from Dreams&Reality/icons/Something Like Paradise.jpg rename to textures/D&R/Dreams&Reality/icons/Something Like Paradise.jpg index f027707..7ed04a4 100644 --- a/Dreams&Reality/icons/Something Like Paradise.jpg +++ b/textures/D&R/Dreams&Reality/icons/Something Like Paradise.jpg Binary files differ diff --git a/Dreams&Reality/icons/Sun Touched.jpg b/textures/D&R/Dreams&Reality/icons/Sun Touched.jpg similarity index 81% rename from Dreams&Reality/icons/Sun Touched.jpg rename to textures/D&R/Dreams&Reality/icons/Sun Touched.jpg index 23698bc..ef965bd 100644 --- a/Dreams&Reality/icons/Sun Touched.jpg +++ b/textures/D&R/Dreams&Reality/icons/Sun Touched.jpg Binary files differ diff --git a/Dreams&Reality/icons/The Clearing.jpg b/textures/D&R/Dreams&Reality/icons/The Clearing.jpg similarity index 91% rename from Dreams&Reality/icons/The Clearing.jpg rename to textures/D&R/Dreams&Reality/icons/The Clearing.jpg index 9633c4f..5274e10 100644 --- a/Dreams&Reality/icons/The Clearing.jpg +++ b/textures/D&R/Dreams&Reality/icons/The Clearing.jpg Binary files differ diff --git a/Dreams&Reality/icons/Aztec Sun.jpg b/textures/D&R/Dreams&Reality/icons/The Darkness.jpg similarity index 85% rename from Dreams&Reality/icons/Aztec Sun.jpg rename to textures/D&R/Dreams&Reality/icons/The Darkness.jpg index a06bb64..71f13c9 100644 --- a/Dreams&Reality/icons/Aztec Sun.jpg +++ b/textures/D&R/Dreams&Reality/icons/The Darkness.jpg Binary files differ diff --git a/Dreams&Reality/icons/Solitary.jpg b/textures/D&R/Dreams&Reality/icons/The Mediterranean.jpg similarity index 91% copy from Dreams&Reality/icons/Solitary.jpg copy to textures/D&R/Dreams&Reality/icons/The Mediterranean.jpg index d4887a9..b9abe79 100644 --- a/Dreams&Reality/icons/Solitary.jpg +++ b/textures/D&R/Dreams&Reality/icons/The Mediterranean.jpg Binary files differ diff --git a/Dreams&Reality/icons/Tranquility.jpg b/textures/D&R/Dreams&Reality/icons/Tranquility.jpg similarity index 91% rename from Dreams&Reality/icons/Tranquility.jpg rename to textures/D&R/Dreams&Reality/icons/Tranquility.jpg index 9eea404..602aa20 100644 --- a/Dreams&Reality/icons/Tranquility.jpg +++ b/textures/D&R/Dreams&Reality/icons/Tranquility.jpg Binary files differ diff --git a/Dreams&Reality/icons/Wasteland.jpg b/textures/D&R/Dreams&Reality/icons/Wasteland.jpg similarity index 85% rename from Dreams&Reality/icons/Wasteland.jpg rename to textures/D&R/Dreams&Reality/icons/Wasteland.jpg index e8e7f99..aac4469 100644 --- a/Dreams&Reality/icons/Wasteland.jpg +++ b/textures/D&R/Dreams&Reality/icons/Wasteland.jpg Binary files differ diff --git a/Dreams&Reality/icons/White Noise.jpg b/textures/D&R/Dreams&Reality/icons/White Noise.jpg similarity index 79% rename from Dreams&Reality/icons/White Noise.jpg rename to textures/D&R/Dreams&Reality/icons/White Noise.jpg index 7c12957..d6660ea 100644 --- a/Dreams&Reality/icons/White Noise.jpg +++ b/textures/D&R/Dreams&Reality/icons/White Noise.jpg Binary files differ -- Gitblit v1.6.2