diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json b/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json index d185ddf16..d5bdd47fc 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json @@ -1,7 +1,9 @@ { - "variants": { - "": { - "model": "appliedenergistics2:block/charged_quartz_ore" - } - } -} + "variants": { + "": [ + { "model": "appliedenergistics2:block/charged_quartz_ore0", "weight":1 }, + { "model": "appliedenergistics2:block/charged_quartz_ore1", "weight":1 }, + { "model": "appliedenergistics2:block/charged_quartz_ore2", "weight":1 } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json b/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json index 5b35a11a8..5897d5818 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json @@ -14,15 +14,6 @@ }, "fullness=4": { "model": "appliedenergistics2:block/energy_cell/dense_energy_cell4" - }, - "fullness=5": { - "model": "appliedenergistics2:block/energy_cell/dense_energy_cell5" - }, - "fullness=6": { - "model": "appliedenergistics2:block/energy_cell/dense_energy_cell6" - }, - "fullness=7": { - "model": "appliedenergistics2:block/energy_cell/dense_energy_cell7" } } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json b/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json index 1985548f2..c91c21d11 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json @@ -14,15 +14,6 @@ }, "fullness=4": { "model": "appliedenergistics2:block/energy_cell/energy_cell4" - }, - "fullness=5": { - "model": "appliedenergistics2:block/energy_cell/energy_cell5" - }, - "fullness=6": { - "model": "appliedenergistics2:block/energy_cell/energy_cell6" - }, - "fullness=7": { - "model": "appliedenergistics2:block/energy_cell/energy_cell7" } } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json index ec64f33da..50dd9835b 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json @@ -1,7 +1,10 @@ { - "variants": { - "": { - "model": "appliedenergistics2:block/quartz_ore" - } - } -} + "variants": { + "": [ + { "model": "appliedenergistics2:block/quartz_ore0", "weight":1 }, + { "model": "appliedenergistics2:block/quartz_ore1", "weight":1 }, + { "model": "appliedenergistics2:block/quartz_ore2", "weight":1 }, + { "model": "appliedenergistics2:block/quartz_ore3", "weight":1 } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore0.json similarity index 71% rename from src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json rename to src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore0.json index 984630029..61ab738f5 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore0.json @@ -1,8 +1,9 @@ { + "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "block": "block/stone", - "quartz": "appliedenergistics2:block/charged_quartz_ore_light", + "quartz": "appliedenergistics2:block/charged_quartz_ore_light0", "particle": "appliedenergistics2:block/charged_quartz_ore" }, "elements": [ @@ -41,32 +42,50 @@ "down": { "texture": "#quartz", "cullface": "down", - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "east": { "texture": "#quartz", "cullface": "east", - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "north": { "texture": "#quartz", "cullface": "north", - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "south": { "texture": "#quartz", "cullface": "south", - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "up": { "texture": "#quartz", "cullface": "up", - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "west": { "texture": "#quartz", "cullface": "west", - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } } }, "from": [0, 0, 0], diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore1.json b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore1.json new file mode 100644 index 000000000..adff33729 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore1.json @@ -0,0 +1,96 @@ +{ + "loader": "appliedenergistics2:uvlightmap", + "parent": "block/block", + "textures": { + "block": "block/stone", + "quartz": "appliedenergistics2:block/charged_quartz_ore_light1", + "particle": "appliedenergistics2:block/charged_quartz_ore" + }, + "elements": [ + { + "faces": { + "down": { + "texture": "#block", + "cullface": "down" + }, + "east": { + "texture": "#block", + "cullface": "east" + }, + "north": { + "texture": "#block", + "cullface": "north" + }, + "south": { + "texture": "#block", + "cullface": "south" + }, + "up": { + "texture": "#block", + "cullface": "up" + }, + "west": { + "texture": "#block", + "cullface": "west" + } + }, + "from": [0, 0, 0], + "to": [16, 16, 16] + }, + { + "faces": { + "down": { + "texture": "#quartz", + "cullface": "down", + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "east": { + "texture": "#quartz", + "cullface": "east", + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "north": { + "texture": "#quartz", + "cullface": "north", + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "south": { + "texture": "#quartz", + "cullface": "south", + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "up": { + "texture": "#quartz", + "cullface": "up", + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "west": { + "texture": "#quartz", + "cullface": "west", + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + } + }, + "from": [0, 0, 0], + "shade": true, + "to": [16, 16, 16] + } + ] +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore2.json b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore2.json new file mode 100644 index 000000000..831580877 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore2.json @@ -0,0 +1,96 @@ +{ + "loader": "appliedenergistics2:uvlightmap", + "parent": "block/block", + "textures": { + "block": "block/stone", + "quartz": "appliedenergistics2:block/charged_quartz_ore_light2", + "particle": "appliedenergistics2:block/charged_quartz_ore" + }, + "elements": [ + { + "faces": { + "down": { + "texture": "#block", + "cullface": "down" + }, + "east": { + "texture": "#block", + "cullface": "east" + }, + "north": { + "texture": "#block", + "cullface": "north" + }, + "south": { + "texture": "#block", + "cullface": "south" + }, + "up": { + "texture": "#block", + "cullface": "up" + }, + "west": { + "texture": "#block", + "cullface": "west" + } + }, + "from": [0, 0, 0], + "to": [16, 16, 16] + }, + { + "faces": { + "down": { + "texture": "#quartz", + "cullface": "down", + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "east": { + "texture": "#quartz", + "cullface": "east", + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "north": { + "texture": "#quartz", + "cullface": "north", + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "south": { + "texture": "#quartz", + "cullface": "south", + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "up": { + "texture": "#quartz", + "cullface": "up", + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + }, + "west": { + "texture": "#quartz", + "cullface": "west", + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } + } + }, + "from": [0, 0, 0], + "shade": true, + "to": [16, 16, 16] + } + ] +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json index 66d754592..121d8258e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "lights_bright": "appliedenergistics2:block/chest/lights_on_bright", "lights_medium": "appliedenergistics2:block/chest/lights_on_medium", @@ -12,7 +13,10 @@ "up": { "texture": "#lights_bright", "tintindex": 3, - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } } } }, @@ -23,7 +27,10 @@ "up": { "texture": "#lights_medium", "tintindex": 2, - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } } } }, @@ -34,7 +41,10 @@ "up": { "texture": "#lights_dark", "tintindex": 1, - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json index f917657ed..0038cf7a1 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "block": "appliedenergistics2:block/controller_powered", @@ -11,32 +12,50 @@ "down": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "east": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "north": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "south": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "up": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "west": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } } }, "from": [0, 0, 0], diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json index 655b3d4b0..0ed472fd0 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "block": "appliedenergistics2:block/controller_powered", @@ -11,32 +12,50 @@ "down": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "east": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "north": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "south": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "up": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "west": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } } }, "from": [0, 0, 0], diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json index 779ffc3b4..50e506dfd 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "block": "appliedenergistics2:block/controller_column_powered", @@ -11,32 +12,50 @@ "down": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "east": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "north": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "south": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "up": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "west": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } } }, "from": [0, 0, 0], diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json index caa9e3c36..9b7c7527f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "block": "appliedenergistics2:block/controller_column_powered", @@ -11,32 +12,50 @@ "down": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "east": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "north": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "south": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "up": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } }, "west": { "texture": "#lights", "uv": [0, 0, 16, 16], - "unlit": true + "uvlightmap": { + "block": 0.007, + "sky": 0.007 + } } }, "from": [0, 0, 0], diff --git a/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json b/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json index f259995b6..a8b9ec3af 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json @@ -2,7 +2,12 @@ "parent": "block/orientable", "textures": { "particle": "appliedenergistics2:block/inscriber", - "side": "appliedenergistics2:block/inscriber", + + "bottom": "appliedenergistics2:block/inscriber_bottom", + "front": "appliedenergistics2:block/inscriber_front", + "side": "appliedenergistics2:block/inscriber_side", + "top": "appliedenergistics2:block/inscriber_top", + "inside": "appliedenergistics2:block/inscriber_inside" }, "elements": [ diff --git a/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json b/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json index 06f2d9fc3..14d4e092f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "all": "appliedenergistics2:block/molecular_assembler_lights" @@ -12,37 +13,55 @@ "texture": "#all", "uv": [2.6, 2.6, 13.4, 13.4], "cullface": "down", - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#all", "uv": [2.6, 2.6, 13.4, 13.4], "cullface": "up", - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "north": { "texture": "#all", "uv": [2.6, 2.6, 13.4, 13.4], "cullface": "north", - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "south": { "texture": "#all", "uv": [2.6, 2.6, 13.4, 13.4], "cullface": "south", - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#all", "uv": [2.6, 2.6, 13.4, 13.4], "cullface": "west", - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#all", "uv": [2.6, 2.6, 13.4, 13.4], "cullface": "east", - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore0.json similarity index 51% rename from src/main/resources/assets/appliedenergistics2/models/block/quartz_ore.json rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_ore0.json index fe14bf0b5..53bceb7f2 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore0.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:block/quartz_ore" + "all": "appliedenergistics2:block/quartz_ore0" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore1.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore1.json new file mode 100644 index 000000000..8cd28906d --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:block/quartz_ore1" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore2.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore2.json new file mode 100644 index 000000000..709f31a35 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:block/quartz_ore2" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore3.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore3.json new file mode 100644 index 000000000..c309b13a4 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:block/quartz_ore3" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json b/src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json index c25b3b786..b654e4592 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "particle": "appliedenergistics2:block/security_station_side", @@ -41,7 +42,10 @@ "up": { "texture": "#lightsBright", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -52,7 +56,10 @@ "up": { "texture": "#lightsMedium", "tintindex": 2, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -63,7 +70,10 @@ "up": { "texture": "#lightsDark", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json index c177c621d..60be1d40c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "ambientocclusion": false, "textures": { "torch": "appliedenergistics2:block/wireless_access_point_on" @@ -38,7 +39,10 @@ "texture": "#torch", "uv": [7, 7, 9, 9], "rotation": 270, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -51,13 +55,19 @@ "texture": "#torch", "uv": [6, 6, 10, 10], "rotation": 90, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "down": { "texture": "#torch", "uv": [6, 6, 10, 10], "rotation": 270, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -69,13 +79,19 @@ "west": { "texture": "#torch", "uv": [6, 6, 10, 10], - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#torch", "uv": [6, 6, 10, 10], "rotation": 180, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json index dbc069977..22a9db566 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json @@ -10,22 +10,34 @@ "down": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json index e3be67738..784ba620c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json @@ -10,22 +10,34 @@ "down": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json index 9ded490b6..dc374107a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/conversion_monitor_bright", "lightsMedium": "appliedenergistics2:part/conversion_monitor_medium_locked", @@ -12,7 +13,10 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -23,7 +27,10 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -34,7 +41,10 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json index 8f8d8db46..d606f38cf 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/conversion_monitor_bright", "lightsMedium": "appliedenergistics2:part/conversion_monitor_medium", @@ -12,7 +13,10 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -23,7 +27,10 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -34,7 +41,10 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json index a6bff04dd..b3b37bf99 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/crafting_terminal_bright", "lightsMedium": "appliedenergistics2:part/crafting_terminal_medium", @@ -12,7 +13,10 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -23,7 +27,10 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -34,7 +41,10 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json index 2332c0c1f..a3c08b8e5 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json index ff9a34fd1..5ea6cdd15 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json index 3da73d935..0f6fe350a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json index a20d4889b..9444d89aa 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json index 3da73d935..0f6fe350a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json index a20d4889b..9444d89aa 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json index 3da73d935..0f6fe350a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json index a20d4889b..9444d89aa 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json index 3f5b0904c..b87024a70 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json index bbe1ed528..88c28f857 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json index 3f5b0904c..b87024a70 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json index bbe1ed528..88c28f857 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json index f570ba3ae..39624a853 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/fluid_terminal_bright", "lightsMedium": "appliedenergistics2:part/fluid_terminal_medium", @@ -12,7 +13,10 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -23,7 +27,10 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -34,7 +41,10 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json index 3da73d935..0f6fe350a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json index a20d4889b..9444d89aa 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json index 3f5b0904c..b87024a70 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json index bbe1ed528..88c28f857 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json index 95b3b485c..f88c8cec0 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/interface_terminal_bright", "lightsMedium": "appliedenergistics2:part/interface_terminal_medium", @@ -12,7 +13,10 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -23,7 +27,10 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -34,7 +41,10 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json index cac0bbcf2..3a8418500 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "ambientocclusion": false, "textures": { "emitter": "appliedenergistics2:part/level_emitter_on", @@ -39,7 +40,10 @@ "texture": "#emitter", "uv": [6, 7, 8, 9], "rotation": 270, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -52,13 +56,19 @@ "texture": "#emitter", "uv": [5, 6, 9, 10], "rotation": 90, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "down": { "texture": "#emitter", "uv": [5, 6, 9, 10], "rotation": 270, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -70,13 +80,19 @@ "west": { "texture": "#emitter", "uv": [5, 6, 9, 10], - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#emitter", "uv": [5, 6, 9, 10], "rotation": 180, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json index ace6ff599..459e7a6d8 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json index 3469d5d19..edfc24671 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json index 0408175a1..36412650d 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "sides": "appliedenergistics2:part/monitor_sides", "back": "appliedenergistics2:part/monitor_back", diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json index 5d79e20b0..6686c7dc7 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "ambientocclusion": false, "textures": { "lights": "appliedenergistics2:part/monitor_light" @@ -12,7 +13,10 @@ "north": { "texture": "#lights", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json index 749be0e5f..361b7cd80 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "lights": "appliedenergistics2:part/monitor_light" }, @@ -10,7 +11,10 @@ "north": { "texture": "#lights", "tintindex": 2, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json index 6dd1ca6ba..f4477877a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "lights": "appliedenergistics2:part/monitor_light" }, @@ -10,7 +11,10 @@ "north": { "texture": "#lights", "tintindex": 4, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json index 12ca1ea90..32f2e7f9d 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json index 3b9fda716..745408f15 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json index e792d4ca8..773395bfe 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/pattern_terminal_bright", "lightsMedium": "appliedenergistics2:part/pattern_terminal_medium", @@ -12,7 +13,10 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -23,7 +27,10 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -34,7 +41,10 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json index 3f5b0904c..b87024a70 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json index bbe1ed528..88c28f857 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json index de562aa44..2512544c5 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/storage_monitor_bright", "lightsMedium": "appliedenergistics2:part/storage_monitor_medium", @@ -12,7 +13,10 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -23,7 +27,10 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -34,7 +41,10 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json index 86325bf35..994f39b27 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/storage_monitor_bright", "lightsMedium": "appliedenergistics2:part/storage_monitor_medium", @@ -12,7 +13,10 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -23,7 +27,10 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -34,7 +41,10 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json index d9585f270..61f131c5b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/terminal_bright", "lightsMedium": "appliedenergistics2:part/terminal_medium", @@ -12,7 +13,10 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -23,7 +27,10 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } }, @@ -34,7 +41,10 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json index 9c8a2c25f..9f2640024 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json index 2c017321f..444e5f7fe 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -10,22 +11,34 @@ "down": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json index 2a0068f07..412232729 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "sides": "appliedenergistics2:part/monitor_sides_status", "back": "appliedenergistics2:part/transition_plane_back", @@ -33,22 +34,34 @@ "down": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 1, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json index 447de5476..22d22c288 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json @@ -1,4 +1,5 @@ { + "loader": "appliedenergistics2:uvlightmap", "textures": { "sides": "appliedenergistics2:part/monitor_sides_status", "back": "appliedenergistics2:part/transition_plane_back", @@ -34,22 +35,34 @@ "down": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "up": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "east": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } }, "west": { "texture": "#indicator", "tintindex": 3, - "unlit": true + "uvlightmap": { + "sky": 0.007, + "block": 0.007 + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench.png b/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench.png index 65aa1bf32..3f753522b 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench.png and b/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench_bottom.png b/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench_bottom.png index 6a87e174a..ac4438f0b 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench_bottom.png and b/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench_bottom.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench_side.png index 025193584..a3bab3547 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench_side.png and b/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench_side.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore.png b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore.png index b1d6bbf6f..50a75a3ff 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore.png and b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light.png b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light.png deleted file mode 100644 index 0aab6f20c..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light0.png b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light0.png new file mode 100644 index 000000000..7eec3089a Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light0.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light0.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light0.png.mcmeta new file mode 100644 index 000000000..b0bb0570f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light0.png.mcmeta @@ -0,0 +1,49 @@ + { + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 25 + }, + { + "index": 1, + "time": 2 + }, + { + "index": 2, + "time": 2 + }, + { + "index": 3, + "time": 2 + } + , + { + "index": 4, + "time": 2 + }, + { + "index": 5, + "time": 2 + }, + { + "index": 6, + "time": 2 + }, + { + "index": 7, + "time": 2 + } + , + { + "index": 8, + "time": 2 + }, + { + "index": 9, + "time": 2 + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light1.png b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light1.png new file mode 100644 index 000000000..24fb31151 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light1.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light1.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light1.png.mcmeta new file mode 100644 index 000000000..59678f563 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light1.png.mcmeta @@ -0,0 +1,49 @@ + { + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 2 + }, + { + "index": 1, + "time": 2 + }, + { + "index": 2, + "time": 2 + }, + { + "index": 3, + "time": 2 + } + , + { + "index": 4, + "time": 2 + }, + { + "index": 5, + "time": 2 + }, + { + "index": 6, + "time": 2 + }, + { + "index": 7, + "time": 2 + } + , + { + "index": 8, + "time": 25 + }, + { + "index": 9, + "time": 2 + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light2.png b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light2.png new file mode 100644 index 000000000..f9a5418c1 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light2.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light2.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light2.png.mcmeta new file mode 100644 index 000000000..3a459b8c2 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light2.png.mcmeta @@ -0,0 +1,49 @@ + { + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 2 + }, + { + "index": 1, + "time": 2 + }, + { + "index": 2, + "time": 25 + }, + { + "index": 3, + "time": 2 + } + , + { + "index": 4, + "time": 2 + }, + { + "index": 5, + "time": 2 + }, + { + "index": 6, + "time": 2 + }, + { + "index": 7, + "time": 2 + } + , + { + "index": 8, + "time": 2 + }, + { + "index": 9, + "time": 2 + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charger.png b/src/main/resources/assets/appliedenergistics2/textures/block/charger.png index 864a3956e..ecbd65330 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/charger.png and b/src/main/resources/assets/appliedenergistics2/textures/block/charger.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charger_inside.png b/src/main/resources/assets/appliedenergistics2/textures/block/charger_inside.png index 65a39ecd7..24b47d7c7 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/charger_inside.png and b/src/main/resources/assets/appliedenergistics2/textures/block/charger_inside.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charger_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/charger_side.png index 388ead3bc..544e63505 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/charger_side.png and b/src/main/resources/assets/appliedenergistics2/textures/block/charger_side.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/chest/bottom.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/bottom.png index 6a87e174a..2282cb559 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/chest/bottom.png and b/src/main/resources/assets/appliedenergistics2/textures/block/chest/bottom.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_backdrop.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_backdrop.png index e4f5021bb..a122117ae 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_backdrop.png and b/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_backdrop.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_empty.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_empty.png index cd3a27a73..c19bd984f 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_empty.png and b/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_empty.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_offline.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_offline.png index 49a22b659..c41d94218 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_offline.png and b/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_offline.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/chest/front.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/front.png index 81fecf6e8..75305bb20 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/chest/front.png and b/src/main/resources/assets/appliedenergistics2/textures/block/chest/front.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/chest/front_item.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/front_item.png index 5545360ad..7476160e0 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/chest/front_item.png and b/src/main/resources/assets/appliedenergistics2/textures/block/chest/front_item.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_off.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_off.png index 9a6c4e8c5..5012d9d14 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_off.png and b/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_off.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_bright.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_bright.png index 7bc5a1597..afd8af3b1 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_bright.png and b/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_bright.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_dark.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_dark.png index 2ab98bae0..a772e5320 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_dark.png and b/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_dark.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_medium.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_medium.png index d8789f24b..07debbf19 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_medium.png and b/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_medium.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/chest/side.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/side.png index d95e8e8a5..7e749a3b7 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/chest/side.png and b/src/main/resources/assets/appliedenergistics2/textures/block/chest/side.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/chest/top.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/top.png index a05c40626..0a37a65df 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/chest/top.png and b/src/main/resources/assets/appliedenergistics2/textures/block/chest/top.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/chest/top_item.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/top_item.png index b7c66998f..abe9ea80e 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/chest/top_item.png and b/src/main/resources/assets/appliedenergistics2/textures/block/chest/top_item.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_side.png index ff52ab306..07733cf2f 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_side.png and b/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_side.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_top.png b/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_top.png index 9e8be6eb0..9aa4964cd 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_top.png and b/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_top.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/condenser.png b/src/main/resources/assets/appliedenergistics2/textures/block/condenser.png index 2521701f8..24f645e1a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/condenser.png and b/src/main/resources/assets/appliedenergistics2/textures/block/condenser.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/controller.png b/src/main/resources/assets/appliedenergistics2/textures/block/controller.png index 1756710d8..c521300c7 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/controller.png and b/src/main/resources/assets/appliedenergistics2/textures/block/controller.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/controller_column.png b/src/main/resources/assets/appliedenergistics2/textures/block/controller_column.png index 7cbc3d99e..9edb96ffa 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/controller_column.png and b/src/main/resources/assets/appliedenergistics2/textures/block/controller_column.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_conflict.png b/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_conflict.png index 6cf24dc0b..ef94d690f 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_conflict.png and b/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_conflict.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_lights.png b/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_lights.png index 8b324a9a2..14cb9a2d7 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_lights.png and b/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_lights.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_lights.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_lights.png.mcmeta index 8e2af92cc..a31b852c7 100644 --- a/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_lights.png.mcmeta +++ b/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_lights.png.mcmeta @@ -1,6 +1,6 @@ { "animation": { - "frametime": 3, + "frametime": 2, "frames": [ 1, 2, diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_powered.png b/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_powered.png index 1b255cd9a..6495884e9 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_powered.png and b/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_powered.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/controller_conflict.png b/src/main/resources/assets/appliedenergistics2/textures/block/controller_conflict.png index 52ddea7b5..0615658b8 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/controller_conflict.png and b/src/main/resources/assets/appliedenergistics2/textures/block/controller_conflict.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/controller_inside_a.png b/src/main/resources/assets/appliedenergistics2/textures/block/controller_inside_a.png index 378f14a33..9db24fa67 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/controller_inside_a.png and b/src/main/resources/assets/appliedenergistics2/textures/block/controller_inside_a.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/controller_inside_b.png b/src/main/resources/assets/appliedenergistics2/textures/block/controller_inside_b.png index 1a984d43c..9259589a8 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/controller_inside_b.png and b/src/main/resources/assets/appliedenergistics2/textures/block/controller_inside_b.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/controller_lights.png b/src/main/resources/assets/appliedenergistics2/textures/block/controller_lights.png index 199dc88cf..f138a8615 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/controller_lights.png and b/src/main/resources/assets/appliedenergistics2/textures/block/controller_lights.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/controller_lights.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/controller_lights.png.mcmeta index 313e1f2b7..1d71d19d9 100644 --- a/src/main/resources/assets/appliedenergistics2/textures/block/controller_lights.png.mcmeta +++ b/src/main/resources/assets/appliedenergistics2/textures/block/controller_lights.png.mcmeta @@ -1,6 +1,6 @@ { "animation": { - "frametime": 3, + "frametime": 2, "frames": [ 0, 1, diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/controller_powered.png b/src/main/resources/assets/appliedenergistics2/textures/block/controller_powered.png index 9bac90ae1..b3013c96a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/controller_powered.png and b/src/main/resources/assets/appliedenergistics2/textures/block/controller_powered.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage.png index 2671ee304..ee01178a9 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage.png and b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage_light.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage_light.png index d54bd4483..a864c96d7 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage_light.png and b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage_light.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage_light.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage_light.png.mcmeta new file mode 100644 index 000000000..08c970507 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage_light.png.mcmeta @@ -0,0 +1,39 @@ +{ + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 90 + }, + { + "index": 1, + "time": 2 + }, + { + "index": 2, + "time": 2 + }, + { + "index": 3, + "time": 2 + }, + { + "index": 4, + "time": 2 + }, + { + "index": 5, + "time": 2 + }, + { + "index": 6, + "time": 2 + }, + { + "index": 7, + "time": 2 + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage.png index fd723f070..777ce6c2a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage.png and b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage_light.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage_light.png index 8ba2de77e..a504e4996 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage_light.png and b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage_light.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage_light.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage_light.png.mcmeta new file mode 100644 index 000000000..1db072cc9 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage_light.png.mcmeta @@ -0,0 +1,39 @@ +{ + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 70 + }, + { + "index": 1, + "time": 2 + }, + { + "index": 2, + "time": 2 + }, + { + "index": 3, + "time": 2 + }, + { + "index": 4, + "time": 2 + }, + { + "index": 5, + "time": 2 + }, + { + "index": 6, + "time": 2 + }, + { + "index": 7, + "time": 2 + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage.png index 8a010d140..79bbcf52c 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage.png and b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage_light.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage_light.png index 5e96699fe..3adb3e1b5 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage_light.png and b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage_light.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage_light.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage_light.png.mcmeta new file mode 100644 index 000000000..cead4d836 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage_light.png.mcmeta @@ -0,0 +1,39 @@ +{ + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 80 + }, + { + "index": 1, + "time": 2 + }, + { + "index": 2, + "time": 2 + }, + { + "index": 3, + "time": 2 + }, + { + "index": 4, + "time": 2 + }, + { + "index": 5, + "time": 2 + }, + { + "index": 6, + "time": 2 + }, + { + "index": 7, + "time": 2 + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage.png index c2747925e..9adae1bca 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage.png and b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage_light.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage_light.png index 4cc8c5124..a5a121676 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage_light.png and b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage_light.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage_light.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage_light.png.mcmeta new file mode 100644 index 000000000..f738b7ec6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage_light.png.mcmeta @@ -0,0 +1,39 @@ +{ + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 100 + }, + { + "index": 1, + "time": 2 + }, + { + "index": 2, + "time": 2 + }, + { + "index": 3, + "time": 2 + }, + { + "index": 4, + "time": 2 + }, + { + "index": 5, + "time": 2 + }, + { + "index": 6, + "time": 2 + }, + { + "index": 7, + "time": 2 + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/accelerator.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/accelerator.png index 25f1a3b65..9521462af 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/accelerator.png and b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/accelerator.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/accelerator_light.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/accelerator_light.png index 56fcf31ab..380da874d 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/accelerator_light.png and b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/accelerator_light.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/light_base.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/light_base.png index eea53de71..954b135ee 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/light_base.png and b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/light_base.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor.png index 83027f793..6c76aadc1 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor.png and b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_base.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_base.png index 3aaa5085b..f4cbe9df3 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_base.png and b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_base.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_light_bright.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_light_bright.png index 5a18ba2a6..9935928d6 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_light_bright.png and b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_light_bright.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_corner.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_corner.png index 1cc1a1069..8670a44c6 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_corner.png and b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_corner.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_side_hor.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_side_hor.png index 38153a448..43e9e62dc 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_side_hor.png and b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_side_hor.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_side_ver.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_side_ver.png index 50004ea26..d280740f9 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_side_ver.png and b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_side_ver.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/unit.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/unit.png index a418d64e7..127d6ab0e 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/unit.png and b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/unit.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/unit_base.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/unit_base.png index ef072c914..b1efc31bb 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/crafting/unit_base.png and b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/unit_base.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/creative_energy_cell.png b/src/main/resources/assets/appliedenergistics2/textures/block/creative_energy_cell.png index 1f4fd0ef9..83823f43d 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/creative_energy_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/block/creative_energy_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/debug.log b/src/main/resources/assets/appliedenergistics2/textures/block/debug.log new file mode 100644 index 000000000..8f57981c3 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/block/debug.log @@ -0,0 +1,2 @@ +[0825/213501.007:INFO:CONSOLE(1)] "Long rAF frame-time", source: file:///C:/Program%20Files/Adobe/Adobe%20Photoshop%202020/Required/www-rich-tooltips/build/external.js (1) +[0825/233757.240:ERROR:browser_gpu_channel_host_factory.cc(139)] Failed to launch GPU process. diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell.png index 9e602fd11..265c42c1e 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell0.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell0.png index afce73be4..50494b753 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell0.png and b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell0.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell1.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell1.png index a173bb966..b97c73f10 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell1.png and b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell1.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell2.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell2.png index 103babce5..70e19a1c9 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell2.png and b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell2.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell3.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell3.png index 9e602fd11..93a69b64e 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell3.png and b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell3.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell4.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell4.png index 7fa921c87..458ba838a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell4.png and b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell4.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell5.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell5.png index 3c6240776..4c0d1e8e8 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell5.png and b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell5.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell6.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell6.png index 72c6c5d01..57e04a329 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell6.png and b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell6.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell7.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell7.png index 1e714aef7..e07df5d7f 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell7.png and b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell7.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/16k_fluid_cell.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/16k_fluid_cell.png index fa2693a04..bd320fbe3 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/16k_fluid_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/16k_fluid_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/16k_item_cell.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/16k_item_cell.png index e4679422b..c1a7766cd 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/16k_item_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/16k_item_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/1k_fluid_cell.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/1k_fluid_cell.png index e0a03f24a..dcf70b373 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/1k_fluid_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/1k_fluid_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/1k_item_cell.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/1k_item_cell.png index 3cc05dfb6..92297380b 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/1k_item_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/1k_item_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/4k_fluid_cell.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/4k_fluid_cell.png index f6836271a..c9d4f2493 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/4k_fluid_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/4k_fluid_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/4k_item_cell.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/4k_item_cell.png index 7668e0ea5..d28399885 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/4k_item_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/4k_item_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/64k_fluid_cell.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/64k_fluid_cell.png index 0d4c7e2cc..033dec95a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/64k_fluid_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/64k_fluid_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/64k_item_cell.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/64k_item_cell.png index 816f526a2..bff2b69f3 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/64k_item_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/64k_item_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/creative_cell.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/creative_cell.png index 85fe9b851..05a7314ec 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/creative_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/creative_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/default_cell.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/default_cell.png index 3a78b7800..82ba1c151 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/default_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/cells/default_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_bottom.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_bottom.png index 6a87e174a..e9d41fdbd 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_bottom.png and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_bottom.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_cell_states.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_cell_states.png index b840fe48d..eebcf4f1f 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_cell_states.png and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_cell_states.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front.png index 4e9bd62a2..099051105 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front.png and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front_flat.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front_flat.png index 00287e0d1..4165f700a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front_flat.png and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front_flat.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_inside.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_inside.png index f66ab0378..ff62d322c 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_inside.png and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_inside.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_side.png index 6c7e4831f..3c77d1081 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_side.png and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_side.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_top.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_top.png index 7ec665781..75cb56c53 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_top.png and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_top.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_acceptor.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_acceptor.png index 431a9542d..14007c90a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/energy_acceptor.png and b/src/main/resources/assets/appliedenergistics2/textures/block/energy_acceptor.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell.png index cc184ca06..001a211c6 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell0.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell0.png index 2e827af8a..60f25fd15 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell0.png and b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell0.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell1.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell1.png index 718deab9f..9c82b9d04 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell1.png and b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell1.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell2.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell2.png index 742f2d795..0c27b142f 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell2.png and b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell2.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell3.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell3.png index cc184ca06..c5a7f548a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell3.png and b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell3.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell4.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell4.png index ca9143a39..7fad1e7ed 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell4.png and b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell4.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/fluid_interface.png b/src/main/resources/assets/appliedenergistics2/textures/block/fluid_interface.png index 2529a9b7e..00d0c2549 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/fluid_interface.png and b/src/main/resources/assets/appliedenergistics2/textures/block/fluid_interface.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/fluid_interface_on.png b/src/main/resources/assets/appliedenergistics2/textures/block/fluid_interface_on.png new file mode 100644 index 000000000..e09d46bc6 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/block/fluid_interface_on.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/fluix_block.png b/src/main/resources/assets/appliedenergistics2/textures/block/fluix_block.png index 52130c359..1cbfb2db0 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/fluix_block.png and b/src/main/resources/assets/appliedenergistics2/textures/block/fluix_block.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_a.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_a.png index 08ced73ff..38c5bc95e 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_a.png and b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_a.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_b.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_b.png index 51ce1f7d6..16c9fa427 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_b.png and b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_b.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_c.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_c.png index 640b0beac..2f24c0096 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_c.png and b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_c.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_d.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_d.png index 784458074..581007ed8 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_d.png and b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_d.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0001.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0001.png index 0096ebbb4..0bdd69e8a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0001.png and b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0001.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0010.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0010.png index 18e178931..9b3d4a502 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0010.png and b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0010.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0011.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0011.png index 4c959e13e..8f9ca1893 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0011.png and b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0011.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0100.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0100.png index 8c28e98e7..ad33f6a1a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0100.png and b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0100.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0101.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0101.png index c70506ed0..6ebced779 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0101.png and b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0101.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0110.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0110.png index 0a07653a5..e20936ec5 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0110.png and b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0110.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0111.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0111.png index bc2a7120b..ba823bfe8 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0111.png and b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0111.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1000.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1000.png index 94863092f..f5281e245 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1000.png and b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1000.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1001.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1001.png index 6c7a463db..33f8f4cb3 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1001.png and b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1001.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1010.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1010.png index 6b63d1655..708f98e46 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1010.png and b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1010.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1011.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1011.png index 627f8a209..e5c143403 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1011.png and b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1011.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1100.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1100.png index 1b8163247..b5e1bc785 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1100.png and b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1100.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1101.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1101.png index 67511a5ab..98ea8a21d 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1101.png and b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1101.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1110.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1110.png index e8d0be186..e740aacf1 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1110.png and b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1110.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1111.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1111.png index 1b44a2e81..22f0199da 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1111.png and b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1111.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/grindstone.png b/src/main/resources/assets/appliedenergistics2/textures/block/grindstone.png index 3c41c386b..06b59afec 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/grindstone.png and b/src/main/resources/assets/appliedenergistics2/textures/block/grindstone.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_bottom.png b/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_bottom.png index f70d8ec77..4699400f2 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_bottom.png and b/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_bottom.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_front.png b/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_front.png index 299091afb..5b17d9a76 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_front.png and b/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_front.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_side.png index 72f308c70..b7790a329 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_side.png and b/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_side.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/inscriber.png b/src/main/resources/assets/appliedenergistics2/textures/block/inscriber.png index 566045a5e..5d04a481b 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/inscriber.png and b/src/main/resources/assets/appliedenergistics2/textures/block/inscriber.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/inscriber_inside.png b/src/main/resources/assets/appliedenergistics2/textures/block/inscriber_inside.png index 08f84f0fe..1b9aa85d6 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/inscriber_inside.png and b/src/main/resources/assets/appliedenergistics2/textures/block/inscriber_inside.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/inscriber_on.png b/src/main/resources/assets/appliedenergistics2/textures/block/inscriber_on.png new file mode 100644 index 000000000..63879a5ef Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/block/inscriber_on.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/interface.png b/src/main/resources/assets/appliedenergistics2/textures/block/interface.png index dccd04a41..c6fe9dd37 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/interface.png and b/src/main/resources/assets/appliedenergistics2/textures/block/interface.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate.png b/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate.png index b100ea882..fec1f0079 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate.png and b/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_arrow.png b/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_arrow.png index 95fcd713c..e10467475 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_arrow.png and b/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_arrow.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_arrow_on.png b/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_arrow_on.png new file mode 100644 index 000000000..8cd5e57f7 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_arrow_on.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_on.png b/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_on.png new file mode 100644 index 000000000..722b91d99 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_on.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/interface_on.png b/src/main/resources/assets/appliedenergistics2/textures/block/interface_on.png new file mode 100644 index 000000000..fc46c7a6c Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/block/interface_on.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/io_port.png b/src/main/resources/assets/appliedenergistics2/textures/block/io_port.png index bd5cd1353..8fb685014 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/io_port.png and b/src/main/resources/assets/appliedenergistics2/textures/block/io_port.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/io_port_bottom.png b/src/main/resources/assets/appliedenergistics2/textures/block/io_port_bottom.png index 6a87e174a..7f8e4a8cb 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/io_port_bottom.png and b/src/main/resources/assets/appliedenergistics2/textures/block/io_port_bottom.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/io_port_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/io_port_side.png index 4c66fd486..d1f46b06c 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/io_port_side.png and b/src/main/resources/assets/appliedenergistics2/textures/block/io_port_side.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/molecular_assembler.png b/src/main/resources/assets/appliedenergistics2/textures/block/molecular_assembler.png index da2668d04..0f0eb6426 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/molecular_assembler.png and b/src/main/resources/assets/appliedenergistics2/textures/block/molecular_assembler.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quantum_link.png b/src/main/resources/assets/appliedenergistics2/textures/block/quantum_link.png index ed25eb274..a392de0a7 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/quantum_link.png and b/src/main/resources/assets/appliedenergistics2/textures/block/quantum_link.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring.png b/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring.png index fd023976f..2e9873fda 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring.png and b/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light.png b/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light.png index 3fbfb59a0..8b1ae8f35 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light.png and b/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light.png.mcmeta new file mode 100644 index 000000000..29d1163a9 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light.png.mcmeta @@ -0,0 +1,15 @@ + { + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 10 + }, + { + "index": 1, + "time": 10 + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light_corner.png b/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light_corner.png index 6926e2067..b625780fa 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light_corner.png and b/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light_corner.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light_corner.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light_corner.png.mcmeta new file mode 100644 index 000000000..29d1163a9 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light_corner.png.mcmeta @@ -0,0 +1,15 @@ + { + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 10 + }, + { + "index": 1, + "time": 10 + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_block.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_block.png index 32e3c73d6..b1ccf09b1 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_block.png and b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_block.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator.png index 01f89df10..c4d5cc3a5 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator.png and b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_on.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_on.png index b2e260be8..b6f9ab70e 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_on.png and b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_on.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_on.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_on.png.mcmeta index aa7d14af8..467c1d4e1 100644 --- a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_on.png.mcmeta +++ b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_on.png.mcmeta @@ -1,11 +1,15 @@ -{ + { "animation": { - "frametime": 4, + "interpolate": true, "frames": [ - 0, - 1, - 2, - 3 + { + "index": 0, + "time": 25 + }, + { + "index": 1, + "time": 25 + } ] - } -} + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side.png index d98c1c4ac..81e8f80b4 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side.png and b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side_on.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side_on.png index 3b90a175c..0793c517c 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side_on.png and b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side_on.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side_on.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side_on.png.mcmeta index aa7d14af8..467c1d4e1 100644 --- a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side_on.png.mcmeta +++ b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side_on.png.mcmeta @@ -1,11 +1,15 @@ -{ + { "animation": { - "frametime": 4, + "interpolate": true, "frames": [ - 0, - 1, - 2, - 3 + { + "index": 0, + "time": 25 + }, + { + "index": 1, + "time": 25 + } ] - } -} + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore.png deleted file mode 100644 index f9dec23ca..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore0.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore0.png new file mode 100644 index 000000000..1848c2b11 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore0.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore1.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore1.png new file mode 100644 index 000000000..af6cf4110 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore1.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore2.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore2.png new file mode 100644 index 000000000..49afb0d93 Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore2.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore3.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore3.png new file mode 100644 index 000000000..23ef7d30e Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore3.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_side.png index f783fcbc7..0979b24f2 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_side.png and b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_side.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_top.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_top.png index 4ae65f72b..d94926772 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_top.png and b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_top.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/security_station_bottom.png b/src/main/resources/assets/appliedenergistics2/textures/block/security_station_bottom.png index 6a87e174a..ff0b4d59e 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/security_station_bottom.png and b/src/main/resources/assets/appliedenergistics2/textures/block/security_station_bottom.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_bright.png b/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_bright.png index bd7939ead..91eebebd1 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_bright.png and b/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_bright.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_dark.png b/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_dark.png index 418494a2e..864f5f405 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_dark.png and b/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_dark.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_medium.png b/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_medium.png index 9f45ae060..bd8360cac 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_medium.png and b/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_medium.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/security_station_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/security_station_side.png index 286552233..332db5890 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/security_station_side.png and b/src/main/resources/assets/appliedenergistics2/textures/block/security_station_side.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/security_station_top.png b/src/main/resources/assets/appliedenergistics2/textures/block/security_station_top.png index 03d536cb5..d95613ced 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/security_station_top.png and b/src/main/resources/assets/appliedenergistics2/textures/block/security_station_top.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/sky_compass.png b/src/main/resources/assets/appliedenergistics2/textures/block/sky_compass.png index 2ae9458c1..6573038de 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/sky_compass.png and b/src/main/resources/assets/appliedenergistics2/textures/block/sky_compass.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_block.png b/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_block.png index c2e60adf5..5a2a9ff99 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_block.png and b/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_block.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_brick.png b/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_brick.png index c36da7b18..a543451b3 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_brick.png and b/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_brick.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_small_brick.png b/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_small_brick.png index 349f8191a..707a7649a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_small_brick.png and b/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_small_brick.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/smooth_sky_stone_block.png b/src/main/resources/assets/appliedenergistics2/textures/block/smooth_sky_stone_block.png index 78d0c1e7a..32a1d0afe 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/smooth_sky_stone_block.png and b/src/main/resources/assets/appliedenergistics2/textures/block/smooth_sky_stone_block.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port.png index a8125bd0d..da70146c9 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port.png and b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port_bottom.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port_bottom.png index 6a87e174a..7854d4405 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port_bottom.png and b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port_bottom.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port_side.png index dd200d157..668479b17 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port_side.png and b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port_side.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base.png index e6314ea81..e6f6f7549 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base.png and b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base_end.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base_end.png index 9149d271e..d6432355a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base_end.png and b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base_end.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base_spanned.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base_spanned.png index 7fdd56880..47b629c48 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base_spanned.png and b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base_spanned.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim.png index bc821d2cd..9553b5159 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim.png and b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim_end.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim_end.png index a96c993ee..cc5b0758c 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim_end.png and b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim_end.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim_spanned.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim_spanned.png index 1e0ce032c..25ded2b54 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim_spanned.png and b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim_spanned.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red.png index 9b6729e8b..2c3f7239b 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red.png and b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red_end.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red_end.png index 6c99af8b3..eed50400f 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red_end.png and b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red_end.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red_spanned.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red_spanned.png index 954b544ec..cb862588d 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red_spanned.png and b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red_spanned.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber.png b/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber.png index 4381c6f13..f75b23dc8 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber.png and b/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber_front.png b/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber_front.png index 0ec545351..76ad1f59e 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber_front.png and b/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber_front.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber_front_on.png b/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber_front_on.png index 9257adb77..c5bb3819c 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber_front_on.png and b/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber_front_on.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber_front_on.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber_front_on.png.mcmeta new file mode 100644 index 000000000..4894b537c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber_front_on.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 10 + } +} diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/wireless_access_point_on.png b/src/main/resources/assets/appliedenergistics2/textures/block/wireless_access_point_on.png index 9eb86d947..dc9585847 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/wireless_access_point_on.png and b/src/main/resources/assets/appliedenergistics2/textures/block/wireless_access_point_on.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/128_cubed_spatial_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/128_cubed_spatial_cell_component.png index 3aa5902a1..f81e401c5 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/128_cubed_spatial_cell_component.png and b/src/main/resources/assets/appliedenergistics2/textures/item/128_cubed_spatial_cell_component.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/128_cubed_spatial_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/128_cubed_spatial_storage_cell.png index 883ecd6ef..08a3925e3 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/128_cubed_spatial_storage_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/item/128_cubed_spatial_storage_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/16_cubed_spatial_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/16_cubed_spatial_cell_component.png index 2c656330f..f4d53292a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/16_cubed_spatial_cell_component.png and b/src/main/resources/assets/appliedenergistics2/textures/item/16_cubed_spatial_cell_component.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/16_cubed_spatial_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/16_cubed_spatial_storage_cell.png index 4189f1a1f..d286fb7d3 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/16_cubed_spatial_storage_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/item/16_cubed_spatial_storage_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/16k_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/16k_cell_component.png index d1e836fb7..14f119ba6 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/16k_cell_component.png and b/src/main/resources/assets/appliedenergistics2/textures/item/16k_cell_component.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/16k_fluid_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/16k_fluid_cell_component.png index 38ecf24fe..0421e6210 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/16k_fluid_cell_component.png and b/src/main/resources/assets/appliedenergistics2/textures/item/16k_fluid_cell_component.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/16k_fluid_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/16k_fluid_storage_cell.png index a1de485aa..c6fb29c61 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/16k_fluid_storage_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/item/16k_fluid_storage_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/16k_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/16k_storage_cell.png index 509584129..3296d95b1 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/16k_storage_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/item/16k_storage_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/1k_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/1k_cell_component.png index e96a67875..bb88bfa61 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/1k_cell_component.png and b/src/main/resources/assets/appliedenergistics2/textures/item/1k_cell_component.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/1k_fluid_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/1k_fluid_cell_component.png index f27413bd8..231cf7eea 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/1k_fluid_cell_component.png and b/src/main/resources/assets/appliedenergistics2/textures/item/1k_fluid_cell_component.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/1k_fluid_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/1k_fluid_storage_cell.png index 969d01dfc..b7df15689 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/1k_fluid_storage_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/item/1k_fluid_storage_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/1k_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/1k_storage_cell.png index d3e7709c7..dc2774c8c 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/1k_storage_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/item/1k_storage_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/2_cubed_spatial_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/2_cubed_spatial_cell_component.png index 3879aa501..0bb12300a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/2_cubed_spatial_cell_component.png and b/src/main/resources/assets/appliedenergistics2/textures/item/2_cubed_spatial_cell_component.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/2_cubed_spatial_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/2_cubed_spatial_storage_cell.png index 3a06ac30f..5dbb2fd15 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/2_cubed_spatial_storage_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/item/2_cubed_spatial_storage_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/4k_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/4k_cell_component.png index 984dfa585..8f2572ba0 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/4k_cell_component.png and b/src/main/resources/assets/appliedenergistics2/textures/item/4k_cell_component.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/4k_fluid_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/4k_fluid_cell_component.png index fc6e4f282..7d2c2710a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/4k_fluid_cell_component.png and b/src/main/resources/assets/appliedenergistics2/textures/item/4k_fluid_cell_component.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/4k_fluid_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/4k_fluid_storage_cell.png index 19cab1615..bbce4d493 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/4k_fluid_storage_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/item/4k_fluid_storage_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/4k_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/4k_storage_cell.png index df74a9d3c..b451b9f3c 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/4k_storage_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/item/4k_storage_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/64k_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/64k_cell_component.png index 1243b87aa..24741aa64 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/64k_cell_component.png and b/src/main/resources/assets/appliedenergistics2/textures/item/64k_cell_component.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/64k_fluid_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/64k_fluid_cell_component.png index 59536b207..80663e6be 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/64k_fluid_cell_component.png and b/src/main/resources/assets/appliedenergistics2/textures/item/64k_fluid_cell_component.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/64k_fluid_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/64k_fluid_storage_cell.png index 18da68cd7..b85231231 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/64k_fluid_storage_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/item/64k_fluid_storage_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/64k_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/64k_storage_cell.png index ed66787f3..5f32d053b 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/64k_storage_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/item/64k_storage_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/advanced_card.png b/src/main/resources/assets/appliedenergistics2/textures/item/advanced_card.png index 8007c7e0f..3f1ae9861 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/advanced_card.png and b/src/main/resources/assets/appliedenergistics2/textures/item/advanced_card.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/annihilation_core.png b/src/main/resources/assets/appliedenergistics2/textures/item/annihilation_core.png index 98c88d512..0f8fc85bc 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/annihilation_core.png and b/src/main/resources/assets/appliedenergistics2/textures/item/annihilation_core.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/basic_card.png b/src/main/resources/assets/appliedenergistics2/textures/item/basic_card.png index 89a4bffc5..23d2c9a3f 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/basic_card.png and b/src/main/resources/assets/appliedenergistics2/textures/item/basic_card.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/biometric_card.png b/src/main/resources/assets/appliedenergistics2/textures/item/biometric_card.png index 42afaed30..d4df86138 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/biometric_card.png and b/src/main/resources/assets/appliedenergistics2/textures/item/biometric_card.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/biometric_card_hash.png b/src/main/resources/assets/appliedenergistics2/textures/item/biometric_card_hash.png index 26b4a34aa..e0feedab9 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/biometric_card_hash.png and b/src/main/resources/assets/appliedenergistics2/textures/item/biometric_card_hash.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/blank_pattern.png b/src/main/resources/assets/appliedenergistics2/textures/item/blank_pattern.png index 91d979f06..8b69479ed 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/blank_pattern.png and b/src/main/resources/assets/appliedenergistics2/textures/item/blank_pattern.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/calculation_processor.png b/src/main/resources/assets/appliedenergistics2/textures/item/calculation_processor.png index 42c64ab3f..84b65fb2e 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/calculation_processor.png and b/src/main/resources/assets/appliedenergistics2/textures/item/calculation_processor.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/calculation_processor_press.png b/src/main/resources/assets/appliedenergistics2/textures/item/calculation_processor_press.png index 1e75a1d47..35b5bf1fe 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/calculation_processor_press.png and b/src/main/resources/assets/appliedenergistics2/textures/item/calculation_processor_press.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/card_capacity.png b/src/main/resources/assets/appliedenergistics2/textures/item/card_capacity.png index 3a5bef279..1f4006d04 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/card_capacity.png and b/src/main/resources/assets/appliedenergistics2/textures/item/card_capacity.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/card_crafting.png b/src/main/resources/assets/appliedenergistics2/textures/item/card_crafting.png index 30382a1bc..d11a2305c 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/card_crafting.png and b/src/main/resources/assets/appliedenergistics2/textures/item/card_crafting.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/card_fuzzy.png b/src/main/resources/assets/appliedenergistics2/textures/item/card_fuzzy.png index ac9e40fb6..6be19629a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/card_fuzzy.png and b/src/main/resources/assets/appliedenergistics2/textures/item/card_fuzzy.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/card_inverter.png b/src/main/resources/assets/appliedenergistics2/textures/item/card_inverter.png index 658a4f1da..08827928a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/card_inverter.png and b/src/main/resources/assets/appliedenergistics2/textures/item/card_inverter.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/card_redstone.png b/src/main/resources/assets/appliedenergistics2/textures/item/card_redstone.png index 8f9334153..682b4990a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/card_redstone.png and b/src/main/resources/assets/appliedenergistics2/textures/item/card_redstone.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/card_speed.png b/src/main/resources/assets/appliedenergistics2/textures/item/card_speed.png index 6344a2bcb..8878ce3ad 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/card_speed.png and b/src/main/resources/assets/appliedenergistics2/textures/item/card_speed.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_axe.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_axe.png index 0ea271874..d429827b2 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_axe.png and b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_axe.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal.png index 4a5fff832..61101c99d 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal.png and b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal_charged.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal_charged.png index e99f4f29a..2737ec431 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal_charged.png and b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal_charged.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal_charged.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal_charged.png.mcmeta new file mode 100644 index 000000000..e3f2576e4 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal_charged.png.mcmeta @@ -0,0 +1,53 @@ +{ + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 50 + }, + { + "index": 1, + "time": 3 + }, + { + "index": 2, + "time": 3 + }, + { + "index": 3, + "time": 3 + } + , + { + "index": 4, + "time": 3 + }, + { + "index": 5, + "time": 3 + }, + { + "index": 6, + "time": 3 + }, + { + "index": 7, + "time": 3 + } + , + { + "index": 8, + "time": 3 + }, + { + "index": 9, + "time": 3 + }, + { + "index": 10, + "time": 3 + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_cutting_knife.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_cutting_knife.png index 95d236f4f..1cea394b2 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_cutting_knife.png and b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_cutting_knife.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_dust.png index a79afdbed..8c8956af3 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_dust.png and b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_dust.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_hoe.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_hoe.png index 26127c933..b9f549716 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_hoe.png and b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_hoe.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_pickaxe.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_pickaxe.png index 66601e762..879055828 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_pickaxe.png and b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_pickaxe.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_shovel.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_shovel.png index 10b8105d2..e586b1ff7 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_shovel.png and b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_shovel.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_sword.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_sword.png index 6ccef66d0..dbcc8ec6f 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_sword.png and b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_sword.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_wrench.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_wrench.png index 55d60ac38..a9af58615 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_wrench.png and b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_wrench.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/charged_staff.png b/src/main/resources/assets/appliedenergistics2/textures/item/charged_staff.png index b6f65e996..058905561 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/charged_staff.png and b/src/main/resources/assets/appliedenergistics2/textures/item/charged_staff.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/charged_staff.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/item/charged_staff.png.mcmeta new file mode 100644 index 000000000..5bcc24b75 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/item/charged_staff.png.mcmeta @@ -0,0 +1,52 @@ +{ + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 40 + }, + { + "index": 1, + "time": 2 + }, + { + "index": 2, + "time": 2 + }, + { + "index": 3, + "time": 2 + } + , + { + "index": 4, + "time": 2 + }, + { + "index": 5, + "time": 2 + }, + { + "index": 6, + "time": 2 + }, + { + "index": 7, + "time": 2 + }, + { + "index": 8, + "time": 2 + }, + { + "index": 9, + "time": 2 + }, + { + "index": 10, + "time": 2 + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/color_applicator.png b/src/main/resources/assets/appliedenergistics2/textures/item/color_applicator.png index 679ab269d..d108ab7ed 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/color_applicator.png and b/src/main/resources/assets/appliedenergistics2/textures/item/color_applicator.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/creative_fluid_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/creative_fluid_storage_cell.png new file mode 100644 index 000000000..3c5f2f51f Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/item/creative_fluid_storage_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/creative_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/creative_storage_cell.png index bf4f08fc9..52d6748f3 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/creative_storage_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/item/creative_storage_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus.png b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus.png index 2ad355c61..65709a1cb 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus.png and b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus2.png b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus2.png index 45638c6ad..1b24d0fb9 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus2.png and b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus2.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus3.png b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus3.png index ba5ec79d7..a6ce88e14 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus3.png and b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus3.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix.png b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix.png index b7d9eaad8..6b34fd9f2 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix.png and b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix2.png b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix2.png index 070b875ba..d3f8266f9 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix2.png and b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix2.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix3.png b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix3.png index 01c249dd8..d2841d872 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix3.png and b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix3.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether.png b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether.png index 05cecd452..0f06dc3e8 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether.png and b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether2.png b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether2.png index c714bbb4b..207104ad2 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether2.png and b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether2.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether3.png b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether3.png index b1bfa10d9..3c962952d 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether3.png and b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether3.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/debug_card.png b/src/main/resources/assets/appliedenergistics2/textures/item/debug_card.png index 77c605119..20e32a5c4 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/debug_card.png and b/src/main/resources/assets/appliedenergistics2/textures/item/debug_card.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/empty_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/empty_storage_cell.png index 4db1b6198..833cff929 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/empty_storage_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/item/empty_storage_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/encoded_pattern.png b/src/main/resources/assets/appliedenergistics2/textures/item/encoded_pattern.png index 11f535e2f..f1e4cd46d 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/encoded_pattern.png and b/src/main/resources/assets/appliedenergistics2/textures/item/encoded_pattern.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/ender_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/ender_dust.png index de9935eed..85a066ed4 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/ender_dust.png and b/src/main/resources/assets/appliedenergistics2/textures/item/ender_dust.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/engineering_processor.png b/src/main/resources/assets/appliedenergistics2/textures/item/engineering_processor.png index 9b94df941..3eef7d031 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/engineering_processor.png and b/src/main/resources/assets/appliedenergistics2/textures/item/engineering_processor.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/engineering_processor_press.png b/src/main/resources/assets/appliedenergistics2/textures/item/engineering_processor_press.png index 7dabde3ee..7ebc93f71 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/engineering_processor_press.png and b/src/main/resources/assets/appliedenergistics2/textures/item/engineering_processor_press.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/entropy_manipulator.png b/src/main/resources/assets/appliedenergistics2/textures/item/entropy_manipulator.png index 938322330..7d8aea88b 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/entropy_manipulator.png and b/src/main/resources/assets/appliedenergistics2/textures/item/entropy_manipulator.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/fluix_crystal.png b/src/main/resources/assets/appliedenergistics2/textures/item/fluix_crystal.png index a40c35f6e..dce69de65 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/fluix_crystal.png and b/src/main/resources/assets/appliedenergistics2/textures/item/fluix_crystal.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/fluix_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/fluix_dust.png index 05879d6ff..78056c1a6 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/fluix_dust.png and b/src/main/resources/assets/appliedenergistics2/textures/item/fluix_dust.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/fluix_pearl.png b/src/main/resources/assets/appliedenergistics2/textures/item/fluix_pearl.png index d7a210355..6441cb4a6 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/fluix_pearl.png and b/src/main/resources/assets/appliedenergistics2/textures/item/fluix_pearl.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/formation_core.png b/src/main/resources/assets/appliedenergistics2/textures/item/formation_core.png index 380de9ccb..90654c174 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/formation_core.png and b/src/main/resources/assets/appliedenergistics2/textures/item/formation_core.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/gold_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/gold_dust.png index 8b2268af2..6ad240a18 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/gold_dust.png and b/src/main/resources/assets/appliedenergistics2/textures/item/gold_dust.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/iron_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/iron_dust.png index 0499eb4c1..5866bffc9 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/iron_dust.png and b/src/main/resources/assets/appliedenergistics2/textures/item/iron_dust.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/logic_processor.png b/src/main/resources/assets/appliedenergistics2/textures/item/logic_processor.png index 6ce666636..7bd1c2c26 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/logic_processor.png and b/src/main/resources/assets/appliedenergistics2/textures/item/logic_processor.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/logic_processor_press.png b/src/main/resources/assets/appliedenergistics2/textures/item/logic_processor_press.png index b04a0208b..c5b97374b 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/logic_processor_press.png and b/src/main/resources/assets/appliedenergistics2/textures/item/logic_processor_press.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/matter_cannon.png b/src/main/resources/assets/appliedenergistics2/textures/item/matter_cannon.png index e64922e7a..b31ed4b87 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/matter_cannon.png and b/src/main/resources/assets/appliedenergistics2/textures/item/matter_cannon.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/memory_card.png b/src/main/resources/assets/appliedenergistics2/textures/item/memory_card.png index 3fd3ca9f7..cfafbf6ed 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/memory_card.png and b/src/main/resources/assets/appliedenergistics2/textures/item/memory_card.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/name_press.png b/src/main/resources/assets/appliedenergistics2/textures/item/name_press.png index eabc63e86..4d807b895 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/name_press.png and b/src/main/resources/assets/appliedenergistics2/textures/item/name_press.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_axe.png b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_axe.png index ae361a8a4..e44abc6c6 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_axe.png and b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_axe.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_cutting_knife.png b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_cutting_knife.png index 8381a400d..445ce5723 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_cutting_knife.png and b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_cutting_knife.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_dust.png index 6a34fdfc3..58fb481ed 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_dust.png and b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_dust.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_hoe.png b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_hoe.png index e6524f8a5..4cea0ee82 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_hoe.png and b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_hoe.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_pickaxe.png b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_pickaxe.png index cace0b863..4d4495242 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_pickaxe.png and b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_pickaxe.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_shovel.png b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_shovel.png index 1b049c434..ec63e429d 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_shovel.png and b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_shovel.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_sword.png b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_sword.png index fa9dce16e..95d689411 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_sword.png and b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_sword.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_wrench.png b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_wrench.png index baf068f74..bf3408411 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_wrench.png and b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_wrench.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/network_tool.png b/src/main/resources/assets/appliedenergistics2/textures/item/network_tool.png index 8a59c8923..a8933dcdb 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/network_tool.png and b/src/main/resources/assets/appliedenergistics2/textures/item/network_tool.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/portable_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/portable_cell.png index 281dc1fbb..769695ffd 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/portable_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/item/portable_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/printed_calculation_processor.png b/src/main/resources/assets/appliedenergistics2/textures/item/printed_calculation_processor.png index fd2d83c9e..2fc1c1305 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/printed_calculation_processor.png and b/src/main/resources/assets/appliedenergistics2/textures/item/printed_calculation_processor.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/printed_engineering_processor.png b/src/main/resources/assets/appliedenergistics2/textures/item/printed_engineering_processor.png index 65c1d4c3a..da7df4ab8 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/printed_engineering_processor.png and b/src/main/resources/assets/appliedenergistics2/textures/item/printed_engineering_processor.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/printed_logic_processor.png b/src/main/resources/assets/appliedenergistics2/textures/item/printed_logic_processor.png index 95d262879..8ef2b6a7e 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/printed_logic_processor.png and b/src/main/resources/assets/appliedenergistics2/textures/item/printed_logic_processor.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/printed_silicon.png b/src/main/resources/assets/appliedenergistics2/textures/item/printed_silicon.png index e608c9ea3..d3f28e7f5 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/printed_silicon.png and b/src/main/resources/assets/appliedenergistics2/textures/item/printed_silicon.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/purified_certus_quartz_crystal.png b/src/main/resources/assets/appliedenergistics2/textures/item/purified_certus_quartz_crystal.png index ae42e09e1..03a8c3b90 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/purified_certus_quartz_crystal.png and b/src/main/resources/assets/appliedenergistics2/textures/item/purified_certus_quartz_crystal.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/purified_fluix_crystal.png b/src/main/resources/assets/appliedenergistics2/textures/item/purified_fluix_crystal.png index 8cee91d14..75f822242 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/purified_fluix_crystal.png and b/src/main/resources/assets/appliedenergistics2/textures/item/purified_fluix_crystal.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/purified_nether_quartz_crystal.png b/src/main/resources/assets/appliedenergistics2/textures/item/purified_nether_quartz_crystal.png index 6ba3ebf25..7d422b674 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/purified_nether_quartz_crystal.png and b/src/main/resources/assets/appliedenergistics2/textures/item/purified_nether_quartz_crystal.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/quantum_entangled_singularity.png b/src/main/resources/assets/appliedenergistics2/textures/item/quantum_entangled_singularity.png index 1d4f3df06..fa9e94f3c 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/quantum_entangled_singularity.png and b/src/main/resources/assets/appliedenergistics2/textures/item/quantum_entangled_singularity.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/quantum_entangled_singularity.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/item/quantum_entangled_singularity.png.mcmeta new file mode 100644 index 000000000..ebf210387 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/item/quantum_entangled_singularity.png.mcmeta @@ -0,0 +1,43 @@ +{ + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 4 + }, + { + "index": 1, + "time": 4 + }, + { + "index": 2, + "time": 4 + }, + { + "index": 3, + "time": 4 + }, + { + "index": 4, + "time": 20 + }, + { + "index": 5, + "time": 4 + }, + { + "index": 6, + "time": 4 + }, + { + "index": 7, + "time": 4 + }, + { + "index": 8, + "time": 4 + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/silicon.png b/src/main/resources/assets/appliedenergistics2/textures/item/silicon.png index 9c5977f21..e04643550 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/silicon.png and b/src/main/resources/assets/appliedenergistics2/textures/item/silicon.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/silicon_press.png b/src/main/resources/assets/appliedenergistics2/textures/item/silicon_press.png index 6a5261038..a85922a16 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/silicon_press.png and b/src/main/resources/assets/appliedenergistics2/textures/item/silicon_press.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/singularity.png b/src/main/resources/assets/appliedenergistics2/textures/item/singularity.png index 634b1d780..0d723766b 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/singularity.png and b/src/main/resources/assets/appliedenergistics2/textures/item/singularity.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/singularity.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/item/singularity.png.mcmeta new file mode 100644 index 000000000..ee630fbaa --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/item/singularity.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 2 + }, + { + "index": 1, + "time": 2 + }, + { + "index": 2, + "time": 2 + }, + { + "index": 3, + "time": 2 + } + , + { + "index": 4, + "time": 2 + }, + { + "index": 5, + "time": 2 + }, + { + "index": 6, + "time": 2 + }, + { + "index": 7, + "time": 2 + } + , + { + "index": 8, + "time": 2 + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/sky_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/sky_dust.png index 6be1992a5..5d7450646 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/sky_dust.png and b/src/main/resources/assets/appliedenergistics2/textures/item/sky_dust.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/spatial_pylon.png b/src/main/resources/assets/appliedenergistics2/textures/item/spatial_pylon.png index a59190403..1d2b86c88 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/spatial_pylon.png and b/src/main/resources/assets/appliedenergistics2/textures/item/spatial_pylon.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/view_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/view_cell.png index 26c861ec4..96e67a331 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/view_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/item/view_cell.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/wireless_booster.png b/src/main/resources/assets/appliedenergistics2/textures/item/wireless_booster.png index 1d4f199b9..e39d4cb96 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/wireless_booster.png and b/src/main/resources/assets/appliedenergistics2/textures/item/wireless_booster.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/wireless_receiver.png b/src/main/resources/assets/appliedenergistics2/textures/item/wireless_receiver.png index 3ff39eed3..8807ff031 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/wireless_receiver.png and b/src/main/resources/assets/appliedenergistics2/textures/item/wireless_receiver.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/wireless_terminal.png b/src/main/resources/assets/appliedenergistics2/textures/item/wireless_terminal.png index 53b8f9b90..764bf1eb7 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/wireless_terminal.png and b/src/main/resources/assets/appliedenergistics2/textures/item/wireless_terminal.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/wooden_gear.png b/src/main/resources/assets/appliedenergistics2/textures/item/wooden_gear.png index 87a5f65e1..88298b505 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/item/wooden_gear.png and b/src/main/resources/assets/appliedenergistics2/textures/item/wooden_gear.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/models/skyblockchest.png b/src/main/resources/assets/appliedenergistics2/textures/models/skyblockchest.png index 1bc65a687..ab80b267e 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/models/skyblockchest.png and b/src/main/resources/assets/appliedenergistics2/textures/models/skyblockchest.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/models/skychest.png b/src/main/resources/assets/appliedenergistics2/textures/models/skychest.png index 50253b6eb..f303c01a1 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/models/skychest.png and b/src/main/resources/assets/appliedenergistics2/textures/models/skychest.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/annihilation_plane.png b/src/main/resources/assets/appliedenergistics2/textures/part/annihilation_plane.png index 9cf484a87..7b9cda6b3 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/annihilation_plane.png and b/src/main/resources/assets/appliedenergistics2/textures/part/annihilation_plane.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/annihilation_plane_on.png b/src/main/resources/assets/appliedenergistics2/textures/part/annihilation_plane_on.png index 7545ea329..05374b266 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/annihilation_plane_on.png and b/src/main/resources/assets/appliedenergistics2/textures/part/annihilation_plane_on.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/debug.log b/src/main/resources/assets/appliedenergistics2/textures/part/debug.log new file mode 100644 index 000000000..ed5a2217c --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/part/debug.log @@ -0,0 +1 @@ +[0916/135126.313:INFO:CONSOLE(1)] "Long rAF frame-time", source: file:///C:/Program%20Files/Adobe/Adobe%20Photoshop%202020/Required/www-rich-tooltips/build/external.js (1) diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/export_bus.png b/src/main/resources/assets/appliedenergistics2/textures/part/export_bus.png index dccd04a41..0c2524e67 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/export_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/part/export_bus.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/export_bus_sides.png b/src/main/resources/assets/appliedenergistics2/textures/part/export_bus_sides.png index 8b1f6f9f3..9a9cfad4c 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/export_bus_sides.png and b/src/main/resources/assets/appliedenergistics2/textures/part/export_bus_sides.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_annihilation_plane.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_annihilation_plane.png index 4ff8fcb57..226356921 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_annihilation_plane.png and b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_annihilation_plane.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_annihilation_plane_on.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_annihilation_plane_on.png index 78ca85251..ff1df2c26 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_annihilation_plane_on.png and b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_annihilation_plane_on.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_export_bus.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_export_bus.png index fa8afa503..4601fb777 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_export_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_export_bus.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_formation_plane.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_formation_plane.png index 98bbcf432..1bdfdc5ae 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_formation_plane.png and b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_formation_plane.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_formation_plane_on.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_formation_plane_on.png index 9d40533a2..feeff140f 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_formation_plane_on.png and b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_formation_plane_on.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_import_bus.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_import_bus.png index f39d2415d..dc77f6d01 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_import_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_import_bus.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_interface.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_interface.png index 2529a9b7e..08dc3602c 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_interface.png and b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_interface.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_storage_bus.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_storage_bus.png index bd13196d8..20d0b13e0 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_storage_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_storage_bus.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/formation_plane.png b/src/main/resources/assets/appliedenergistics2/textures/part/formation_plane.png index 35a66ca66..a503241a5 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/formation_plane.png and b/src/main/resources/assets/appliedenergistics2/textures/part/formation_plane.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/formation_plane_on.png b/src/main/resources/assets/appliedenergistics2/textures/part/formation_plane_on.png index 631f561fd..bc8779b86 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/formation_plane_on.png and b/src/main/resources/assets/appliedenergistics2/textures/part/formation_plane_on.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/identity_annihilation_plane.png b/src/main/resources/assets/appliedenergistics2/textures/part/identity_annihilation_plane.png index 5d5fbee48..8057a0e65 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/identity_annihilation_plane.png and b/src/main/resources/assets/appliedenergistics2/textures/part/identity_annihilation_plane.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/identity_annihilation_plane_on.png b/src/main/resources/assets/appliedenergistics2/textures/part/identity_annihilation_plane_on.png index e21fef78a..27ce5e9e5 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/identity_annihilation_plane_on.png and b/src/main/resources/assets/appliedenergistics2/textures/part/identity_annihilation_plane_on.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/import_bus.png b/src/main/resources/assets/appliedenergistics2/textures/part/import_bus.png index f0efb7c6a..a4bf1401a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/import_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/part/import_bus.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/import_bus_sides.png b/src/main/resources/assets/appliedenergistics2/textures/part/import_bus_sides.png index 8b1f6f9f3..e8934b4b5 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/import_bus_sides.png and b/src/main/resources/assets/appliedenergistics2/textures/part/import_bus_sides.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/interface.png b/src/main/resources/assets/appliedenergistics2/textures/part/interface.png index dccd04a41..ab23bac9b 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/interface.png and b/src/main/resources/assets/appliedenergistics2/textures/part/interface.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/monitor_back.png b/src/main/resources/assets/appliedenergistics2/textures/part/monitor_back.png index f225dcf4b..77b9633bf 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/monitor_back.png and b/src/main/resources/assets/appliedenergistics2/textures/part/monitor_back.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/monitor_front.png b/src/main/resources/assets/appliedenergistics2/textures/part/monitor_front.png index c5c2a4c1e..1bac9e1f6 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/monitor_front.png and b/src/main/resources/assets/appliedenergistics2/textures/part/monitor_front.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/monitor_sides.png b/src/main/resources/assets/appliedenergistics2/textures/part/monitor_sides.png index 8b1f6f9f3..61e123ba4 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/monitor_sides.png and b/src/main/resources/assets/appliedenergistics2/textures/part/monitor_sides.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_back.png b/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_back.png index 51430e6aa..4a8eadc9e 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_back.png and b/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_back.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_back2.png b/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_back2.png index ceffe1de6..cab2ccfe0 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_back2.png and b/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_back2.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_front.png b/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_front.png index 08c32b198..768eefd15 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_front.png and b/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_front.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_sides.png b/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_sides.png index 8b1f6f9f3..4ec8dc3df 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_sides.png and b/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_sides.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/plane_sides.png b/src/main/resources/assets/appliedenergistics2/textures/part/plane_sides.png index 8b1f6f9f3..8a9bd53d1 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/plane_sides.png and b/src/main/resources/assets/appliedenergistics2/textures/part/plane_sides.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/storage_bus.png b/src/main/resources/assets/appliedenergistics2/textures/part/storage_bus.png index efa98de88..cb32913ae 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/storage_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/part/storage_bus.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/storage_bus_back.png b/src/main/resources/assets/appliedenergistics2/textures/part/storage_bus_back.png index f225dcf4b..c0b8eb9ea 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/storage_bus_back.png and b/src/main/resources/assets/appliedenergistics2/textures/part/storage_bus_back.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/storage_bus_sides.png b/src/main/resources/assets/appliedenergistics2/textures/part/storage_bus_sides.png index 8b1f6f9f3..280fc8bcf 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/storage_bus_sides.png and b/src/main/resources/assets/appliedenergistics2/textures/part/storage_bus_sides.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/transition_plane_back.png b/src/main/resources/assets/appliedenergistics2/textures/part/transition_plane_back.png index d0b4e2a82..98d56ff7c 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/transition_plane_back.png and b/src/main/resources/assets/appliedenergistics2/textures/part/transition_plane_back.png differ