From 32f9a3943021b1bfec033e0545c5e349b5ec12f6 Mon Sep 17 00:00:00 2001 From: Daniel Amberson Date: Sun, 26 Jul 2020 19:29:15 -0500 Subject: [PATCH 1/2] cogwheel glowup the cogwheels no longer have stretched vanilla textures, they now have their own unique textures also blockbench is dumb and reverted my progress \o/ --- .../assets/create/models/block/cogwheel.json | 208 ++++----- .../models/block/cogwheel_shaftless.json | 178 ++++---- .../create/models/block/large_cogwheel.json | 399 ++++++++++-------- .../assets/create/textures/block/cogwheel.png | Bin 0 -> 648 bytes .../create/textures/block/large_cogwheel.png | Bin 0 -> 979 bytes 5 files changed, 418 insertions(+), 367 deletions(-) create mode 100644 src/main/resources/assets/create/textures/block/cogwheel.png create mode 100644 src/main/resources/assets/create/textures/block/large_cogwheel.png diff --git a/src/main/resources/assets/create/models/block/cogwheel.json b/src/main/resources/assets/create/models/block/cogwheel.json index 44ce191be..28db82c9f 100644 --- a/src/main/resources/assets/create/models/block/cogwheel.json +++ b/src/main/resources/assets/create/models/block/cogwheel.json @@ -1,107 +1,107 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/block", - "textures": { - "particle": "block/stripped_spruce_log", - "0": "create:block/axis", - "1": "block/stripped_spruce_log", - "2": "block/stripped_spruce_log_top", - "3": "create:block/axis_top" - }, - "elements": [ - { - "name": "Axis", - "from": [ 6.0, 0.0, 6.0 ], - "to": [ 10.0, 16.0, 10.0 ], + "credit": "Made with Blockbench", + "parent": "create:block/large_wheels", + "texture_size": [32, 32], + "textures": { + "0": "create:block/axis", + "3": "create:block/axis_top", + "particle": "create:block/cogwheel", + "1_2": "create:block/cogwheel" + }, + "elements": [ + { + "name": "Axis", + "from": [6, 0, 6], + "to": [10, 16, 10], "shade": false, - "faces": { - "north": { "texture": "#0", "uv": [ 6.0, 0.0, 10.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 6.0, 0.0, 10.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 6.0, 0.0, 10.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 6.0, 0.0, 10.0, 16.0 ] }, - "up": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 10.0 ] }, - "down": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 10.0 ] } - } - }, - { - "name": "Gear", - "from": [ -1.0, 6.5, 6.5 ], - "to": [ 17.0, 9.5, 9.5 ], - "faces": { - "north": { "texture": "#1", "uv": [ 6.0, 0.0, 9.0, 16.0 ], "rotation": 90 }, - "east": { "texture": "#1", "uv": [ 1.0, 3.0, 4.0, 6.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] }, - "west": { "texture": "#1", "uv": [ 5.0, 10.0, 8.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] } - } - }, - { - "name": "Gear2", - "from": [ -1.0, 6.5, 6.5 ], - "to": [ 17.0, 9.5, 9.5 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "y", "angle": 45.0 }, - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] } - } - }, - { - "name": "Gear3", - "from": [ -1.0, 6.5, 6.5 ], - "to": [ 17.0, 9.5, 9.5 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "y", "angle": -45.0 }, - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] } - } - }, - { - "name": "Gear4", - "from": [ 6.5, 6.5, -1.0 ], - "to": [ 9.5, 9.5, 17.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 16.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 16.0 ] } - } - }, - { - "name": "GearCaseInner", - "from": [ 2.0, 7.0, 2.0 ], - "to": [ 14.0, 9.0, 14.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 12.0, 2.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 12.0, 2.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 12.0, 2.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 12.0, 2.0 ] }, - "up": { "texture": "#2", "uv": [ 2.0, 2.0, 14.0, 14.0 ] }, - "down": { "texture": "#2", "uv": [ 2.0, 2.0, 14.0, 14.0 ] } - } - }, - { - "name": "GearCaseOuter", - "from": [ 4.0, 6.0, 4.0 ], - "to": [ 12.0, 10.0, 12.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 8.0, 4.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 8.0, 4.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 8.0, 4.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 8.0, 4.0 ] }, - "up": { "texture": "#2", "uv": [ 4.0, 4.0, 12.0, 12.0 ] }, - "down": { "texture": "#2", "uv": [ 4.0, 4.0, 12.0, 12.0 ] } - } - } - ] + "faces": { + "north": {"uv": [6, 0, 10, 16], "texture": "#0"}, + "east": {"uv": [6, 0, 10, 16], "texture": "#0"}, + "south": {"uv": [6, 0, 10, 16], "texture": "#0"}, + "west": {"uv": [6, 0, 10, 16], "texture": "#0"}, + "up": {"uv": [6, 6, 10, 10], "texture": "#3"}, + "down": {"uv": [6, 6, 10, 10], "texture": "#3"} + } + }, + { + "name": "Gear", + "from": [-1, 6.5, 6.5], + "to": [17, 9.5, 9.5], + "faces": { + "north": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, + "east": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, + "south": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, + "west": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, + "up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}, + "down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"} + } + }, + { + "name": "Gear2", + "from": [-1, 6.5, 6.5], + "to": [17, 9.5, 9.5], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, + "east": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, + "south": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, + "west": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, + "up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}, + "down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"} + } + }, + { + "name": "Gear3", + "from": [-1, 6.5, 6.5], + "to": [17, 9.5, 9.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, + "east": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, + "south": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, + "west": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, + "up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}, + "down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"} + } + }, + { + "name": "Gear4", + "from": [6.5, 6.5, -1], + "to": [9.5, 9.5, 17], + "faces": { + "north": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, + "east": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, + "south": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, + "west": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, + "up": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#1_2"}, + "down": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#1_2"} + } + }, + { + "name": "GearCaseInner", + "from": [2, 7, 2], + "to": [14, 9, 14], + "faces": { + "north": {"uv": [0, 6, 6, 7], "texture": "#1_2"}, + "east": {"uv": [0, 6, 6, 7], "texture": "#1_2"}, + "south": {"uv": [0, 6, 6, 7], "texture": "#1_2"}, + "west": {"uv": [0, 6, 6, 7], "texture": "#1_2"}, + "up": {"uv": [4, 0, 10, 6], "texture": "#1_2"}, + "down": {"uv": [4, 0, 10, 6], "texture": "#1_2"} + } + }, + { + "name": "GearCaseOuter", + "from": [4, 6, 4], + "to": [12, 10, 12], + "faces": { + "north": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, + "east": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, + "south": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, + "west": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#1_2"}, + "down": {"uv": [0, 0, 4, 4], "texture": "#1_2"} + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/cogwheel_shaftless.json b/src/main/resources/assets/create/models/block/cogwheel_shaftless.json index 10cac44dc..0d0f2c346 100644 --- a/src/main/resources/assets/create/models/block/cogwheel_shaftless.json +++ b/src/main/resources/assets/create/models/block/cogwheel_shaftless.json @@ -1,91 +1,91 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/block", - "textures": { - "particle": "block/stripped_spruce_log", - "1": "block/stripped_spruce_log", - "2": "block/stripped_spruce_log_top" - }, - "elements": [ - { - "name": "Gear", - "from": [ -1.0, 6.5, 6.5 ], - "to": [ 17.0, 9.5, 9.5 ], - "faces": { - "north": { "texture": "#1", "uv": [ 6.0, 0.0, 9.0, 16.0 ], "rotation": 90 }, - "east": { "texture": "#1", "uv": [ 1.0, 3.0, 4.0, 6.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] }, - "west": { "texture": "#1", "uv": [ 5.0, 10.0, 8.0, 13.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] } - } - }, - { - "name": "Gear2", - "from": [ -1.0, 6.5, 6.5 ], - "to": [ 17.0, 9.5, 9.5 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "y", "angle": 45.0 }, - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] } - } - }, - { - "name": "Gear3", - "from": [ -1.0, 6.5, 6.5 ], - "to": [ 17.0, 9.5, 9.5 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "y", "angle": -45.0 }, - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] } - } - }, - { - "name": "Gear4", - "from": [ 6.5, 6.5, -1.0 ], - "to": [ 9.5, 9.5, 17.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 3.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 16.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 16.0 ] } - } - }, - { - "name": "GearCaseInner", - "from": [ 2.0, 7.0, 2.0 ], - "to": [ 14.0, 9.0, 14.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 12.0, 2.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 12.0, 2.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 12.0, 2.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 12.0, 2.0 ] }, - "up": { "texture": "#2", "uv": [ 2.0, 2.0, 14.0, 14.0 ] }, - "down": { "texture": "#2", "uv": [ 2.0, 2.0, 14.0, 14.0 ] } - } - }, - { - "name": "GearCaseOuter", - "from": [ 4.0, 6.0, 4.0 ], - "to": [ 12.0, 10.0, 12.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 8.0, 4.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 8.0, 4.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 8.0, 4.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 8.0, 4.0 ] }, - "up": { "texture": "#2", "uv": [ 4.0, 4.0, 12.0, 12.0 ] }, - "down": { "texture": "#2", "uv": [ 4.0, 4.0, 12.0, 12.0 ] } - } - } - ] + "credit": "Made with Blockbench", + "parent": "create:block/large_wheels", + "texture_size": [32, 32], + "textures": { + "particle": "create:block/cogwheel", + "1_2": "create:block/cogwheel" + }, + "elements": [ + { + "name": "Gear", + "from": [-1, 6.5, 6.5], + "to": [17, 9.5, 9.5], + "faces": { + "north": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, + "east": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, + "south": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, + "west": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, + "up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}, + "down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"} + } + }, + { + "name": "Gear2", + "from": [-1, 6.5, 6.5], + "to": [17, 9.5, 9.5], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, + "east": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, + "south": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, + "west": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, + "up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}, + "down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"} + } + }, + { + "name": "Gear3", + "from": [-1, 6.5, 6.5], + "to": [17, 9.5, 9.5], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, + "east": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, + "south": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, + "west": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, + "up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}, + "down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"} + } + }, + { + "name": "Gear4", + "from": [6.5, 6.5, -1], + "to": [9.5, 9.5, 17], + "faces": { + "north": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, + "east": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, + "south": {"uv": [5.5, 7.5, 7, 9], "texture": "#1_2"}, + "west": {"uv": [7, 7.5, 16, 9], "texture": "#1_2"}, + "up": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#1_2"}, + "down": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#1_2"} + } + }, + { + "name": "GearCaseInner", + "from": [2, 7, 2], + "to": [14, 9, 14], + "faces": { + "north": {"uv": [0, 6, 6, 7], "texture": "#1_2"}, + "east": {"uv": [0, 6, 6, 7], "texture": "#1_2"}, + "south": {"uv": [0, 6, 6, 7], "texture": "#1_2"}, + "west": {"uv": [0, 6, 6, 7], "texture": "#1_2"}, + "up": {"uv": [4, 0, 10, 6], "texture": "#1_2"}, + "down": {"uv": [4, 0, 10, 6], "texture": "#1_2"} + } + }, + { + "name": "GearCaseOuter", + "from": [4, 6, 4], + "to": [12, 10, 12], + "faces": { + "north": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, + "east": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, + "south": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, + "west": {"uv": [0, 4, 4, 6], "texture": "#1_2"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#1_2"}, + "down": {"uv": [0, 0, 4, 4], "texture": "#1_2"} + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/large_cogwheel.json b/src/main/resources/assets/create/models/block/large_cogwheel.json index 8a84fed52..2bdea006f 100644 --- a/src/main/resources/assets/create/models/block/large_cogwheel.json +++ b/src/main/resources/assets/create/models/block/large_cogwheel.json @@ -1,177 +1,228 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "create:block/large_wheels", - "textures": { - "particle": "block/stripped_spruce_log", - "0": "create:block/axis", - "1": "block/stripped_spruce_log", - "2": "block/stripped_spruce_log_top", - "3": "create:block/axis_top" - }, - "elements": [ - { - "name": "Axis", - "from": [ 6.0, 0.0, 6.0 ], - "to": [ 10.0, 16.0, 10.0 ], + "credit": "Made with Blockbench", + "parent": "create:block/large_wheels", + "texture_size": [32, 32], + "textures": { + "0": "create:block/axis", + "3": "create:block/axis_top", + "4": "create:block/large_cogwheel" + }, + "elements": [ + { + "name": "GearCaseInnerRotated", + "from": [-2, 6.9, -2], + "to": [18, 8.9, 18], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 10, 10, 11], "texture": "#4"}, + "east": {"uv": [0, 10, 10, 11], "texture": "#4"}, + "south": {"uv": [0, 10, 10, 11], "texture": "#4"}, + "west": {"uv": [0, 10, 10, 11], "texture": "#4"}, + "up": {"uv": [0, 0, 10, 10], "texture": "#4"}, + "down": {"uv": [0, 0, 10, 10], "texture": "#4"} + } + }, + { + "name": "Axis", + "from": [6, 0, 6], + "to": [10, 16, 10], "shade": false, - "faces": { - "north": { "texture": "#0", "uv": [ 6.0, 0.0, 10.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 6.0, 0.0, 10.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 6.0, 0.0, 10.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 6.0, 0.0, 10.0, 16.0 ] }, - "up": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 10.0 ] }, - "down": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 10.0 ] } - } - }, - { - "name": "Gear2", - "from": [ -7.0, 6.5, 6.5 ], - "to": [ 23.0, 9.5, 9.5 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "y", "angle": 22.5 }, - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 2.0, 16.0, 5.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 5.0, 16.0, 8.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 6.0, 16.0, 9.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 7.0, 16.0, 10.0 ] } - } - }, - { - "name": "Gear3", - "from": [ -7.0, 6.5, 6.5 ], - "to": [ 23.0, 9.5, 9.5 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "y", "angle": -22.5 }, - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 7.0, 16.0, 10.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 5.0, 16.0, 8.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 3.0, 16.0, 6.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 2.0, 16.0, 5.0 ] } - } - }, - { - "name": "Gear4", - "from": [ 6.5, 6.5, -7.0 ], - "to": [ 9.5, 9.5, 23.0 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "y", "angle": 22.5 }, - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 7.0, 16.0, 10.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 7.0, 16.0, 10.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 3.0, 16.0, 6.0 ], "rotation": 90 }, - "down": { "texture": "#1", "uv": [ 0.0, 5.0, 16.0, 8.0 ], "rotation": 90 } - } - }, - { - "name": "GearCaseInner", - "from": [ -2.0, 7.0, -2.0 ], - "to": [ 18.0, 9.0, 18.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 12.0, 2.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 12.0, 2.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 12.0, 2.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 12.0, 2.0 ] }, - "up": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "GearCaseOuter", - "from": [ 1.0, 5.5, 1.0 ], - "to": [ 15.0, 10.5, 15.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 1.0, 0.0, 15.0, 5.0 ] }, - "east": { "texture": "#1", "uv": [ 1.0, 0.0, 15.0, 5.0 ] }, - "south": { "texture": "#1", "uv": [ 1.0, 0.0, 15.0, 5.0 ] }, - "west": { "texture": "#1", "uv": [ 1.0, 0.0, 15.0, 5.0 ] }, - "up": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "down": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } - } - }, - { - "name": "Gear", - "from": [ 6.5, 6.5, -7.0 ], - "to": [ 9.5, 9.5, 23.0 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "y", "angle": -22.5 }, - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 6.0, 16.0, 9.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 8.0, 16.0, 11.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 7.0, 16.0, 10.0 ], "rotation": 90 }, - "down": { "texture": "#1", "uv": [ 0.0, 5.0, 16.0, 8.0 ], "rotation": 90 } - } - }, - { - "name": "Gear5", - "from": [ -7.0, 6.5, 6.5 ], - "to": [ 23.0, 9.5, 9.5 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "y", "angle": 45.0 }, - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 4.0, 16.0, 7.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 6.0, 16.0, 9.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 6.0, 16.0, 9.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 4.0, 16.0, 7.0 ] } - } - }, - { - "name": "Gear6", - "from": [ 6.5, 6.5, -7.0 ], - "to": [ 9.5, 9.5, 23.0 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "y", "angle": 45.0 }, - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 7.0, 16.0, 10.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 6.0, 16.0, 9.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 7.0, 16.0, 10.0 ], "rotation": 90 }, - "down": { "texture": "#1", "uv": [ 0.0, 5.0, 16.0, 8.0 ], "rotation": 90 } - } - }, - { - "name": "Gear7", - "from": [ -7.0, 6.5, 6.500000007450581 ], - "to": [ 23.0, 9.5, 9.50000000745058 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 7.0, 16.0, 10.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 6.0, 16.0, 9.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 4.0, 16.0, 7.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 3.0, 16.0, 6.0 ] } - } - }, - { - "name": "Gear8", - "from": [ 6.5, 6.5, -7.0 ], - "to": [ 9.5, 9.5, 23.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 9.0, 16.0, 12.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 3.0, 3.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 6.0, 16.0, 9.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 8.0, 16.0, 11.0 ], "rotation": 90 }, - "down": { "texture": "#1", "uv": [ 0.0, 7.0, 16.0, 10.0 ], "rotation": 90 } - } - }, - { - "name": "GearCaseInnerRotated", - "from": [ -2.0, 6.9, -2.0 ], - "to": [ 18.0, 8.9, 18.0 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "y", "angle": 45.0 }, - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 12.0, 2.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 12.0, 2.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 12.0, 2.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 12.0, 2.0 ] }, - "up": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - } - ] + "faces": { + "north": {"uv": [6, 0, 10, 16], "texture": "#0"}, + "east": {"uv": [6, 0, 10, 16], "texture": "#0"}, + "south": {"uv": [6, 0, 10, 16], "texture": "#0"}, + "west": {"uv": [6, 0, 10, 16], "texture": "#0"}, + "up": {"uv": [6, 6, 10, 10], "texture": "#3"}, + "down": {"uv": [6, 6, 10, 10], "texture": "#3"} + } + }, + { + "name": "Gear2", + "from": [-7, 6.5, 6.5], + "to": [23, 9.5, 9.5], + "rotation": {"angle": 22.5, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 12.5, 15, 14], "texture": "#4"}, + "east": {"uv": [10, 9.5, 11.5, 11], "texture": "#4"}, + "south": {"uv": [0, 12.5, 15, 14], "texture": "#4"}, + "west": {"uv": [10, 9.5, 11.5, 11], "texture": "#4"}, + "up": {"uv": [0, 11, 15, 12.5], "texture": "#4"}, + "down": {"uv": [0, 11, 15, 12.5], "texture": "#4"} + } + }, + { + "name": "Gear3", + "from": [-7, 6.5, 6.5], + "to": [23, 9.5, 9.5], + "rotation": {"angle": -22.5, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 12.5, 15, 14], "texture": "#4"}, + "east": {"uv": [10, 9.5, 11.5, 11], "texture": "#4"}, + "south": {"uv": [0, 12.5, 15, 14], "texture": "#4"}, + "west": {"uv": [10, 9.5, 11.5, 11], "texture": "#4"}, + "up": {"uv": [0, 11, 15, 12.5], "texture": "#4"}, + "down": {"uv": [0, 11, 15, 12.5], "texture": "#4"} + } + }, + { + "name": "Gear4", + "from": [6.5, 6.5, -7], + "to": [9.5, 9.5, 23], + "rotation": {"angle": 22.5, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [10, 9.5, 11.5, 11], "texture": "#4"}, + "east": {"uv": [0, 12.5, 15, 14], "texture": "#4"}, + "south": {"uv": [10, 9.5, 11.5, 11], "texture": "#4"}, + "west": {"uv": [0, 12.5, 15, 14], "texture": "#4"}, + "up": {"uv": [0, 11, 15, 12.5], "rotation": 90, "texture": "#4"}, + "down": {"uv": [0, 11, 15, 12.5], "rotation": 90, "texture": "#4"} + } + }, + { + "name": "GearCaseInner", + "from": [-2, 7, -2], + "to": [18, 9, 18], + "faces": { + "north": {"uv": [0, 10, 10, 11], "texture": "#4"}, + "east": {"uv": [0, 10, 10, 11], "texture": "#4"}, + "south": {"uv": [0, 10, 10, 11], "texture": "#4"}, + "west": {"uv": [0, 10, 10, 11], "texture": "#4"}, + "up": {"uv": [0, 0, 10, 10], "texture": "#4"}, + "down": {"uv": [0, 0, 10, 10], "texture": "#4"} + } + }, + { + "name": "GearCaseOuter", + "from": [1, 5.5, 1], + "to": [15, 10.5, 15], + "faces": { + "north": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, + "east": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, + "south": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, + "west": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, + "up": {"uv": [1.5, 1.5, 8.5, 8.5], "texture": "#4"}, + "down": {"uv": [1.5, 1.5, 8.5, 8.5], "texture": "#4"} + } + }, + { + "name": "GearCaseOuter", + "from": [-1, 5.5, 1], + "to": [1, 10.5, 15], + "faces": { + "north": {"uv": [10, 0, 12.5, 1], "rotation": 90, "texture": "#4"}, + "east": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, + "south": {"uv": [10, 6, 12.5, 7], "rotation": 90, "texture": "#4"}, + "west": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, + "up": {"uv": [7, 15, 14, 16], "rotation": 90, "texture": "#4"}, + "down": {"uv": [7, 15, 14, 16], "rotation": 90, "texture": "#4"} + } + }, + { + "name": "GearCaseOuter", + "from": [15, 5.5, 1], + "to": [17, 10.5, 15], + "faces": { + "north": {"uv": [10, 6, 12.5, 7], "rotation": 90, "texture": "#4"}, + "east": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, + "south": {"uv": [10, 0, 12.5, 1], "rotation": 90, "texture": "#4"}, + "west": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, + "up": {"uv": [0, 15, 7, 16], "rotation": 270, "texture": "#4"}, + "down": {"uv": [0, 15, 7, 16], "rotation": 270, "texture": "#4"} + } + }, + { + "name": "GearCaseOuter", + "from": [1, 5.5, -1], + "to": [15, 10.5, 1], + "faces": { + "north": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, + "east": {"uv": [10, 0, 12.5, 1], "rotation": 90, "texture": "#4"}, + "south": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, + "west": {"uv": [10, 6, 12.5, 7], "rotation": 90, "texture": "#4"}, + "up": {"uv": [7, 14, 14, 15], "rotation": 180, "texture": "#4"}, + "down": {"uv": [0, 14, 7, 15], "texture": "#4"} + } + }, + { + "name": "GearCaseOuter", + "from": [1, 5.5, 15], + "to": [15, 10.5, 17], + "faces": { + "north": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, + "east": {"uv": [10, 6, 12.5, 7], "rotation": 90, "texture": "#4"}, + "south": {"uv": [10, 0, 12.5, 7], "rotation": 90, "texture": "#4"}, + "west": {"uv": [10, 0, 12.5, 1], "rotation": 90, "texture": "#4"}, + "up": {"uv": [0, 14, 7, 15], "texture": "#4"}, + "down": {"uv": [7, 14, 14, 15], "rotation": 180, "texture": "#4"} + } + }, + { + "name": "Gear", + "from": [6.5, 6.5, -7], + "to": [9.5, 9.5, 23], + "rotation": {"angle": -22.5, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [10, 9.5, 11.5, 11], "texture": "#4"}, + "east": {"uv": [0, 12.5, 15, 14], "texture": "#4"}, + "south": {"uv": [10, 9.5, 11.5, 11], "texture": "#4"}, + "west": {"uv": [0, 12.5, 15, 14], "texture": "#4"}, + "up": {"uv": [0, 11, 15, 12.5], "rotation": 90, "texture": "#4"}, + "down": {"uv": [0, 11, 15, 12.5], "rotation": 90, "texture": "#4"} + } + }, + { + "name": "Gear5", + "from": [-7, 6.5, 6.5], + "to": [23, 9.5, 9.5], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 12.5, 15, 14], "texture": "#4"}, + "east": {"uv": [10, 9.5, 11.5, 11], "texture": "#4"}, + "south": {"uv": [0, 12.5, 15, 14], "texture": "#4"}, + "west": {"uv": [10, 9.5, 11.5, 11], "texture": "#4"}, + "up": {"uv": [0, 11, 15, 12.5], "texture": "#4"}, + "down": {"uv": [0, 11, 15, 12.5], "texture": "#4"} + } + }, + { + "name": "Gear6", + "from": [6.5, 6.5, -7], + "to": [9.5, 9.5, 23], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [10, 9.5, 11.5, 11], "texture": "#4"}, + "east": {"uv": [0, 12.5, 15, 14], "texture": "#4"}, + "south": {"uv": [10, 9.5, 11.5, 11], "texture": "#4"}, + "west": {"uv": [0, 12.5, 15, 14], "texture": "#4"}, + "up": {"uv": [0, 11, 15, 12.5], "rotation": 90, "texture": "#4"}, + "down": {"uv": [0, 11, 15, 12.5], "rotation": 90, "texture": "#4"} + } + }, + { + "name": "Gear7", + "from": [-7, 6.5, 6.5], + "to": [23, 9.5, 9.5], + "faces": { + "north": {"uv": [0, 12.5, 15, 14], "texture": "#4"}, + "east": {"uv": [10, 9.5, 11.5, 11], "texture": "#4"}, + "south": {"uv": [0, 12.5, 15, 14], "texture": "#4"}, + "west": {"uv": [10, 9.5, 11.5, 11], "texture": "#4"}, + "up": {"uv": [0, 11, 15, 12.5], "texture": "#4"}, + "down": {"uv": [0, 11, 15, 12.5], "texture": "#4"} + } + }, + { + "name": "Gear8", + "from": [6.5, 6.5, -7], + "to": [9.5, 9.5, 23], + "faces": { + "north": {"uv": [10, 9.5, 11.5, 11], "texture": "#4"}, + "east": {"uv": [0, 12.5, 15, 14], "texture": "#4"}, + "south": {"uv": [10, 9.5, 11.5, 11], "texture": "#4"}, + "west": {"uv": [0, 12.5, 15, 14], "texture": "#4"}, + "up": {"uv": [0, 11, 15, 12.5], "rotation": 90, "texture": "#4"}, + "down": {"uv": [0, 11, 15, 12.5], "rotation": 90, "texture": "#4"} + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/cogwheel.png b/src/main/resources/assets/create/textures/block/cogwheel.png new file mode 100644 index 0000000000000000000000000000000000000000..19d2893463076c8a222962a8e144909bbeda3679 GIT binary patch literal 648 zcmV;30(bq1P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0v$<2K~z{r?Uuhv z13?gn?@nVR1fv#$olhXP`WS)_U}0}zVP#<Zy0}wim@YRtJlCbCE_ObAtkHX#n_|y73^QRFc zRh2xU6OJMwkxxuQmCcL5n3E8Hx0r;EOQO$1i9v!i_DBdm2@{iuh|drAGCCh=o^-jM z2k~RyKfAfNJ3cws$(Cx1Huu`@6yC^xAb!2owElai`}-LZNXg1#yl+}4)>tprLj_iv z`6Ha90to2!2h{{z9_?nQ*AFpChf@Xu2*jJ2R6y{TuuN}|>l}Q36>QQg(LQ2S5}*x> z3rWF1?_^xqrx+tCmwuWQBxG3@G)hG~3#whgVAz=f1p#p!2QB@~eY2oa1^i#XX;Vpn i{sEaYXU?4I6Gh*aIfDnos?xv!0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D187M^K~z{ry_Y?X z6G0G#$Fu7n4VDdyWCFvoD+ z6rE0I(cnrudiLf+t58)Cd*^&gerDB!0Xo*EXZf5l(3~@Hj#K0$&1^nf)cQ8WI)uYH zNYdRibw#H+YuXQ(ixFWqUlgO9g(jGl4!u3@+XM;_PBM1?vGBs~iM08YCuz zB#CZb>)Tjavu;dv6LZEKs0_+{f3N6?W&+N806-^zVvzJYrqhAU5!RIzYb2l`>Pnyl z>rj>e9Hp~pI?XI{9Q~NgN`Z2XStBdx+Tn4gV*B^ofpbP+6 z>E7NLcI>|M4%`}DwNHf1{N47~j1s_t#FwNFt)~y~F7+1p`wts55n1?t@Q!&M2}oaD z1pE5%b7RBN1FznFDrPy#he%ma_pjq$_RM}iPRlnyqGuU_Edqo=&*CWAE_<{8 z7h-C&E9dg#Z%C|e-BlUz<8Mgo#pCze_#N1Ttlr1*eOe# zv5p-+UcUWUd7N6SugGOn_E4s^a16YiUl&3h^Duyz4P?UIWCNlxV2s$0kd= Date: Sun, 26 Jul 2020 20:29:24 -0500 Subject: [PATCH 2/2] cogwheel cleanup de-noising the large cogwheel and removing the weird atlas-destroying palette from the small cogwheel --- .../assets/create/textures/block/cogwheel.png | Bin 648 -> 615 bytes .../create/textures/block/large_cogwheel.png | Bin 979 -> 945 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/create/textures/block/cogwheel.png b/src/main/resources/assets/create/textures/block/cogwheel.png index 19d2893463076c8a222962a8e144909bbeda3679..00d3a727ec8bf683d511b662ac5a38164aa0fc8b 100644 GIT binary patch delta 541 zcmV+&0^kYt$62kq8;M?j5UEca z==*Vx)_4}>yL)_zturBE^0hsfMmvqBZRQ9i;i~|B*#lY+%zr7L_Gr$ND2XRcdlsO1 zB~z#m&C2Z55(CBwtqWllU=egb+7|PWKx@DolpzU|Ph*<*-+6)+m`A6OXr)rKP#+{f zKAB~VHgVYeS$?nzXmhz%wvYg59XcbZg)c4h4y{hVsaAhHq$v1}t1c_RWnwbNH zL5ANt{=;t9} zkRkOwGQymUiB(L*Hy5WFjea^7tyacKeBZaP@1N|BuYb-@vfXmY#@^fA+#6X0<`0^6 zYj?W6+0T$f5}P;U=l%-iD)eGKRG?8GKf+ZifPukqwAetF+3gr{9GmE*YhZvxyqQ%E z1pf(tWAyozi&d{g`^ZtqKxrq*1?Zg=g?;2GbOq}mm(>e~Sci#1SFjE?egzw^z{U-1 f*|O!o6Bb3^oS;~1c(KYReu5Bh>Epu`gjNP>*?$9C5BL;Md*t&Z3gSuA zt{KR$U^0!NRsTJ;k^%FW)`hSNun0PDZL=~2&>HXpB}j>hr#bn3TP9e6GCGBl*6R&3 zjX?>BC$Y@Y$2MDk%MVroZLT$HW=a6^ldRwETZL2sjeT`kuc~?>Tv>=@*cMO%L7Zy z0}wim@YRtJlCbCE_ObAtkHX#n_|y73^QRFcRh2xU6OJMwkxxuQmCcL5n3E8Hx0r;E zOQO$1i9v!i_DBdm2@{iuh|drAGCCh=o^-jM2k~RyKYzQqw>v&L*vXb^i#GS#?iAk0 ze;|In)wKS5r~CUE5=hC)V!Ur!DArgn)7Bosl zI}55^!8c&onE?d>aU2IN{mgx{pi%|=U%zQnNr3(VnKNh3oaqxq-1gx5QW#9*p3#U;1r)pi(12u#1Y4_B{1c47**(knayQus@R3G) zcka*3oS8dbcOKolwHox(B!+zUvl^9%tqa%e4|>U7zgN8_$$!ago(wN_lP9mWHqLZI^oHJ+W?!yLpoMv-Y=*!z4LwQWefQ4Z2!{hjhDo%B5YdcfL{o%v!} zjY<}pV7oYoLv9`nlB-#2^}6eYYj|fum;)TjAyB5s#?zvf zX;BJ#WHKv-Ie$SZGs-K2#Yvfp<>{a46s!h(1OSH)hMCDQ%aZF?1~yjI%)=DG81Ej6 ze0Qg+iDm-I8W6M*ib1y5Gm6nOmN2iVm?Ho=5lcZBphukoVKytwa}0f(%%j4bq7vO0 zAsBxJ>$&xrP1r2m3Z4}Y4$@&T0~BQpVrfw<>={Gt0Dml4KKogvDf12TeO8Qw^Mj z4bGrdw8!9U;5-n_S@j{91K~ZU%E7f!&+a>Y;Kspadm=>U@3v1LDS!ouPe}}&$M#%0IfkW|&Wtu$cA-;mC;hj&+>#<}%%eL(1U+<#C=NBiXu z3~pc_4M=kW`xGU{m}eh0p1*#-(VRN#pU72H^r9@BkLl5c?;zBL4x}s~67D7o5RC!R z@Gc!|*`s~h1N=JnA)42|5RDAzP!P^*PI}&BXM|wg`h&zVkR-nV;Ra5c5)y#_00000 LNkvXXu0mjfX8)nP delta 920 zcmV;J184lP2h#_TNq@rt01m?e$8V@)000AMNklmLo44U1$6 zBDeq|AmR{YBxGb9fB+F9LBtJ+A=!IC00B1u5|Avhi&vx3`e!lzYUa(>^v-x~0e(`+ z-PK)PRj;bscI(N5JIj7Ij?(Gxh))l69$NQ%!#xN6PSopmiho%Yola-b;7U7s_U1#Y zP*o6n=X^?jX4QiMI@YFV`J6G(oHKBaQ{*JgY(87m`ZmNmgu^*V(%mz4MW;Dy+7FnE z5n(o86r-GlCYY5Dy*=tj*OS=Bz5QH<-F(f9^azw=FXp_nPJ6X+1s_ZZ3xGp81j>}z z_#`XkB+CUoGJl!o!kT~{80Ce->@+XM;_PBM1?vGBs~iM08YCuzB#CZb>)Tjavu;dv z6LZEKs0_+{f3N6?W&+N806-^zVvzJYrqhAU5!RIzYb2l`>Pnyl>rj>e9Hp~pI?XI{ z9Q~NgN`Z2XStBd$hBAh6;EiV?9T9qicK;cmgUFz*B*5&T>Z$bS^a=tJ7Q?KZF`EXI}r2PqRj2AYS? z2#WHASl5uk1*^~jW6gaq0?uJVYrOxGO<*TutOLArbT~ku-v^@oWbT9H>Pj|&m4K_n zqj5Az%}|H`O?LzJ2*JU~!LV<0etD@pn}zug5x$HTfd2y7HA)69d$a!+VrsK1=knuk zNPnzu-BlUz<8Mgo#pCze_#N1Ttlr1*eOe#v5p-+UcUWU zd7N6SugGOn_E4s^a16YiUl&3h^Duyz4P?UIWCNlxV2s$0kd=Klc_i8Z0000