From a27f0136606b9bbd78065f342878086a62be40a3 Mon Sep 17 00:00:00 2001 From: Dries007 Date: Sun, 12 Mar 2017 21:55:58 +0100 Subject: [PATCH] Same texture updates fixes for 1.11.2 (#9) --- .../resources/assets/lumberjack/lang/en_US.lang | 9 ++++++--- .../models/item/adamantium_lumberaxe.json | 1 + ...ium_lumberaxe.json => aluminum_lumberaxe.json} | 2 +- ...unium_lumberaxe.json => lumium_lumberaxe.json} | 2 +- ...um_lumberaxe.json => plutonium_lumberaxe.json} | 2 +- .../lumberjack/models/item/xpiron_lumberaxe.json | 1 + ...ium_lumberaxe.png => adamantium_lumberaxe.png} | Bin .../textures/items/aluminum_lumberaxe.png | Bin 0 -> 319 bytes .../textures/items/arkenium_lumberaxe.png | Bin 326 -> 0 bytes ...{lunium_lumberaxe.png => lumium_lumberaxe.png} | Bin .../textures/items/plutonium_lumberaxe.png | Bin 0 -> 316 bytes .../textures/items/xpiron_lumberaxe.png | Bin 0 -> 324 bytes 12 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/lumberjack/models/item/adamantium_lumberaxe.json rename src/main/resources/assets/lumberjack/models/item/{arkenium_lumberaxe.json => aluminum_lumberaxe.json} (71%) rename src/main/resources/assets/lumberjack/models/item/{lunium_lumberaxe.json => lumium_lumberaxe.json} (72%) rename src/main/resources/assets/lumberjack/models/item/{admantium_lumberaxe.json => plutonium_lumberaxe.json} (70%) create mode 100644 src/main/resources/assets/lumberjack/models/item/xpiron_lumberaxe.json rename src/main/resources/assets/lumberjack/textures/items/{admantium_lumberaxe.png => adamantium_lumberaxe.png} (100%) create mode 100644 src/main/resources/assets/lumberjack/textures/items/aluminum_lumberaxe.png delete mode 100644 src/main/resources/assets/lumberjack/textures/items/arkenium_lumberaxe.png rename src/main/resources/assets/lumberjack/textures/items/{lunium_lumberaxe.png => lumium_lumberaxe.png} (100%) create mode 100644 src/main/resources/assets/lumberjack/textures/items/plutonium_lumberaxe.png create mode 100644 src/main/resources/assets/lumberjack/textures/items/xpiron_lumberaxe.png diff --git a/src/main/resources/assets/lumberjack/lang/en_US.lang b/src/main/resources/assets/lumberjack/lang/en_US.lang index 9ca9823..21387d5 100644 --- a/src/main/resources/assets/lumberjack/lang/en_US.lang +++ b/src/main/resources/assets/lumberjack/lang/en_US.lang @@ -2,13 +2,13 @@ d3.lumberjack.config.lumberjack=Lumberjack d3.lumberjack.config.lumberjack.tooltip=Settings for Lumberjack item.lumberaxeAdamantine.name=Adamantine Lumberaxe -item.lumberaxeAdmantium.name=Admantium Lumberaxe +item.lumberaxeAdamantium.name=Adamantium Lumberaxe item.lumberaxeAdmin.name=Admin Lumberaxe item.lumberaxeAether.name=Aether Lumberaxe item.lumberaxeAluminium.name=Aluminium Lumberaxe item.lumberaxeAluminumbrass.name=Aluminumbrass Lumberaxe +item.lumberaxeAluminum.name=Aluminum Lumberaxe item.lumberaxeAquarium.name=Aquarium Lumberaxe -item.lumberaxeArkenium.name=Arkenium Lumberaxe item.lumberaxeBrass.name=Brass Lumberaxe item.lumberaxeBronze.name=Bronze Lumberaxe item.lumberaxeCadmium.name=Cadmium Lumberaxe @@ -46,7 +46,7 @@ item.lumberaxeKinnoium.name=Kinnoium Lumberaxe item.lumberaxeLapis.name=Lapis Lumberaxe item.lumberaxeLead.name=Lead Lumberaxe item.lumberaxeLenthurium.name=Lenthurium Lumberaxe -item.lumberaxeLunium.name=Lunium Lumberaxe +item.lumberaxeLumium.name=Lumium Lumberaxe item.lumberaxeMagnesium.name=Magnesium Lumberaxe item.lumberaxeManasteel.name=Manasteel Lumberaxe item.lumberaxeManganese.name=Manganese Lumberaxe @@ -82,7 +82,9 @@ item.lumberaxeVampiric.name=Vampiric Lumberaxe item.lumberaxeVile.name=Vile Lumberaxe item.lumberaxeWither.name=Wither Lumberaxe item.lumberaxeWood.name=Wood Lumberaxe +item.lumberaxeXpiron.name=Xpiron Lumberaxe item.lumberaxeZirconium.name=Zirconium Lumberaxe +item.lumberaxePlatinum.name=Platinum Lumberaxe # Crystal overriders item.lumberaxeCrystalblack.name=Void Crystal Lumberaxe @@ -91,3 +93,4 @@ item.lumberaxeCrystalgreen.name=Emeradic Crystal Lumberaxe item.lumberaxeCrystallightblue.name=Diamatine Crystal Lumberaxe item.lumberaxeCrystalred.name=Restonia Crystal Lumberaxe item.lumberaxeCrystalwhite.name=Enori Crystal Lumberaxe + diff --git a/src/main/resources/assets/lumberjack/models/item/adamantium_lumberaxe.json b/src/main/resources/assets/lumberjack/models/item/adamantium_lumberaxe.json new file mode 100644 index 0000000..3ce4522 --- /dev/null +++ b/src/main/resources/assets/lumberjack/models/item/adamantium_lumberaxe.json @@ -0,0 +1 @@ +{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/adamantium_lumberaxe"}} diff --git a/src/main/resources/assets/lumberjack/models/item/arkenium_lumberaxe.json b/src/main/resources/assets/lumberjack/models/item/aluminum_lumberaxe.json similarity index 71% rename from src/main/resources/assets/lumberjack/models/item/arkenium_lumberaxe.json rename to src/main/resources/assets/lumberjack/models/item/aluminum_lumberaxe.json index 99e7850..b2c0278 100644 --- a/src/main/resources/assets/lumberjack/models/item/arkenium_lumberaxe.json +++ b/src/main/resources/assets/lumberjack/models/item/aluminum_lumberaxe.json @@ -1 +1 @@ -{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/arkenium_lumberaxe"}} +{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/aluminum_lumberaxe"}} diff --git a/src/main/resources/assets/lumberjack/models/item/lunium_lumberaxe.json b/src/main/resources/assets/lumberjack/models/item/lumium_lumberaxe.json similarity index 72% rename from src/main/resources/assets/lumberjack/models/item/lunium_lumberaxe.json rename to src/main/resources/assets/lumberjack/models/item/lumium_lumberaxe.json index 21f2f3e..ec1c0ef 100644 --- a/src/main/resources/assets/lumberjack/models/item/lunium_lumberaxe.json +++ b/src/main/resources/assets/lumberjack/models/item/lumium_lumberaxe.json @@ -1 +1 @@ -{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/lunium_lumberaxe"}} +{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/lumium_lumberaxe"}} diff --git a/src/main/resources/assets/lumberjack/models/item/admantium_lumberaxe.json b/src/main/resources/assets/lumberjack/models/item/plutonium_lumberaxe.json similarity index 70% rename from src/main/resources/assets/lumberjack/models/item/admantium_lumberaxe.json rename to src/main/resources/assets/lumberjack/models/item/plutonium_lumberaxe.json index b6917f4..9e3c26f 100644 --- a/src/main/resources/assets/lumberjack/models/item/admantium_lumberaxe.json +++ b/src/main/resources/assets/lumberjack/models/item/plutonium_lumberaxe.json @@ -1 +1 @@ -{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/admantium_lumberaxe"}} +{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/plutonium_lumberaxe"}} diff --git a/src/main/resources/assets/lumberjack/models/item/xpiron_lumberaxe.json b/src/main/resources/assets/lumberjack/models/item/xpiron_lumberaxe.json new file mode 100644 index 0000000..23267e1 --- /dev/null +++ b/src/main/resources/assets/lumberjack/models/item/xpiron_lumberaxe.json @@ -0,0 +1 @@ +{"parent": "item/handheld","textures": {"layer0": "lumberjack:items/xpiron_lumberaxe"}} diff --git a/src/main/resources/assets/lumberjack/textures/items/admantium_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/adamantium_lumberaxe.png similarity index 100% rename from src/main/resources/assets/lumberjack/textures/items/admantium_lumberaxe.png rename to src/main/resources/assets/lumberjack/textures/items/adamantium_lumberaxe.png diff --git a/src/main/resources/assets/lumberjack/textures/items/aluminum_lumberaxe.png b/src/main/resources/assets/lumberjack/textures/items/aluminum_lumberaxe.png new file mode 100644 index 0000000000000000000000000000000000000000..e4bedb9f994e172fb1dac30990ecfb7d1eac3e68 GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPq2fsKAcbbZ-AW-Oxr;B5V#p&b(1%^F;|NgK3{ri8q z0(%9J0)yi1c@IrmIOjjpl{Pb&v%hxs!)IHwEp!u=!is&8l$w{%eDVKW$=ClbJ0JXc zdz)wL(xp7!&(5bO0Ktyp-)7FQCoSgryxm^$-1`%C-%N!6*1x;9_W#+tcmGe%ztNy{ zyy!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z_$m48K>?k z@&pP>mbgZg1m~xflqVLYG880c=9TE>rIsj|=o#o48k;ajR{<4G_jGX#vG7k;V0rTN z>HlVfDc({HnKq@bL?kBXaQGA#7k~c$=1tBe9*65XN=l#XRaBnrUq182|8pg!hu9i< zb`(BlyAdY9mdVG<`&V9C`ggo@-)swJ2Z>Xu3^#c$@f3Ncq^M-xW6V7FVKVb=o=Y(S z0S~6zcA(HnPZ!4!i_^&o3Ji0mCjGb8KKd_R zf!zW~?ce+E|Nprk{})OfYVrTvGtZUhyP1)}o!WB7<*GePGVcAk)O+w?K*z$GXTCe^ z#A4L$-#&5RLa9YxBM>M??CyAY@V7P(>#X$>pSFJ%cwU}jUp=ey-+jsd|LbR-ef0lw z&H2SA5=#%>tL~PZXnNYa!05^Q=ZPmS+dIWbEXcMic&K~0*F9b`(M&nIA-p(!*ROhB z%e+0A4HG41dm1%}oK3NoUd{a?&zS4PhsnzE#!DF(tezH4NOzq53g{^YPgg&ebxsLQ E07)rU2jmwmq2-}W?a zJMKNt;KR!gMt5HB=AWK?Fpa@SXjx=j)8vN@e;C<1d)tn*GPXVA&X>%y`E{z}oe`VU zEbGfx|7V{leC*5IbL584B*rBfYPWAj#5$DE4s>XnFY|MjCMyGrRl$$gw@UUv&oOwq L`njxgN@xNARPKFn literal 0 HcmV?d00001