From 1d0f1cb264a53473bc1fc8d9dcfaf90f8f706d6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Tue, 6 Oct 2015 20:32:31 +0200 Subject: [PATCH] Now with 120% less derp! That's how math works, right? --- .../opencomputers/bcbuilder/blocks/adapter.json | 8 +++++--- .../opencomputers/bcbuilder/blocks/assembler.json | 8 +++++--- .../opencomputers/bcbuilder/blocks/case.json | 12 +++++++----- .../opencomputers/bcbuilder/blocks/charger.json | 12 +++++++----- .../bcbuilder/blocks/disassembler.json | 8 +++++--- .../opencomputers/bcbuilder/blocks/diskDrive.json | 8 +++++--- .../opencomputers/bcbuilder/blocks/hologram.json | 8 +++++--- .../bcbuilder/blocks/microcontroller.json | 14 ++++++++------ .../bcbuilder/blocks/netSplitter.json | 8 +++++--- .../bcbuilder/blocks/powerConverter.json | 6 ++++-- .../opencomputers/bcbuilder/blocks/printer.json | 6 ++++-- .../opencomputers/bcbuilder/blocks/raid.json | 8 +++++--- .../opencomputers/bcbuilder/blocks/relay.json | 8 +++++--- .../opencomputers/bcbuilder/blocks/robot.json | 12 +++++++----- .../opencomputers/bcbuilder/blocks/screen.json | 10 ++++++---- .../opencomputers/bcbuilder/blocks/serverRack.json | 12 +++++++----- .../opencomputers/bcbuilder/blocks/waypoint.json | 8 +++++--- 17 files changed, 95 insertions(+), 61 deletions(-) diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/adapter.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/adapter.json index 356637f64..039cc6321 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/adapter.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/adapter.json @@ -1,7 +1,9 @@ [{ - "includes": ["traits/environment.json"], - "includes": ["traits/inventory.json"], - "includes": ["traits/powerAcceptor.json"], + "includes": [ + "traits/environment.json", + "traits/inventory.json", + "traits/powerAcceptor.json" + ], "nbt": { "blacklist": [ "oc:adapter.blocks" diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/assembler.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/assembler.json index 371e59352..9db233b83 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/assembler.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/assembler.json @@ -1,7 +1,9 @@ [{ - "includes": ["traits/environment.json"], - "includes": ["traits/inventory.json"], - "includes": ["traits/powerAcceptor.json"], + "includes": [ + "traits/environment.json", + "traits/inventory.json", + "traits/powerAcceptor.json" + ], "nbt": { "blacklist": [ "oc:remaining" diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/case.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/case.json index e09a365c5..d0a7fe6c5 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/case.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/case.json @@ -1,7 +1,9 @@ [{ - "includes": ["traits/computer.json"], - "includes": ["traits/inventory.json"], - "includes": ["traits/powerAcceptor.json"], - "includes": ["traits/redstone.json"], - "includes": ["traits/rotatable.json"] + "includes": [ + "traits/computer.json", + "traits/inventory.json", + "traits/powerAcceptor.json", + "traits/redstone.json", + "traits/rotatable.json" + ] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/charger.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/charger.json index 8368f3009..5c05e7269 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/charger.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/charger.json @@ -1,9 +1,11 @@ [{ - "includes": ["traits/environment.json"], - "includes": ["traits/inventory.json"], - "includes": ["traits/powerAcceptor.json"], - "includes": ["traits/redstone.json"], - "includes": ["traits/rotatable.json"], + "includes": [ + "traits/environment.json", + "traits/inventory.json", + "traits/powerAcceptor.json", + "traits/redstone.json", + "traits/rotatable.json" + ], "nbt": { "blacklist": [ "chargeSpeed", diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/disassembler.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/disassembler.json index 7fbfa7ea2..9ab51a0fc 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/disassembler.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/disassembler.json @@ -1,7 +1,9 @@ [{ - "includes": ["traits/environment.json"], - "includes": ["traits/inventory.json"], - "includes": ["traits/powerAcceptor.json"], + "includes": [ + "traits/environment.json", + "traits/inventory.json", + "traits/powerAcceptor.json" + ], "nbt": { "blacklist": [ "oc:buffer", diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/diskDrive.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/diskDrive.json index e92595abd..7a52c2ef3 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/diskDrive.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/diskDrive.json @@ -1,5 +1,7 @@ [{ - "includes": ["traits/environment.json"], - "includes": ["traits/inventory.json"], - "includes": ["traits/rotatable.json"] + "includes": [ + "traits/environment.json", + "traits/inventory.json", + "traits/rotatable.json" + ] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/hologram.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/hologram.json index 1f7a6c392..5e40db6c3 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/hologram.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/hologram.json @@ -1,5 +1,7 @@ [{ - "includes": ["traits/environment.json"], - "includes": ["traits/externalData.json"], - "includes": ["traits/rotatable.json"] + "includes": [ + "traits/environment.json", + "traits/externalData.json", + "traits/rotatable.json" + ] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/microcontroller.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/microcontroller.json index 1c8006734..de8fbc384 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/microcontroller.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/microcontroller.json @@ -1,10 +1,12 @@ [{ - "includes": ["traits/computer.json"], - "includes": ["traits/hub.json"], - "includes": ["traits/inventory.json"], - "includes": ["traits/powerAcceptor.json"], - "includes": ["traits/redstone.json"], - "includes": ["traits/rotatable.json"], + "includes": [ + "traits/computer.json", + "traits/hub.json", + "traits/inventory.json", + "traits/powerAcceptor.json", + "traits/redstone.json", + "traits/rotatable.json" + ], "nbt": { "blacklist": [ "oc:info", diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/netSplitter.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/netSplitter.json index 3fb163c7b..556f25dc7 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/netSplitter.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/netSplitter.json @@ -1,5 +1,7 @@ [{ - "includes": ["traits/environment.json"], - "includes": ["traits/redstone.json"], - "includes": ["traits/rotatable.json"] + "includes": [ + "traits/environment.json", + "traits/redstone.json", + "traits/rotatable.json" + ] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/powerConverter.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/powerConverter.json index 5a0fba8d9..4b10cadc2 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/powerConverter.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/powerConverter.json @@ -1,4 +1,6 @@ [{ - "includes": ["traits/environment.json"], - "includes": ["traits/powerAcceptor.json"] + "includes": [ + "traits/environment.json", + "traits/powerAcceptor.json" + ] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/printer.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/printer.json index cbcd5dbdd..7c1dca481 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/printer.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/printer.json @@ -1,6 +1,8 @@ [{ - "includes": ["traits/environment.json"], - "includes": ["traits/inventory.json"], + "includes": [ + "traits/environment.json", + "traits/inventory.json" + ], "nbt": { "blacklist": [ "oc:active", diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/raid.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/raid.json index e92595abd..7a52c2ef3 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/raid.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/raid.json @@ -1,5 +1,7 @@ [{ - "includes": ["traits/environment.json"], - "includes": ["traits/inventory.json"], - "includes": ["traits/rotatable.json"] + "includes": [ + "traits/environment.json", + "traits/inventory.json", + "traits/rotatable.json" + ] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/relay.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/relay.json index 5c12c2094..885350961 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/relay.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/relay.json @@ -1,7 +1,9 @@ [{ - "includes": ["traits/hub.json"], - "includes": ["traits/inventory.json"], - "includes": ["traits/powerAcceptor.json"], + "includes": [ + "traits/hub.json", + "traits/inventory.json", + "traits/powerAcceptor.json" + ], "nbt": { "blacklist": [ "oc:componentNodes" diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/robot.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/robot.json index b3a3a2924..53641eb9c 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/robot.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/robot.json @@ -1,9 +1,11 @@ [{ - "includes": ["traits/computer.json"], - "includes": ["traits/environment.json"], - "includes": ["traits/inventory.json"], - "includes": ["traits/redstone.json"], - "includes": ["traits/rotatable.json"], + "includes": [ + "traits/computer.json", + "traits/environment.json", + "traits/inventory.json", + "traits/redstone.json", + "traits/rotatable.json" + ], "nbt": { "blacklist": [ "display", diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/screen.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/screen.json index 793fdf7fa..369d34273 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/screen.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/screen.json @@ -1,8 +1,10 @@ [{ - "includes": ["traits/environment.json"], - "includes": ["traits/externalData.json"], - "includes": ["traits/redstone.json"], - "includes": ["traits/rotatable.json"], + "includes": [ + "traits/environment.json", + "traits/externalData.json", + "traits/redstone.json", + "traits/rotatable.json" + ], "nbt": { "blacklist": [ "oc:hasPower", diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/serverRack.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/serverRack.json index bbf6196e6..06dc5c669 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/serverRack.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/serverRack.json @@ -1,9 +1,11 @@ [{ - "includes": ["traits/hub.json"], - "includes": ["traits/inventory.json"], - "includes": ["traits/powerAcceptor.json"], - "includes": ["traits/redstone.json"], - "includes": ["traits/rotatable.json"], + "includes": [ + "traits/hub.json", + "traits/inventory.json", + "traits/powerAcceptor.json", + "traits/redstone.json", + "traits/rotatable.json" + ], "nbt": { "blacklist": [ "oc:servers", diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/waypoint.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/waypoint.json index 3fb163c7b..556f25dc7 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/waypoint.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/waypoint.json @@ -1,5 +1,7 @@ [{ - "includes": ["traits/environment.json"], - "includes": ["traits/redstone.json"], - "includes": ["traits/rotatable.json"] + "includes": [ + "traits/environment.json", + "traits/redstone.json", + "traits/rotatable.json" + ] }] \ No newline at end of file