From 65426282281e405638c6ae62eb107cbf3f8216f5 Mon Sep 17 00:00:00 2001 From: Ridanis Date: Thu, 4 Apr 2024 09:08:52 +0200 Subject: [PATCH] Retextures 2.1 --- .../models/block/atomic_reconstructor.json | 5 +++-- .../models/block/bio_reactor.json | 3 ++- .../actuallyadditions/models/block/farmer.json | 6 +++--- .../models/block/laser_relay.json | 3 ++- .../models/block/laser_relay_advanced.json | 3 ++- .../models/block/laser_relay_extreme.json | 3 ++- .../models/block/laser_relay_fluids.json | 3 ++- .../models/block/laser_relay_item.json | 3 ++- .../models/block/laser_relay_item_advanced.json | 3 ++- .../models/block/leaf_generator.json | 3 ++- .../textures/block/farmer_side.png | Bin 381 -> 0 bytes .../textures/block/lamp_black_on.png | Bin 265 -> 370 bytes .../textures/block/lamp_blue_on.png | Bin 301 -> 378 bytes .../textures/block/lamp_brown_on.png | Bin 298 -> 390 bytes .../textures/block/lamp_cyan_on.png | Bin 306 -> 378 bytes .../textures/block/lamp_gray_on.png | Bin 289 -> 372 bytes .../textures/block/lamp_green_on.png | Bin 301 -> 379 bytes .../textures/block/lamp_light_blue_on.png | Bin 277 -> 345 bytes .../textures/block/lamp_light_gray_on.png | Bin 286 -> 361 bytes .../textures/block/lamp_lime_on.png | Bin 305 -> 380 bytes .../textures/block/lamp_magenta_on.png | Bin 309 -> 371 bytes .../textures/block/lamp_orange_on.png | Bin 304 -> 381 bytes .../textures/block/lamp_pink_on.png | Bin 296 -> 374 bytes .../textures/block/lamp_purple_on.png | Bin 307 -> 383 bytes .../textures/block/lamp_red_on.png | Bin 308 -> 381 bytes .../textures/block/lamp_white_on.png | Bin 288 -> 361 bytes .../textures/block/lamp_yellow_on.png | Bin 293 -> 366 bytes .../textures/block/phantomface_breaker.png | Bin 454 -> 483 bytes .../textures/block/phantomface_placer.png | Bin 453 -> 490 bytes .../textures/block/{ => unused}/lamp_black.png | Bin .../textures/block/{ => unused}/lamp_blue.png | Bin .../textures/block/{ => unused}/lamp_brown.png | Bin .../textures/block/{ => unused}/lamp_cyan.png | Bin .../textures/block/{ => unused}/lamp_gray.png | Bin .../textures/block/{ => unused}/lamp_green.png | Bin .../block/{ => unused}/lamp_light_blue.png | Bin .../block/{ => unused}/lamp_light_gray.png | Bin .../textures/block/{ => unused}/lamp_lime.png | Bin .../block/{ => unused}/lamp_magenta.png | Bin .../textures/block/{ => unused}/lamp_orange.png | Bin .../textures/block/{ => unused}/lamp_pink.png | Bin .../textures/block/{ => unused}/lamp_purple.png | Bin .../textures/block/{ => unused}/lamp_red.png | Bin .../textures/block/{ => unused}/lamp_white.png | Bin .../textures/block/{ => unused}/lamp_yellow.png | Bin 45 files changed, 22 insertions(+), 13 deletions(-) delete mode 100644 src/main/resources/assets/actuallyadditions/textures/block/farmer_side.png rename src/main/resources/assets/actuallyadditions/textures/block/{ => unused}/lamp_black.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{ => unused}/lamp_blue.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{ => unused}/lamp_brown.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{ => unused}/lamp_cyan.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{ => unused}/lamp_gray.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{ => unused}/lamp_green.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{ => unused}/lamp_light_blue.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{ => unused}/lamp_light_gray.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{ => unused}/lamp_lime.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{ => unused}/lamp_magenta.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{ => unused}/lamp_orange.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{ => unused}/lamp_pink.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{ => unused}/lamp_purple.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{ => unused}/lamp_red.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{ => unused}/lamp_white.png (100%) rename src/main/resources/assets/actuallyadditions/textures/block/{ => unused}/lamp_yellow.png (100%) diff --git a/src/main/resources/assets/actuallyadditions/models/block/atomic_reconstructor.json b/src/main/resources/assets/actuallyadditions/models/block/atomic_reconstructor.json index 448334a7f..14b793bf6 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/atomic_reconstructor.json +++ b/src/main/resources/assets/actuallyadditions/models/block/atomic_reconstructor.json @@ -1,6 +1,7 @@ { "credit": "Made with Blockbench", "textures": { + "3": "actuallyadditions:block/base_texture_arrow", "base": "actuallyadditions:block/base_texture", "particle": "actuallyadditions:block/atomic_reconstructor_front", "front": "actuallyadditions:block/atomic_reconstructor_front", @@ -141,7 +142,7 @@ "faces": { "north": {"uv": [1, 1, 15, 15], "texture": "#base"}, "east": {"uv": [1, 1, 15, 2], "rotation": 270, "texture": "#base"}, - "south": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "south": {"uv": [1, 1, 15, 15], "texture": "#3"}, "west": {"uv": [1, 1, 15, 2], "rotation": 90, "texture": "#base"}, "up": {"uv": [1, 1, 15, 2], "texture": "#base"}, "down": {"uv": [1, 1, 15, 2], "texture": "#base"} @@ -151,7 +152,7 @@ "from": [1, 1, 1], "to": [15, 15, 2], "faces": { - "north": {"uv": [1, 1, 15, 15], "texture": "#base"}, + "north": {"uv": [1, 1, 15, 15], "texture": "#3"}, "east": {"uv": [1, 14, 15, 15], "rotation": 270, "texture": "#base"}, "south": {"uv": [1, 1, 15, 15], "texture": "#base"}, "west": {"uv": [1, 14, 15, 15], "rotation": 90, "texture": "#base"}, diff --git a/src/main/resources/assets/actuallyadditions/models/block/bio_reactor.json b/src/main/resources/assets/actuallyadditions/models/block/bio_reactor.json index 8897ec856..68f6f455d 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/bio_reactor.json +++ b/src/main/resources/assets/actuallyadditions/models/block/bio_reactor.json @@ -3,6 +3,7 @@ "textures": { "3": "actuallyadditions:block/base_texture_small", "4": "actuallyadditions:block/bioreactor_top_animation", + "5": "actuallyadditions:block/base_texture_vent", "base": "actuallyadditions:block/base_texture", "particle": "actuallyadditions:block/bioreactor_side", "side": "actuallyadditions:block/bioreactor_side", @@ -232,7 +233,7 @@ "faces": { "north": {"uv": [0, 0, 14, 15], "texture": "#base"}, "east": {"uv": [1, 1, 2, 16], "texture": "#base"}, - "south": {"uv": [1, 1, 15, 16], "texture": "#base"}, + "south": {"uv": [1, 1, 15, 16], "texture": "#5"}, "west": {"uv": [14, 1, 15, 16], "texture": "#base"}, "up": {"uv": [1, 14, 15, 15], "texture": "#base"}, "down": {"uv": [1, 14, 15, 15], "texture": "#base", "cullface": "down"} diff --git a/src/main/resources/assets/actuallyadditions/models/block/farmer.json b/src/main/resources/assets/actuallyadditions/models/block/farmer.json index a638d5fbb..3f3c4b4da 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/farmer.json +++ b/src/main/resources/assets/actuallyadditions/models/block/farmer.json @@ -5,9 +5,9 @@ "5": "actuallyadditions:block/farmer_top_animation", "7": "actuallyadditions:block/farmer_front_animation", "8": "actuallyadditions:block/base_texture_back", + "particle": "actuallyadditions:block/base_texture_small", "base": "actuallyadditions:block/base_texture", - "side": "actuallyadditions:block/farmer_side", - "particle": "actuallyadditions:block/base_texture_small" + "side": "actuallyadditions:block/base_texture_vent" }, "elements": [ { @@ -223,7 +223,7 @@ "to": [2, 15, 14], "faces": { "east": {"uv": [0, 0, 12, 15], "texture": "#missing"}, - "west": {"uv": [2, 1, 14, 16], "texture": "#side"}, + "west": {"uv": [2, 1, 14, 16], "texture": "#base"}, "up": {"uv": [1, 2, 2, 14], "texture": "#base"}, "down": {"uv": [14, 2, 15, 14], "texture": "#base", "cullface": "down"} } diff --git a/src/main/resources/assets/actuallyadditions/models/block/laser_relay.json b/src/main/resources/assets/actuallyadditions/models/block/laser_relay.json index c2c8eef9d..0430aa331 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/laser_relay.json +++ b/src/main/resources/assets/actuallyadditions/models/block/laser_relay.json @@ -337,7 +337,8 @@ }, "gui": { "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] + "translation": [0, 1.75, 0], + "scale": [0.8, 0.8, 0.8] }, "fixed": { "scale": [0.5, 0.5, 0.5] diff --git a/src/main/resources/assets/actuallyadditions/models/block/laser_relay_advanced.json b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_advanced.json index afc4b2497..68d9735fb 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/laser_relay_advanced.json +++ b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_advanced.json @@ -337,7 +337,8 @@ }, "gui": { "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] + "translation": [0, 1.75, 0], + "scale": [0.8, 0.8, 0.8] }, "fixed": { "scale": [0.5, 0.5, 0.5] diff --git a/src/main/resources/assets/actuallyadditions/models/block/laser_relay_extreme.json b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_extreme.json index 397aa7849..e450a22bd 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/laser_relay_extreme.json +++ b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_extreme.json @@ -337,7 +337,8 @@ }, "gui": { "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] + "translation": [0, 1.75, 0], + "scale": [0.8, 0.8, 0.8] }, "fixed": { "scale": [0.5, 0.5, 0.5] diff --git a/src/main/resources/assets/actuallyadditions/models/block/laser_relay_fluids.json b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_fluids.json index 955012da4..965e0625f 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/laser_relay_fluids.json +++ b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_fluids.json @@ -337,7 +337,8 @@ }, "gui": { "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] + "translation": [0, 1.75, 0], + "scale": [0.8, 0.8, 0.8] }, "fixed": { "scale": [0.5, 0.5, 0.5] diff --git a/src/main/resources/assets/actuallyadditions/models/block/laser_relay_item.json b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_item.json index f386964c1..27503bb74 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/laser_relay_item.json +++ b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_item.json @@ -337,7 +337,8 @@ }, "gui": { "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] + "translation": [0, 1.75, 0], + "scale": [0.8, 0.8, 0.8] }, "fixed": { "scale": [0.5, 0.5, 0.5] diff --git a/src/main/resources/assets/actuallyadditions/models/block/laser_relay_item_advanced.json b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_item_advanced.json index 79851cf54..48e980ae1 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/laser_relay_item_advanced.json +++ b/src/main/resources/assets/actuallyadditions/models/block/laser_relay_item_advanced.json @@ -337,7 +337,8 @@ }, "gui": { "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] + "translation": [0, 1.75, 0], + "scale": [0.8, 0.8, 0.8] }, "fixed": { "scale": [0.5, 0.5, 0.5] diff --git a/src/main/resources/assets/actuallyadditions/models/block/leaf_generator.json b/src/main/resources/assets/actuallyadditions/models/block/leaf_generator.json index ae63906b8..3b5a1800c 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/leaf_generator.json +++ b/src/main/resources/assets/actuallyadditions/models/block/leaf_generator.json @@ -3,6 +3,7 @@ "textures": { "3": "actuallyadditions:block/base_texture_large", "4": "actuallyadditions:block/leaf_gen_animated", + "5": "actuallyadditions:block/base_texture_vent", "base": "actuallyadditions:block/base_texture", "front": "actuallyadditions:block/base_texture_back", "particle": "actuallyadditions:block/leaf_gen_front", @@ -149,7 +150,7 @@ "from": [14, 0, 2], "to": [15, 15, 14], "faces": { - "east": {"uv": [2, 1, 14, 16], "texture": "#base"}, + "east": {"uv": [2, 1, 14, 16], "texture": "#5"}, "west": {"uv": [0, 0, 12, 15], "texture": "#base"}, "up": {"uv": [1, 2, 2, 14], "texture": "#base"}, "down": {"uv": [2, 1, 14, 2], "rotation": 270, "texture": "#base", "cullface": "down"} diff --git a/src/main/resources/assets/actuallyadditions/textures/block/farmer_side.png b/src/main/resources/assets/actuallyadditions/textures/block/farmer_side.png deleted file mode 100644 index 899336d3a1f820f57bceb5ab2d3b886a15d089ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 381 zcmV-@0fPRCP)Mr-d%2Qad-bi1J>Fm#TbLNHhMOZ0lYjv zMnS*bgm)Q^qnL7li_5FJ0KopiAzc_11(kEH_}AxZr$8|&OJ1KIqJuIVGdr6Dkmor7 ztL1WMA@zJTJ?&Hib$>)8vXp64MnwU@$NO7L!K5tl-iKt3TWf0ze!HP^4iV{8;JuHy zUKUySPr>x~1QCf;1Pgjl70l-6b>d$_ml~alF@{0fgH(37G2z;Sfm%ps-Iu6bEez7e zh)AdWv{1`JCp=Sz~{&NWRnmA06;{0_q&^0zrlDtA%6ro=a5n!38iTYYb~5} zQB3O&Z0u)lI3T42=Nteq3spvnIfh|43TcVn7%!l8ha^c> z4GST#$uchh_(0Y`MCgq{-LznJ)2eh;#0wNO(wrx@rHP zGT^-tQOraL0X!m#b&4pkxw`f>%g`GW>&2!2AL^vQcDIe5#_K)Y-ywutl?A2({{stI VeR6S2*%SZ(002ovPDHLkV1h%0m1h6| delta 217 zcmV;~04D$P0*L~UIDY`UNkl}H+C|GJY1*Rn ztw0`+2HD)!b-m*QW*f+9cR%9FA%yT&B#96LNWKiLtNCV7MBaPM^ZY3g03f9VRfU;? z^ew?iGk~foY2;WKq1Ot4`o=3rALp{cl?0{7oy~RxGegb-M^a9wJ1~|&{!bvkrQfLr zDW&12URw=Rb;zWwa=`)5k71^V&(cO~W+1t%=Pb>jnDoSGSQa8i10aZT>jPIFEyZ1e T{)j7h00000NkvXXu0mjfnC@b> diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_blue_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_blue_on.png index ec8a80fdf78d2dc5cbc209e8a29e9b6bcd7da37e..13fb48689d72f1a35fb5aa4d50a15709baad5d59 100644 GIT binary patch delta 331 zcmV-R0krS6oo&7i-2SmTr?S6N(bAOPY|dtAc7!> zK3YL=y(P7w$a5>8bw(J5 zorVLM(2FAA{|<~XodimiQmk{PYK}Km^G?IN@CLG9HLFScK%Fy?ee1w2WI0*2; zFje!-DTB>cDn#JT_JK?&Ra(_Us07Z}V*q+lM3LvVevk11Tx}8<-HfVCb$j=Bx40z_ dWS>I|{{z#ScW>z24K@G(002ovPDHLkV1llxl^g&7 delta 253 zcmVsWh!4?+aw<6ZVtoZc zq>GbJAT%Y4g*ud!)EgoAO$p~eKj)G}N~xAF7;{I;@!S6oo&N2;w3HO2JM>aN(kbu6+QhFCc;- z2!hWg2!f9xhznn!*dkq2oJ_kJNV6z~5_B3ctw>K65@cr^oSrmmn0BM$QoFAXxTYm>-dr{~kj`le@J*b3D zCoA-P?O;kJ1m!$+&49a0vm9d#QpR{y1$8RdD3#z95sIu$6-XIljA8k2NV_!C+5(hH zXti1_8#G6u&!G?&0AP%1^!GH&S!m60G{zf_#*Lc)%j@^LZZn;%b~co2`n|4oPz*%R z*R_!1Ar%^q#!!Dx8Em#R%lY`UkSO#?v)p~FW)0im@k%i^To1J^D(?(JaCs}wZ7O;t{KJyGl4Z^rkk@Q z_9I!$7t8%u21KK6swq?UtKI6(#VR<0;PnlFei)KxnTvKmb$e<7Ol~JmQ+d3{hkLBa d!+1cI;s0WBe3YO+whI6N002ovPDHLkV1lmhnUDYg delta 258 zcmV+d0sa2^0-IDY`-Nkl1t-i}Jxtqo7ULE?1b=t8BN8h1U?9 zE%rjTo+FJG(@Y>J$XG~1##ISn-zwq#;rmG{W6Zz{cz;G@I=VmNBOI=~?H_Wkh2DA^ zEq9Iek-Mxn093}9;kw(>Xra|JR?Ee!f&kbbPaJGVZ#|dw2748V95cXbxuDgvcvmTr zi&U$C*kcJ4K%We!D4?W*;8D+Zn}gnZobxD=X;BM}7V295p@JfJf*7zrp0Z7;HU=DQ zmlYD8azLf^=KwJI{TT_<)rJq14!isM9tS+aIZs^+&b{Bz4fC2>?!Rl2dH?_b07*qo IM6N<$f}@Fe-T(jq diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_gray_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_gray_on.png index 0429bbb70f45e6222455f5f6ec037856ce4dc035..c61546e713977918695ee3d34ee15571962a8372 100644 GIT binary patch delta 325 zcmV-L0lNO70`vlqIDY{qNkll04?+w^#URYg5c2v zq4y9MULcS{H$^5>2%UhFjhmv2A;VPCguKmsz5nCA$6UOBeExCW0%&uzANGpW X_*#FZORYwP00000NkvXXu0mjfsJEa! delta 241 zcmV}?C6(@1aLu8XavWr{sd5U&O z1Hq|IiD~^I1ivZa-g7uNKb6*c;tSqCka9iSFIk0!G3KqP8igG#s!;&g(Z*WWT>+@H z){`*?)hIUG4g1~xTOa`XThDMGu%o5xuCD|+Vj%W}G-6rEA!_XvK%B7zk;W-DC`k}B z;?v#cU`LB{9wFtrXavRSFGL6JHk8uYh5Ta@-jgW*18nS`ets1AqY1kkppSz~&& r;X|c|eLi3221}gt)V0Jp|1;4Ov$b1*(=tEi00000NkvXXu0mjfTVHOa diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_green_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_green_on.png index 9c558dc95cfe503c73c95eaa80be536736776410..849005d19a1d5b81b113d68515cb1b873d192ee4 100644 GIT binary patch delta 332 zcmV-S0ki(C0{a4xIDY{xNklGk$BD{xIsin{pc#&l3?FL3FNI)8}axbqz%{p1R<=i`*5Gz#7Nqa{Y|_-!*|+&PJ0GbFFu9x9Ox5)& e9F0Rx4g3%9R(DiGW_n=&0000D;e9Z8BhfOj-yml&?uP1};n+{vd*jAwL z(ScUL7>=8OO9fqy|7o{Y6g5g|d?5n27Sf0?6o06|E&ItJP+b!1Br|ppxaM~&k>M$K zc#Fld0jT!daiqE0{zDnVo*hnOfmf8$grPtw{j;J6kgrePtF_?o00000NkvXXu0mjf D!5w!^ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue_on.png index 094c04b6aa4bfaa2d76927b88ed9f111ead43424..b2a262089542dcbf35458e71822efd22f2c06702 100644 GIT binary patch delta 298 zcmV+_0oDGM0@(tPIDY{PNkl8|G0`Q2X?)fYK8IVnQU&c zY&d|m7LgcpKnTI(s8*P61R3XtU_@f9wFe=Eu&rw+pjr_{(Y$Vflhw)zfD2?6)H%qD z5|bC@yyjmpS(^0K{vRD4CrcCOpbdmwK&1Uh4f3MwzcS!9;cr8lTA18YC-C}s4!Cr; wb={pIECALQ>mzO^-`>sj6>Z2_nlKjl57A{?jTUV_IsgCw07*qoM6N<$g32n2e*gdg delta 229 zcmVO)Po(v+1GwDo^WgMohX*zJ+1GP27c8;X fp_Ig0_qCxXh)*`&b(XET00000NkvXXu0mjfp7e1A diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray_on.png index 662aa312fe387c8d5d4c7ddd3e21eff76f7b4722..cbf50c60ed322b0d521f7543f5a933608098f52a 100644 GIT binary patch delta 314 zcmV-A0mc5F0_g&fIDY{fNkl1w3y`rn5vumRvbQ7l=h#&}pE-i?H zcHKg>XdOtp$Z?Zl*P@uz;4 zngRD_27^)xAyT}#f+eOkQnq-bh0*I)JRwq)QvX6)qwhK^AZ1G&$D5kNAY_*$RscXL zwMoDXhQ8}4s~WGY>P^jm@rpci2d(vL!?dQzGdsZ;h*o-0Wc)}YWmW%vWw74NU}%~K zuwj|OxOEOE@H6=Q0>Caw=)2CXYxn^Bi@ozS9q;<;k}>2W&zKAR2kD-k*KsVimzG*H7 z1esN4Wok0hBGPZA+Effu!OBPO%DJ% z=iKVO$BYL1WwF-23Iu?NAhQsbz%)Ic32MZ^)|1nyW1)t!S7!m+j4h}#PP0Kvf~-;h z-E9qF3B;ICTK7#On9(o{`U44?)CHS?h*XQp-lxGVRVMi334jOlHnU#AgUdf&L}SpWb407*qoM6N<$f|r+aUH||9 diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_lime_on.png b/src/main/resources/assets/actuallyadditions/textures/block/lamp_lime_on.png index 804a20c2b3751d83b6bb9380fbc1f6b4c1256fc0..8fc151815501086d1f017388fe4f9724d73df162 100644 GIT binary patch delta 333 zcmV-T0kZzF0{jAyIDY{yNkl;SyIe{^Z|^8ECu1pqEz%GRRLwE##rhem&1ue5`vy?@ZPxH~l@nc;cf zpytrE82P>y08mN|5=b`{MV^x^me|Q+IjH$Rb{viC%Y3^&+0d+sqp@~i2C~|zUJGMQbtNX(Q6&L7U`y{zire4vuOdq$oDDooRRM{+dJ#S0hruP>P$_0(}#P^ fkmG1f+rWPTIPrbpR>16200000NkvXXu0mjfN#UY( delta 257 zcmV+c0sj8{0I0XYCi zfRg17bdg(78cSA0;jJ8;@FUA&DqC-6Jnz{ST5Hb}IM<<6G1!ms5f>5tj3#RpKS9*tAf)p{(a|~wyV` zbxusF60h&)+^}U9O^9M2fTn4XGQm4+7^2^!REcLTSg&L8q)cd<<|w2gDy@xxQYB#+ zjv5wzKrDn2029a@x6yTO5ePc~1@1~!no>Mn}dk7UV< z)&Exp<4vzySUsCs_yM|W-FXTp@U~e35DP)2wL6EH0xa$p&QpKAr^g3u$k{yQRN#M` Wm3;GW*ydIM0000C#Dc6 zaUS+cNL+vuAO@BW8CoT~?PT&0r3(`bZcIv(R(Xq^-~W4g|Fh3NKEHnGfl?YFB9zj5 zbs-|R_W_o#Z+#j^@%V6W1puBe($1zJt^g?Ic(4BQJ+}_p_J4x7VlP>(s<1X&8$P=2@zq8ISA<#%A&9WN@*sO z$slqNR|H{b1ptgO!~QPEltsZh%kkD(K8XAuUNW1yk9s3d652h07*qoM6N<$f~LQgCjbBd delta 256 zcmV+b0ssE}0_fc^1VDW;)aN_a6zos8E_p#pGtg?RaR7*6A%$2g zfOf_)h@Uvc-wehi2tDG}-KJnofpZ=q<#f~trK-qt`40(3bw{)Y^~EGN#oEr`d`~h7 zPdSh+m#YTg>vP=`##b9YRD9Um!?kZP#5qr%OPuq+CVBu>e_K!E=^f1g0000xsIDY{sNkl16ofwssWWa=7_IgI7N|*+6F3(zfj}S- za+6#n1OhJ8y9_CE0fBUY)e0ACj0=MWPO;V^$v;BVJiX=3?3-CRKfixRu0W{*DI=6B zI_FYG_S*ya{90YpxQW-7XCnacA(oe?!rIi*>m0x7Z?i#Xy??OgASO7o>ABDy95-8h zy|ZFU6}W9bSIH+hvndBL0idcXq>OO;14C%fC{^HE3ys&2aHWi>s_HDHA(UDh0i_Cp zAQ*RTSQ83i1i%C`?s|_>Ytk&oO|yI)xd%6i=e9X+wu6NBOcKw{22CKo-rW?jKhgNQ&P&)Vmfw(vXu4a%M0)=J@cDT`+R3m%T%=4- z?uBrx{~^H3>sy<~MV=lXv;e^P=caMUGb{j-B0stRzIxXV>VNh;!(u+2;ExUsQe)!% zfc17)iAkAa*7LM4Yy8oH`E&w+QVJnl%=3XR>N8TNm}P`AYhO$uT$ED(O6p>hWm-VW zl-X?7YuPg_Y{$_8pbP0kQsiv1jO8lET(06?%jcM3;8%xuKj>Vj&xC=m9h8Nvx4VlX zZu*ouP$00g8i!MYO0xYf)qOGJ7uu2l0000uf{bjjY$u3Y1w4YSovrtZbMF{=5bt(^_|%#eu3Un9GClM7{+A;C8iK?0~vy*?gbZC`ZJI0mc(yE)RcK zArXtPRsp`p6e#EqC&?fsfzzl@yNyBJv>0PiBBP`hsAs=0ENEl9*vm2JR1Xm{>Nt}Y0z~5i1Xv1$@I=7D90Og9e-}FF7a>sCq@rIwn$iR zc7>UgDV=hkIeRuP&|=17_1+6uO7Tew1mXsu61I)_XtV<2UU=XtHf zgRX-g1jYbBYu(Bq&i791k9C!-ht4ok{=8v_miSiIo{Ls g5j*mDG^A?qUvd9_(vyeE5C8xG07*qoM6N<$f-)tSW&i*H delta 260 zcmV+f0sH>_0<;2k0kLHKc^4Pp{ljri?uLuk4ltqnrTG-`yZ%*itO4+)~w9?sxgAA?1HuQNCu z+8`7Alr2e7tOkJhhsRN)f3@~Q`G@`X`7t(_qO~E*BwCw46MX@hnq3wN`r5z%0000< KMNUMnLSTZ57Hn_5Jh90$MjHm7sNVwy#v; zzjpwqkIyBIs~nyl2LXWN^I^6~N(q3q_H6&{{WLfj+mlif1b+cx7*2$uD5C2+`o8yK zS~rOCJWI`vFboNTz&lbZL0lHBF|N_NLAVjztXmOEC0J`GA+6CGGYDwiY(8B|NfgI} z08FoF4Qnl}F%)HmD9UP6^CcqBQvcI+-D<P`EAvub&`hUuRzm2-C zfgvnwtzYNx0y8hiR{)|orZvW|YwQ5_w|hU+*xtka9WLZNOPLG&51W8};FH1iasU7T M07*qoM6N<$g71}&-T(jq delta 240 zcmV3@N5QV>$z@aQyOnapBmt2!>xqoRF?uShw zh>~hkxww~H5Xq~QH}COgMwbx6&I{D~g|(N{{TXlV5M%s7iU_KThyb9f2e)l^0G1HK z9%DpAaL(bqe-#LTloF*BRF!SJV;V6c2JqhFoICEOCq~iN8foC@aRvs?!JEoNN@-Zs*B%C?lp&M$lpB`o^?e6;JU&l_{c78X q>W6*1eVh%Rk#l8TEjiae6MX|me^}m_m@4D|0000&I^wrE-orV+=lu7ceSCiXFoKi?LWD?Jbn-%k z=Gz8%eS06%ILX8PofZIidHNo%@_ZeuvXg$?T<8fp<9R-;0)GyRWnV~~`BE;$yOwg{8vcNJcG`r5k5+bCo>z+wdluBs~{d RflB}Y002ovPDHLkV1is2l5hY3 delta 245 zcmV_i`Ueq?BqH!I(Qj%m(&5lkRdkZa)>$464$eVDBxf`~*Ox zlxi-=Eu~1=IabvAO*JA)yz!^@M zKu85`PW)}RUQ{Jo8)6}5VJ)N?Qi?xR5SIO-7kE&3C%Lh`z+Bf}BK=ctiI&TC18_a> vhLP@SyAS0Id$BnT1>VuxAf-TS^RuESw^T~rri{?s00000NkvXXu0mjfU$JZP diff --git a/src/main/resources/assets/actuallyadditions/textures/block/phantomface_breaker.png b/src/main/resources/assets/actuallyadditions/textures/block/phantomface_breaker.png index 291574836200cc15a9ff23fe4e6f595ae1020d48..ebe16b1b31deb20197974304172520e572661841 100644 GIT binary patch delta 436 zcmV;l0ZabI1LFgbIe(Q&L_t(IjeV0ZOv6AFhrcZoG%IDv8(9#T3ETu&LNEvnL1Rcj z;P{h}fFoc?2nGVd5DWs3!7l`hnXB9cTi7LQ*QN+a5#w%c2mH+4y}S4Beed1nHnz57 z5>iSfmxu^TsnnQM0pR7io-#(EZ{}9fN!j!oV18k75CGtKcYob%l*Fc|0!m^7&{F|f z9beuLGtioScp5nf&}en2O;>2NIskkgZVVB!%pd1Fyfxd5JC?Cc0bRiMBZ7mg6jDJK zMW_4LY_oTCW1OSVH{5p@`)C-e=%ADuAVi^0PX#nu9qgY2kCWv=`X67^Cd;h8cL8v{ zm^rb{1$m875`UZ8bcJ!pGU+ARqtK`CN6bv*QV4k+NoUaaBdnrh3f5?KaJ|@IxL$0! zA|m9oHAqI+4q02O1{$HKf>clUzrw+-W24T=fX1gJHm_dHqGR!JdqUrjMx3$|kzpG( zSAFe_nTZ^(7n|`fnKo)wPd801sw&_UsFHr#$!9Gh!z}=Zr`M)9S`^|CD6_0000n1 zi9!cAsf)9MxQL5`yB|Ts*&%~a1fdz)QV)_eAugp3<^Ih@` z&Ev8IgZ5?%0Jl-c^JC#X-w__*^U+!_EaX{2q*G}X;JMWVAo!WlX*D^Rd`rz7W?3+#=R49~5RU1z zHweNpd6qCua(}BcfQlhZ($gfzsrdxqSVa2qTx?8}T)tIGQ7LCoR0rtCbBi-JB?Duj zoI!V%Elypx1&s~4g>o>S@9=bgY56U}^PT@KL^@@fGFCn3UuMv`5D*U82~hw5002ovPDHLkV1lQ> Bz*hhO diff --git a/src/main/resources/assets/actuallyadditions/textures/block/phantomface_placer.png b/src/main/resources/assets/actuallyadditions/textures/block/phantomface_placer.png index 34ce28a634e6c2646b1a4f0db681f3ec897ad15f..e4f1988d5a1aac371d34436c424f0d26f0d8c6d0 100644 GIT binary patch delta 443 zcmV;s0Yv`A1L^~iIe(loMY%F{M z(Z)^`EbK%ZD?tUZ5gS2U3!gyL!UquCMxx8A1O{S~B~{R3oyo<;znRR*oWuW}In%eg zw*E~T@N9;C~2{kwy#4HnhDgd)x^KgP7WQe-5FfDk%qH5Mxwr?WXP4@tTRo@S2If z6(IzrVh^&_RYEbA>w!Y>Wdv4wU|{VAqiQqQBRN}8&w(RMyk>$mVQ_V}M;OF^l8O>S zq}QmpW}Y9ZjrZfdC*AcIp_lYEDqU8_y1fX&uSDPil{EZlXUAFykrvqAKhe!8a{i|> l!2H6ZwxphIFWz3y`3Fzi!%zZCTHXKv002ovPDHLkV1g!J(AfY0 delta 406 zcmV;H0crl~1H}W7Ie&LaL_t(Ijdhc;OT$1I#ebF}ge2F%(MbZ;e?!E@!NtLUKyYyr z1qU~&i?f2bh>L@(gMWdDv!fJ5OG{~~9HePVrlLc+ugPiOa(C~`z5Cv~+|vHR;SU8E zV~R_())-?-V-Zz=*O%uKnNL!gd%h}hb`7w;u{jd}XddlJA%D^ViOGm`06=0gTr{ul z=N(wYt91Z^s79zp!iUNe9^n1$LuwV*a}d?&cLsk>1n74LWXY&xscJ*9?e;qZj?Zpn zQ$9(>_ub`*@Sd+Q#>_0_la$0{(kejkxCX$e9aC>~$#y@bW)CY_uwVAz_LIBQcfuom15 zmJgord_~O>v^L}x++afG@o;-y@>@ixy#FmECS#oD^0T;`>{zVJHCoJ+2Zgy?gYMV2 za9ZoR!0E-cgkw?kz6e!-t?eCY$v#^bi=Oi@*(bGb>JRsJ?f?J)07*qoM6N<$g3N%* AJpcdz diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_black.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_black.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_black.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_black.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_blue.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_blue.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_blue.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_blue.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_brown.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_brown.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_brown.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_brown.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_cyan.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_cyan.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_cyan.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_cyan.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_gray.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_gray.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_gray.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_gray.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_green.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_green.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_green.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_green.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_light_blue.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_light_blue.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_light_blue.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_light_gray.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_light_gray.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_light_gray.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_lime.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_lime.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_lime.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_lime.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_magenta.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_magenta.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_magenta.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_magenta.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_orange.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_orange.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_orange.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_orange.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_pink.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_pink.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_pink.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_pink.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_purple.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_purple.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_purple.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_purple.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_red.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_red.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_red.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_red.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_white.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_white.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_white.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_white.png diff --git a/src/main/resources/assets/actuallyadditions/textures/block/lamp_yellow.png b/src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_yellow.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/block/lamp_yellow.png rename to src/main/resources/assets/actuallyadditions/textures/block/unused/lamp_yellow.png