diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 79a59ce78..8b14822a5 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -326,6 +326,11 @@ tile.boxcar.name=Güterwagon tile.boat.name=Boot tile.bomber.name=Abgestürtzer Bomber +tile.pink_log.name=Pinkes Holz +tile.pink_planks.name=Pinke Holzbretter +tile.pink_slab.name=Pinke Holzstufe +tile.pink_stairs.name=Pinke Holztreppen + tile.crate.name=Vorratskiste tile.crate_weapon.name=Waffenkiste tile.crate_lead.name=Gefahrenstoffkiste @@ -1340,7 +1345,8 @@ item.loops.name=Lüüps item.loop_stew.name=Informatiker-Frühstück item.fooditem.name=lebensmittel item.twinkie.name=Twinkie -item.twinkie.name=Sandwich mit Fernsehrauschen garniert +item.static_sandwich.name=Sandwich mit Fernsehrauschen garniert +item.pudding.name=Pudding tile.frozen_grass.name=Gefrorenes Gras tile.frozen_dirt.name=Gefrorene Erde diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 3618f415d..9e636e235 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -287,6 +287,11 @@ tile.boxcar.name=Boxcar tile.boat.name=Boat tile.bomber.name=Crashed Bomber +tile.pink_log.name=Pink Log +tile.pink_planks.name=Pink Wood Planks +tile.pink_slab.name=Pink Wood Slab +tile.pink_stairs.name=Pink Wood Stairs + tile.turret_light.name=Light Machine Gun Turret tile.turret_heavy.name=Heavy Machine Gun Turret tile.turret_rocket.name=Rocket Turret @@ -1341,6 +1346,7 @@ item.loop_stew.name=IT Breakfast item.fooditem.name=food item item.twinkie.name=Twinkie item.static_sandwich.name=Sandwich Garnished with TV Static +item.pudding.name=Pudding tile.frozen_grass.name=Frozen Grass tile.frozen_dirt.name=Frozen Dirt diff --git a/assets/hbm/models/LilBoy1.obj b/assets/hbm/models/LilBoy1.obj index b45e3356a..3561f4868 100644 --- a/assets/hbm/models/LilBoy1.obj +++ b/assets/hbm/models/LilBoy1.obj @@ -41,14 +41,8 @@ v -0.350000 0.574999 -0.000000 v -0.350000 0.563581 -0.057403 v -0.350000 0.531065 -0.106066 v -0.350000 0.482402 -0.138582 -v -0.350000 0.100000 0.325000 v -0.350000 0.100000 -0.325000 v 0.350000 0.100000 -0.325000 -v 0.350000 0.100000 0.325000 -v -0.350000 0.750000 0.325000 -v -0.350000 0.750000 -0.325000 -v 0.350000 0.750000 -0.325000 -v 0.350000 0.750000 0.325000 v -0.350000 0.000000 0.425000 v 0.350000 0.000000 0.425000 v -0.350000 0.850000 0.425000 @@ -113,479 +107,319 @@ v 2.675000 0.775001 -0.000000 v 2.675000 0.748359 -0.133939 v 2.675000 0.672488 -0.247487 v 2.675000 0.558940 -0.323358 +v 2.125000 0.036091 0.388909 +v 2.375000 0.036091 0.388909 +v 2.125000 0.212868 0.212132 +v 2.375000 0.212868 0.212132 +v 2.125000 0.637132 -0.212132 +v 2.375000 0.637132 -0.212132 +v 2.125000 0.813909 -0.388909 +v 2.375000 0.813909 -0.388909 +v 2.125000 0.036091 -0.388909 +v 2.375000 0.036091 -0.388909 +v 2.125000 0.212868 -0.212132 +v 2.375000 0.212868 -0.212132 +v 2.125000 0.637132 0.212132 +v 2.375000 0.637132 0.212132 +v 2.125000 0.813909 0.388909 +v 2.375000 0.813909 0.388909 +v -0.350000 0.424999 -0.150000 +v 0.350000 0.425000 -0.325000 +v -0.350000 0.425000 -0.325000 +v 0.350000 0.425000 -0.150000 +v -0.350000 0.274999 0.000000 +v -0.350000 0.100000 0.000000 +v 0.350000 0.100000 0.000000 +v 0.350000 0.275000 0.000000 +v -0.350000 0.424999 0.150000 +v 0.350000 0.425000 0.325000 +v -0.350000 0.425000 0.325000 +v 0.350000 0.425000 0.150000 +v -0.350000 0.574999 -0.000000 +v -0.350000 0.750000 0.000000 +v 0.350000 0.750000 0.000000 +v 0.350000 0.575000 -0.000000 +v -0.350000 0.531065 -0.106066 +v 0.350000 0.531066 -0.106066 v -0.350000 0.750000 -0.325000 v 0.350000 0.750000 -0.325000 -v -0.350000 0.100000 -0.325000 -v 0.350000 0.100000 -0.325000 -v -0.350000 0.100000 0.325000 -v 0.350000 0.100000 0.325000 +v -0.350000 0.531065 0.106066 +v 0.350000 0.531066 0.106066 v -0.350000 0.750000 0.325000 v 0.350000 0.750000 0.325000 -v 1.862500 0.748358 0.133939 -v 1.862500 0.672487 0.247487 -v 2.268750 0.748358 0.133939 -v 2.268750 0.672488 0.247487 -v 1.862500 0.769145 0.147829 -v 1.862500 0.693274 0.261377 -v 2.268750 0.769145 0.147829 -v 2.268750 0.693274 0.261377 -v 1.964062 0.748358 0.133939 -v 1.964062 0.672487 0.247487 -v 1.964062 0.769145 0.147829 -v 1.964062 0.693274 0.261377 -v 2.116406 0.748358 0.133939 -v 2.116406 0.672488 0.247487 -v 2.116406 0.769145 0.147829 -v 2.116406 0.693274 0.261377 -v 1.964062 0.731210 0.204603 -v 2.116406 0.731210 0.204603 -v 2.040234 0.731210 0.204603 -v 1.964062 0.750177 0.176216 -v 2.002148 0.693274 0.261377 -v 2.116406 0.750177 0.176216 -v 1.964062 0.712242 0.232990 -v 2.116406 0.712242 0.232990 -v 2.040234 0.750177 0.176216 -v 2.002148 0.731210 0.204603 -v 2.078320 0.731210 0.204603 -v 2.078320 0.750177 0.176216 -v 2.002148 0.750177 0.176216 -v 2.002148 0.712242 0.232990 -v 1.964062 0.835143 0.274049 -v 2.116406 0.835143 0.274049 -v 2.116406 0.854111 0.245662 -v 1.964062 0.816176 0.302436 -v 2.002148 0.835143 0.274049 -v 2.078320 0.835143 0.274049 -v 2.078320 0.854111 0.245662 -v 2.002148 0.816176 0.302436 -v 2.040234 0.939077 0.343495 -v 2.040234 0.958045 0.315108 -v 2.002148 0.939077 0.343495 -v 2.002148 0.958045 0.315108 -vt 0.511590 0.017688 -vt 0.511590 0.043737 -vt 0.472517 0.043737 -vt 0.537639 0.327017 -vt 0.511590 0.327017 -vt 0.472517 0.353066 -vt 0.472517 0.327017 -vt 0.446468 0.043737 -vt 0.180425 0.890399 -vt 0.187860 0.853022 -vt 0.225236 0.860457 -vt 0.761093 0.304570 -vt 0.761092 0.178818 -vt 0.819478 0.178818 -vt 0.840194 0.476161 -vt 0.840194 0.601914 -vt 0.781809 0.601914 -vt 0.176402 0.755237 -vt 0.302154 0.755237 -vt 0.302154 0.813622 -vt 0.323087 0.476161 -vt 0.475787 0.476161 -vt 0.475787 0.601914 -vt 0.170388 0.476161 -vt 0.170388 0.601914 -vt 0.017688 0.601914 -vt 0.710368 0.763043 -vt 0.710368 0.637291 -vt 0.768753 0.637291 -vt 0.862516 0.637291 -vt 0.862516 0.763043 -vt 0.804131 0.763043 -vt 0.761093 0.143441 -vt 0.761092 0.017688 -vt 0.819478 0.017688 -vt 0.455477 0.755237 -vt 0.581229 0.755237 -vt 0.581229 0.813622 -vt 0.616606 0.763043 -vt 0.616606 0.637291 -vt 0.674991 0.637291 -vt 0.637635 0.924173 -vt 0.627120 0.924173 -vt 0.627120 0.798420 -vt 0.616606 0.924173 -vt 0.616606 0.798420 -vt 0.813530 0.924173 -vt 0.803016 0.924173 -vt 0.803016 0.798420 -vt 0.792502 0.924173 -vt 0.792502 0.798420 -vt 0.781988 0.924173 -vt 0.781988 0.798420 -vt 0.771474 0.924173 -vt 0.736097 0.798420 -vt 0.736097 0.924173 -vt 0.725583 0.924173 -vt 0.715068 0.924173 -vt 0.715068 0.798420 -vt 0.704554 0.924173 -vt 0.704554 0.798420 -vt 0.694040 0.924173 -vt 0.917628 0.476161 -vt 0.917628 0.601914 -vt 0.907114 0.601914 -vt 0.896600 0.601914 -vt 0.896600 0.476161 -vt 0.886085 0.601914 -vt 0.886085 0.476161 -vt 0.875571 0.601914 -vt 0.875571 0.476161 -vt 0.648149 0.924173 -vt 0.637635 0.798420 -vt 0.658663 0.924173 -vt 0.648149 0.798420 -vt 0.232174 0.019088 -vt 0.238902 0.148718 -vt 0.214553 0.148675 -vt 0.263235 0.148759 -vt 0.246070 0.019198 -vt 0.270374 0.019384 -vt 0.280790 0.019400 -vt 0.287541 0.148795 -vt 0.294160 0.018165 -vt 0.304675 0.018134 -vt 0.312076 0.148722 -vt 0.318695 0.018092 -vt 0.329210 0.018060 -vt 0.336611 0.148649 -vt 0.343231 0.018018 -vt 0.353746 0.017987 -vt 0.361147 0.148575 -vt 0.367766 0.017945 -vt 0.378281 0.017914 -vt 0.385682 0.148502 -vt 0.392302 0.017872 -vt 0.402817 0.017840 -vt 0.042738 0.148379 -vt 0.018193 0.148336 -vt 0.025431 0.017688 -vt 0.067283 0.148421 -vt 0.049976 0.017731 -vt 0.091828 0.148463 -vt 0.074521 0.017773 -vt 0.116373 0.148506 -vt 0.099066 0.017815 -vt 0.140918 0.148548 -vt 0.123611 0.017858 -vt 0.165463 0.148591 -vt 0.148157 0.017900 -vt 0.190008 0.148633 -vt 0.172701 0.017943 -vt 0.197246 0.017985 -vt 0.761092 0.376915 -vt 0.785793 0.339947 -vt 0.822761 0.364648 -vt 0.067090 0.637291 -vt 0.141025 0.686692 -vt 0.017688 0.711226 -vt 0.579149 0.437877 -vt 0.573016 0.393842 -vt 0.597549 0.393842 -vt 0.499512 0.855132 -vt 0.499512 0.867398 -vt 0.455477 0.873532 -vt 0.578924 0.867399 -vt 0.534889 0.873532 -vt 0.534889 0.848999 -vt 0.858137 0.358347 -vt 0.858137 0.346080 -vt 0.902173 0.339947 -vt 0.534889 0.927308 -vt 0.534889 0.915042 -vt 0.578924 0.908909 -vt 0.711236 0.437877 -vt 0.698969 0.437877 -vt 0.692836 0.393842 -vt 0.904026 0.681326 -vt 0.897893 0.637291 -vt 0.922426 0.637291 -vt 0.176402 0.955634 -vt 0.176402 0.943367 -vt 0.220437 0.937234 -vt 0.255813 0.943367 -vt 0.299848 0.937234 -vt 0.299848 0.961767 -vt 0.943683 0.424390 -vt 0.937550 0.380355 -vt 0.962083 0.380355 -vt 0.855041 0.960881 -vt 0.848907 0.916846 -vt 0.873440 0.916846 -vt 0.904026 0.760738 -vt 0.897893 0.716703 -vt 0.922426 0.716703 -vt 0.270770 0.893034 -vt 0.264637 0.848999 -vt 0.289170 0.848999 -vt 0.499512 0.927308 -vt 0.455477 0.933442 -vt 0.455477 0.908909 -vt 0.902173 0.418257 -vt 0.858137 0.424390 -vt 0.858137 0.399857 -vt 0.639059 0.437877 -vt 0.632926 0.393842 -vt 0.657459 0.393842 -vt 0.948190 0.186930 -vt 0.948190 0.320795 -vt 0.945854 0.320795 -vt 0.945854 0.151553 -vt 0.945854 0.017688 -vt 0.948190 0.017688 -vt 0.108687 0.929889 -vt 0.108687 0.796004 -vt 0.111024 0.796004 -vt 0.919277 0.932305 -vt 0.919277 0.798420 -vt 0.921613 0.798420 -vt 0.288414 0.440748 -vt 0.263424 0.293628 -vt 0.238826 0.440785 -vt 0.238828 0.367176 -vt 0.263662 0.367289 -vt 0.312950 0.440675 -vt 0.337485 0.440602 -vt 0.362020 0.440528 -vt 0.386556 0.440455 -vt 0.411091 0.440381 -vt 0.042233 0.440446 -vt 0.853152 0.879969 -vt 0.853426 0.875391 -vt 0.878438 0.876890 -vt 0.238861 0.339328 -vt 0.214048 0.440742 -vt 0.238857 0.311888 -vt 0.189503 0.440700 -vt 0.164958 0.440657 -vt 0.140413 0.440615 -vt 0.115868 0.440573 -vt 0.091323 0.440530 -vt 0.066778 0.440488 -vt 0.860249 0.847967 -vt 0.865763 0.848391 -vt 0.855080 0.821561 -vt 0.854736 0.847736 -vt 0.850343 0.847617 -vt 0.854349 0.799273 -vt 0.878762 0.798420 -vt 0.878918 0.802889 -vt 0.873147 0.821210 -vt 0.866969 0.821432 -vt 0.866492 0.835090 -vt 0.879334 0.827902 -vt 0.879270 0.849058 -vt 0.883900 0.849110 -vt 0.860825 0.834894 -vt 0.860607 0.841465 -vt 0.866367 0.841688 -vt 0.867474 0.828577 -vt 0.861016 0.828352 -vt 0.861040 0.821600 -vt 0.982303 0.563455 -vt 0.959847 0.563447 -vt 0.959849 0.557314 -vt 0.982307 0.550480 -vt 0.982305 0.557322 -vt 0.873326 0.827848 -vt 0.959849 0.495979 -vt 0.959847 0.502112 -vt 0.953005 0.502110 -vt 0.953007 0.557311 -vt 0.982309 0.483011 -vt 0.959853 0.483003 -vt 0.959856 0.476161 -vt 0.982307 0.489144 -vt 0.959851 0.489137 -vt 0.982305 0.495986 -vt 0.982309 0.544346 -vt 0.959851 0.550472 -vt 0.982303 0.502120 -vt 0.959853 0.544339 -vt 0.959856 0.537497 -vt 0.453310 0.395285 -vt 0.453310 0.401418 -vt 0.446468 0.401418 -vt 0.453310 0.408260 -vt 0.498222 0.401418 -vt 0.498222 0.395285 -vt 0.453310 0.388443 -vt 0.498222 0.414393 -vt 0.453310 0.414393 -vt 0.472517 0.017689 -vt 0.537639 0.043737 -vt 0.511590 0.353066 -vt 0.446468 0.327017 -vt 0.229260 0.870171 -vt 0.229260 0.880685 -vt 0.225236 0.890399 -vt 0.217802 0.897834 -vt 0.208088 0.901857 -vt 0.197574 0.901857 -vt 0.187860 0.897834 -vt 0.176402 0.880685 -vt 0.176402 0.870171 -vt 0.180425 0.860457 -vt 0.197574 0.848999 -vt 0.208088 0.848999 -vt 0.217802 0.853022 -vt 0.819478 0.304570 -vt 0.781809 0.476161 -vt 0.176402 0.813622 -vt 0.323087 0.601914 -vt 0.017688 0.476161 -vt 0.768754 0.763043 -vt 0.804130 0.637291 -vt 0.819478 0.143441 -vt 0.455477 0.813622 -vt 0.674992 0.763043 -vt 0.813530 0.798420 -vt 0.771474 0.798420 -vt 0.725583 0.798420 -vt 0.694040 0.798420 -vt 0.907114 0.476161 -vt 0.658663 0.798420 -vt 0.221738 0.019069 -vt 0.256499 0.019216 -vt 0.410218 0.148428 -vt 0.035950 0.017707 -vt 0.060495 0.017749 -vt 0.085040 0.017791 -vt 0.109586 0.017834 -vt 0.134131 0.017876 -vt 0.158676 0.017919 -vt 0.183221 0.017961 -vt 0.207765 0.018003 -vt 0.822761 0.376915 -vt 0.818066 0.388247 -vt 0.809393 0.396921 -vt 0.798060 0.401615 -vt 0.785793 0.401615 -vt 0.774460 0.396921 -vt 0.765787 0.388247 -vt 0.761092 0.364648 -vt 0.765787 0.353315 -vt 0.774460 0.344642 -vt 0.798060 0.339947 -vt 0.809393 0.344642 -vt 0.818066 0.353315 -vt 0.091623 0.760627 -vt 0.067090 0.760627 -vt 0.044424 0.751239 -vt 0.027077 0.733891 -vt 0.017688 0.686692 -vt 0.027077 0.664027 -vt 0.044424 0.646679 -vt 0.091623 0.637291 -vt 0.114289 0.646679 -vt 0.131636 0.664027 -vt 0.141025 0.711226 -vt 0.131636 0.733891 -vt 0.114289 0.751239 -vt 0.591416 0.437877 -vt 0.455477 0.848999 -vt 0.578924 0.855132 -vt 0.902173 0.364480 -vt 0.578924 0.933442 -vt 0.717369 0.393842 -vt 0.916292 0.681326 -vt 0.220437 0.961767 -vt 0.255813 0.955634 -vt 0.955950 0.424390 -vt 0.867307 0.960881 -vt 0.916292 0.760738 -vt 0.283037 0.893034 -vt 0.499512 0.915042 -vt 0.902173 0.405990 -vt 0.651326 0.437877 -vt 0.945854 0.186930 -vt 0.948190 0.151553 -vt 0.111024 0.929889 -vt 0.921613 0.932305 -vt 0.263633 0.440784 -vt 0.263487 0.339131 -vt 0.263446 0.311847 -vt 0.238858 0.293615 -vt 0.017688 0.440403 -vt 0.878163 0.881469 -vt 0.872985 0.849062 -vt 0.850744 0.821597 -vt 0.850146 0.803889 -vt 0.854505 0.803742 -vt 0.848907 0.875155 -vt 0.879359 0.821082 -vt 0.867570 0.828670 -vt 0.883413 0.802770 -vt 0.883900 0.821032 -vt 0.883020 0.877038 -vt 0.953007 0.495976 -vt 0.953005 0.563445 -vt 0.982312 0.476169 -vt 0.982312 0.537504 -vt 0.446468 0.395285 -vt 0.498222 0.408260 -vt 0.498222 0.388443 -vt 0.649366 0.035653 -vt 0.590981 0.035653 -vt 0.573016 0.017689 -vt 0.573016 0.205765 -vt 0.725715 0.205765 -vt 0.649366 0.223730 -vt 0.725716 0.358465 -vt 0.707751 0.282115 -vt 0.573016 0.170388 -vt 0.590981 0.094038 -vt 0.573016 0.358465 -vt 0.649366 0.340500 -vt 0.649366 0.152423 -vt 0.707751 0.152423 -vt 0.725716 0.170388 -vt 0.628486 0.476161 -vt 0.628486 0.601914 -vt 0.590981 0.223730 -vt 0.590981 0.282115 -vt 0.707751 0.094038 -vt 0.854855 0.178818 -vt 0.910477 0.178818 -vt 0.910477 0.304570 -vt 0.854855 0.017688 -vt 0.910477 0.017688 -vt 0.910477 0.143441 -vt 0.073310 0.921756 -vt 0.017688 0.921756 -vt 0.017689 0.796004 -vt 0.337531 0.924173 -vt 0.337531 0.798420 -vt 0.393153 0.798420 -vt 0.455477 0.719860 -vt 0.455477 0.637291 -vt 0.581229 0.637291 -vt 0.337531 0.637291 -vt 0.420100 0.637291 -vt 0.420100 0.763043 -vt 0.176402 0.637291 -vt 0.302154 0.637291 -vt 0.302154 0.719860 -vt 0.746432 0.476161 -vt 0.746432 0.601914 -vt 0.663863 0.601914 -vt 0.725715 0.017688 -vt 0.707751 0.035653 -vt 0.707751 0.223730 -vt 0.707751 0.340500 -vt 0.590981 0.152423 -vt 0.590981 0.340500 -vt 0.854855 0.304570 -vt 0.854855 0.143441 -vt 0.073310 0.796004 -vt 0.393153 0.924173 -vt 0.581229 0.719860 -vt 0.337531 0.763043 -vt 0.176402 0.719860 -vt 0.663863 0.476161 +v -0.350000 0.318933 0.106066 +v 0.350000 0.318934 0.106066 +v -0.350000 0.100000 0.325000 +v 0.350000 0.100000 0.325000 +v -0.350000 0.318933 -0.106066 +v -0.350000 0.100000 -0.325000 +v 0.350000 0.100000 -0.325000 +v 0.350000 0.318934 -0.106066 +v -0.350000 0.750000 -0.325000 +v 0.350000 0.750000 -0.325000 +v -0.350000 0.750000 0.325000 +v 0.350000 0.750000 0.325000 +v -0.350000 0.100000 0.325000 +v 0.350000 0.100000 0.325000 +v 2.125000 0.036091 0.388909 +v 2.375000 0.036091 0.388909 +v 2.125000 0.212868 0.212132 +v 2.375000 0.212868 0.212132 +v 2.125000 0.637132 -0.212132 +v 2.375000 0.637132 -0.212132 +v 2.125000 0.813909 -0.388909 +v 2.375000 0.813909 -0.388909 +v 2.125000 0.036091 -0.388909 +v 2.375000 0.036091 -0.388909 +v 2.125000 0.212868 -0.212132 +v 2.375000 0.212868 -0.212132 +v 2.125000 0.637132 0.212132 +v 2.375000 0.637132 0.212132 +v 2.125000 0.813909 0.388909 +v 2.375000 0.813909 0.388909 +v -0.350000 0.424999 -0.150000 +v 0.350000 0.425000 -0.325000 +v -0.350000 0.425000 -0.325000 +v 0.350000 0.425000 -0.150000 +v -0.350000 0.274999 0.000000 +v -0.350000 0.100000 0.000000 +v 0.350000 0.100000 0.000000 +v 0.350000 0.275000 0.000000 +v -0.350000 0.424999 0.150000 +v 0.350000 0.425000 0.325000 +v -0.350000 0.425000 0.325000 +v 0.350000 0.425000 0.150000 +v -0.350000 0.574999 -0.000000 +v -0.350000 0.750000 0.000000 +v 0.350000 0.750000 0.000000 +v 0.350000 0.575000 -0.000000 +v -0.350000 0.531065 -0.106066 +v 0.350000 0.531066 -0.106066 +v -0.350000 0.750000 -0.325000 +v 0.350000 0.750000 -0.325000 +v -0.350000 0.531065 0.106066 +v 0.350000 0.531066 0.106066 +v -0.350000 0.750000 0.325000 +v 0.350000 0.750000 0.325000 +v -0.350000 0.318933 0.106066 +v 0.350000 0.318934 0.106066 +v -0.350000 0.100000 0.325000 +v 0.350000 0.100000 0.325000 +v -0.350000 0.318933 -0.106066 +v -0.350000 0.100000 -0.325000 +v 0.350000 0.100000 -0.325000 +v 0.350000 0.318934 -0.106066 +vt 0.630435 0.607143 +vt 0.652174 0.607143 +vt 0.652174 0.678571 +vt 0.913043 0.571429 +vt 0.913043 0.607143 +vt 0.934783 0.678571 +vt 0.913043 0.678571 +vt 0.652174 0.714286 +vt 0.622155 0.607621 +vt 0.608405 0.664969 +vt 0.573497 0.642379 +vt 0.130435 0.857143 +vt -0.000000 0.857143 +vt -0.000000 0.750000 +vt 0.282609 0.500000 +vt 0.282609 0.250000 +vt 0.413043 0.250000 +vt 0.282609 0.750000 +vt 0.413043 0.750000 +vt 0.413043 1.000000 +vt 0.130435 0.107143 +vt 0.000000 0.107143 +vt 0.000000 0.000000 +vt 0.543478 0.214286 +vt 0.543478 0.232143 +vt 0.413043 0.232143 +vt 0.543478 0.250000 +vt 0.543478 0.267857 +vt 0.413043 0.267857 +vt 0.543478 0.285714 +vt 0.413043 0.285714 +vt 0.543478 -0.000000 +vt 0.543478 0.017857 +vt 0.413043 0.017857 +vt 0.543478 0.035714 +vt 0.413043 0.035714 +vt 0.543478 0.053571 +vt 0.543478 0.071429 +vt 0.413043 0.071429 +vt 0.543478 0.089286 +vt 0.413043 0.089286 +vt 0.543478 0.107143 +vt 0.413043 0.107143 +vt 0.543478 0.125000 +vt 0.543478 0.142857 +vt 0.413043 0.142857 +vt 0.543478 0.160714 +vt 0.413043 0.160714 +vt 0.543478 0.178571 +vt 0.413043 0.178571 +vt 0.543478 0.196429 +vt 0.413043 0.214286 +vt 0.413043 0.196429 +vt 0.673913 0.250000 +vt 0.673913 0.285714 +vt 0.673913 0.214286 +vt 0.673913 0.178571 +vt 0.673913 0.142857 +vt 0.673913 0.107143 +vt 0.673913 0.071429 +vt 0.673913 0.035714 +vt 0.673913 0.535714 +vt 0.673913 0.571429 +vt 0.543478 0.571429 +vt 0.673913 0.500000 +vt 0.543478 0.535714 +vt 0.673913 0.464286 +vt 0.543478 0.500000 +vt 0.673913 0.428571 +vt 0.543478 0.464286 +vt 0.673913 0.392857 +vt 0.543478 0.428571 +vt 0.673913 0.357143 +vt 0.543478 0.392857 +vt 0.673913 0.321429 +vt 0.543478 0.357143 +vt 0.543478 0.321429 +vt 0.282609 -0.000000 +vt 0.413043 -0.000000 +vt 0.937764 0.625000 +vt 0.967391 0.576327 +vt 0.997018 0.625000 +vt 0.478261 0.285714 +vt 0.413043 0.392857 +vt 1.000000 0.285714 +vt 0.956522 0.285714 +vt 0.956522 0.250000 +vt 1.000000 0.303571 +vt 1.000000 0.321429 +vt 0.956522 0.321429 +vt 1.000000 0.357143 +vt 0.956522 0.357143 +vt 1.000000 0.375000 +vt 1.000000 0.392857 +vt 0.956522 0.392857 +vt 1.000000 0.410714 +vt 1.000000 0.428571 +vt 0.956522 0.428571 +vt 1.000000 0.446429 +vt 1.000000 0.464286 +vt 0.956522 0.464286 +vt 1.000000 0.500000 +vt 0.956522 0.500000 +vt 1.000000 0.517857 +vt 1.000000 0.535714 +vt 0.956522 0.535714 +vt 1.000000 0.571429 +vt 0.956522 0.571429 +vt 1.000000 0.035714 +vt 0.956522 0.035714 +vt 0.956522 0.000000 +vt 1.000000 0.071429 +vt 0.956522 0.071429 +vt 1.000000 0.107143 +vt 0.956522 0.107143 +vt 1.000000 0.142857 +vt 0.956522 0.142857 +vt 1.000000 0.178571 +vt 0.956522 0.178571 +vt 1.000000 0.214286 +vt 0.956522 0.214286 +vt 1.000000 0.250000 +vt 0.478261 0.392857 +vt 0.141304 0.500000 +vt 0.271739 0.500000 +vt 0.271739 0.607143 +vt 0.141304 0.607143 +vt 0.130435 0.214286 +vt 0.000000 0.214286 +vt 0.000000 0.321429 +vt 0.130435 0.428571 +vt 0.000000 0.428571 +vt 0.130435 0.535714 +vt 0.130435 0.642857 +vt -0.000000 0.642857 +vt 0.130435 0.750000 +vt 0.206522 0.214286 +vt 0.260870 0.214286 +vt 0.260870 0.125000 +vt 0.260870 0.035714 +vt 0.152174 0.125000 +vt 0.152174 0.214286 +vt 0.130435 0.250000 +vt 0.206522 0.035714 +vt 0.206522 0.285714 +vt 0.152174 0.285714 +vt 0.152174 0.375000 +vt 0.152174 0.464286 +vt 0.130435 0.500000 +vt 0.206522 0.464286 +vt 0.260870 0.375000 +vt 0.630435 0.678571 +vt 0.652174 0.571429 +vt 0.934783 0.607143 +vt 0.913043 0.714286 +vt 0.571301 0.625761 +vt 0.573143 0.609026 +vt 0.578743 0.594724 +vt 0.587248 0.585031 +vt 0.597363 0.581423 +vt 0.607549 0.584449 +vt 0.616255 0.593649 +vt 0.624351 0.624239 +vt 0.622509 0.640974 +vt 0.616910 0.655276 +vt 0.598289 0.668577 +vt 0.588103 0.665551 +vt 0.579397 0.656351 +vt 0.413043 0.500000 +vt 0.282609 1.000000 +vt 0.130435 0.000000 +vt 0.413043 0.053571 +vt 0.413043 0.125000 +vt 0.673913 -0.000000 +vt 0.543478 0.553571 +vt 0.543478 0.517857 +vt 0.543478 0.482143 +vt 0.543478 0.446429 +vt 0.543478 0.410714 +vt 0.543478 0.375000 +vt 0.543478 0.339286 +vt 0.543478 0.303571 +vt 0.994763 0.643627 +vt 0.988341 0.659417 +vt 0.978729 0.669968 +vt 0.967391 0.673673 +vt 0.956053 0.669968 +vt 0.946442 0.659417 +vt 0.940019 0.643626 +vt 0.940019 0.606374 +vt 0.946442 0.590583 +vt 0.956053 0.580032 +vt 0.978729 0.580032 +vt 0.988341 0.590583 +vt 0.994763 0.606374 +vt 1.000000 0.267857 +vt 1.000000 0.339286 +vt 1.000000 0.482143 +vt 1.000000 0.553571 +vt 1.000000 0.017857 +vt 1.000000 0.053571 +vt 1.000000 0.089286 +vt 1.000000 0.125000 +vt 1.000000 0.160714 +vt 1.000000 0.196429 +vt 1.000000 0.232143 +vt 0.130435 0.321429 +vt -0.000000 0.535714 +vt 0.152174 0.035714 +vt 0.260870 0.285714 +vt 0.260870 0.464286 vn -1.000000 0.000000 0.000000 vn 0.000000 0.000000 -1.000000 vn 1.000000 0.000000 0.000000 @@ -624,6 +458,7 @@ vn -0.269800 0.187900 -0.944400 vn -0.269800 0.535000 -0.800600 vn -0.269800 0.800600 -0.535000 vn -0.269800 0.944400 -0.187900 +vn -0.000000 -0.707100 -0.707100 vn 0.700200 0.700200 0.139300 vn 0.700200 0.700200 -0.139300 vn 0.700200 0.593600 -0.396600 @@ -640,9 +475,9 @@ vn 0.700200 -0.139300 0.700200 vn 0.700200 0.139300 0.700200 vn 0.700200 0.396600 0.593600 vn 0.700200 0.593600 0.396600 +vn 0.000000 0.707100 0.707100 vn 0.000000 -0.707100 0.707100 -vn -0.000000 0.707100 0.707100 -vn 0.000000 0.707100 -0.707100 +vn -0.000000 0.707100 -0.707100 s off f 6/1/1 2/2/1 1/3/1 f 7/4/2 3/5/2 2/2/2 @@ -650,333 +485,275 @@ f 8/6/3 4/7/3 3/5/3 f 5/8/4 1/3/4 4/7/4 f 2/2/5 3/5/5 4/7/5 f 32/9/1 36/10/1 40/11/1 -f 43/12/6 42/13/6 59/14/6 -f 46/15/5 47/16/5 58/17/5 -f 44/18/2 41/19/2 62/20/2 -f 51/21/4 49/22/4 50/23/4 -f 55/24/2 56/25/2 54/26/2 -f 47/27/4 46/28/4 64/29/4 -f 57/30/5 58/31/5 48/32/5 -f 60/33/6 59/34/6 41/35/6 -f 61/36/2 62/37/2 45/38/2 -f 63/39/4 64/40/4 42/41/4 -f 65/42/7 66/43/7 26/44/7 -f 66/43/8 67/45/8 27/46/8 -f 67/47/9 68/48/9 28/49/9 -f 68/48/10 69/50/10 29/51/10 -f 69/50/11 70/52/11 30/53/11 -f 30/53/12 70/52/12 71/54/12 -f 31/55/13 71/56/13 72/57/13 -f 72/57/14 73/58/14 33/59/14 -f 73/58/15 74/60/15 34/61/15 -f 34/61/16 74/60/16 75/62/16 -f 35/63/17 75/64/17 76/65/17 -f 76/65/18 77/66/18 37/67/18 -f 77/66/19 78/68/19 38/69/19 -f 78/68/20 79/70/20 39/71/20 -f 80/72/21 65/42/21 25/73/21 -f 79/74/22 80/72/22 40/75/22 -f 76/76/23 20/77/23 21/78/23 -f 19/79/24 20/77/24 76/80/24 -f 19/79/25 75/81/25 74/82/25 -f 18/83/26 74/84/26 73/85/26 -f 17/86/27 73/87/27 72/88/27 -f 16/89/28 72/90/28 71/91/28 -f 15/92/29 71/93/29 70/94/29 -f 14/95/30 70/96/30 69/97/30 -f 12/98/31 13/99/31 69/100/31 -f 11/101/32 12/98/32 68/102/32 -f 10/103/33 11/101/33 67/104/33 -f 9/105/34 10/103/34 66/106/34 -f 24/107/35 9/105/35 65/108/35 -f 23/109/36 24/107/36 80/110/36 -f 22/111/37 23/109/37 79/112/37 -f 21/78/38 22/111/38 78/113/38 -f 89/114/3 93/115/3 81/116/3 -f 107/117/3 103/118/3 111/119/3 -f 85/120/39 109/121/39 108/122/39 -f 85/123/40 84/124/40 110/125/40 -f 83/126/41 111/127/41 110/128/41 -f 83/129/42 82/130/42 112/131/42 -f 82/132/43 81/133/43 97/134/43 -f 81/135/44 96/136/44 98/137/44 -f 95/138/45 99/139/45 98/140/45 -f 95/141/46 94/142/46 100/143/46 -f 93/144/47 101/145/47 100/146/47 -f 92/147/48 102/148/48 101/149/48 -f 91/150/49 103/151/49 102/152/49 -f 90/153/50 104/154/50 103/155/50 -f 89/156/51 105/157/51 104/158/51 -f 88/159/52 106/160/52 105/161/52 -f 87/162/53 107/163/53 106/164/53 -f 86/165/54 108/166/54 107/167/54 -f 46/168/4 47/169/4 114/170/4 -f 43/171/4 42/172/4 115/173/4 -f 44/174/4 41/175/4 117/176/4 -f 48/177/4 45/178/4 119/179/4 -f 106/180/16 122/181/16 18/83/16 -f 108/182/17 123/183/17 124/184/17 -f 20/77/17 19/79/17 122/181/17 -f 105/185/15 106/180/15 18/83/15 -f 104/186/14 105/185/14 17/86/14 -f 103/187/13 104/186/13 16/89/13 -f 102/188/12 103/187/12 15/92/12 -f 101/189/11 102/188/11 14/95/11 -f 13/99/10 12/98/10 100/190/10 -f 123/191/3 127/192/3 128/193/3 -f 133/194/18 109/195/18 129/196/18 -f 109/195/19 110/197/19 22/111/19 -f 110/197/20 111/198/20 23/109/20 -f 111/198/22 112/199/22 24/107/22 -f 112/199/21 97/200/21 9/105/21 -f 97/200/7 98/201/7 10/103/7 -f 99/202/9 100/190/9 12/98/9 -f 98/201/8 99/202/8 11/101/8 -f 127/192/17 142/203/17 138/204/17 -f 131/205/22 135/206/22 133/207/22 -f 121/208/1 122/209/1 126/210/1 -f 143/211/17 137/212/17 126/210/17 -f 139/213/17 141/214/17 136/215/17 -f 136/215/13 141/214/13 134/216/13 -f 145/217/17 148/218/17 135/206/17 -f 147/219/17 148/218/17 145/217/17 -f 146/220/17 149/221/17 140/222/17 -f 146/223/3 155/224/3 158/225/3 -f 143/226/13 150/227/13 158/225/13 -f 141/214/17 150/228/17 143/211/17 -f 152/229/17 153/230/17 157/231/17 -f 154/232/17 158/225/17 155/224/17 -f 148/233/22 157/234/22 153/235/22 -f 148/233/1 147/236/1 156/237/1 -f 147/236/13 138/238/13 152/229/13 -f 137/239/1 143/226/1 154/240/1 -f 138/238/3 142/241/3 153/230/3 -f 137/239/22 151/242/22 155/243/22 -f 159/244/17 160/245/17 162/246/17 -f 162/247/22 160/245/22 145/248/22 -f 145/248/3 160/245/3 159/244/3 -f 139/249/13 159/244/13 161/250/13 -f 146/251/1 161/252/1 162/247/1 -f 5/253/1 6/1/1 1/3/1 -f 6/254/2 7/4/2 2/2/2 -f 7/255/3 8/6/3 3/5/3 -f 8/256/4 5/8/4 4/7/4 +f 42/12/6 41/13/6 53/14/6 +f 45/15/4 43/16/4 44/17/4 +f 49/18/2 50/19/2 48/20/2 +f 50/19/6 49/18/6 45/15/6 +f 57/21/4 58/22/4 41/23/4 +f 59/24/7 60/25/7 26/26/7 +f 60/25/8 61/27/8 27/17/8 +f 61/27/9 62/28/9 28/29/9 +f 62/28/10 63/30/10 29/31/10 +f 63/32/11 64/33/11 30/34/11 +f 30/34/12 64/33/12 65/35/12 +f 31/36/13 65/35/13 66/37/13 +f 66/37/14 67/38/14 33/39/14 +f 67/38/15 68/40/15 34/41/15 +f 34/41/16 68/40/16 69/42/16 +f 35/43/17 69/42/17 70/44/17 +f 70/44/18 71/45/18 37/46/18 +f 71/45/19 72/47/19 38/48/19 +f 72/47/20 73/49/20 39/50/20 +f 74/51/21 59/24/21 25/52/21 +f 73/49/22 74/51/22 40/53/22 +f 70/28/23 20/54/23 21/55/23 +f 19/56/24 20/54/24 70/27/24 +f 19/56/25 69/24/25 68/51/25 +f 18/57/26 68/49/26 67/47/26 +f 17/58/27 67/45/27 66/44/27 +f 16/59/28 66/42/28 65/40/28 +f 15/60/29 65/38/29 64/37/29 +f 14/61/30 64/35/30 63/33/30 +f 12/62/31 13/63/31 63/64/31 +f 11/65/32 12/62/32 62/66/32 +f 10/67/33 11/65/33 61/68/33 +f 9/69/34 10/67/34 60/70/34 +f 24/71/35 9/69/35 59/72/35 +f 23/73/36 24/71/36 74/74/36 +f 22/75/37 23/73/37 73/76/37 +f 21/55/38 22/75/38 72/77/38 +f 47/78/5 48/79/5 44/17/5 +f 83/80/3 87/81/3 75/82/3 +f 163/83/39 164/31/39 162/84/39 +f 79/85/40 103/86/40 102/87/40 +f 79/88/41 78/89/41 104/90/41 +f 77/91/42 105/92/42 104/90/42 +f 77/93/43 76/94/43 106/95/43 +f 76/96/44 75/97/44 91/98/44 +f 75/99/45 90/100/45 92/101/45 +f 89/102/46 93/103/46 92/101/46 +f 89/104/47 88/105/47 94/106/47 +f 87/107/48 95/108/48 94/106/48 +f 86/109/49 96/110/49 95/111/49 +f 85/112/50 97/113/50 96/110/50 +f 84/114/51 98/115/51 97/113/51 +f 83/116/52 99/117/52 98/115/52 +f 82/118/53 100/119/53 99/117/53 +f 81/120/54 101/121/54 100/119/54 +f 80/122/55 102/87/55 101/121/55 +f 99/117/15 100/119/15 18/57/15 +f 98/115/14 99/117/14 17/58/14 +f 97/113/13 98/115/13 16/59/13 +f 96/110/12 97/113/12 15/60/12 +f 95/111/11 96/110/11 14/61/11 +f 13/63/10 12/62/10 94/106/10 +f 103/86/19 104/90/19 22/75/19 +f 104/90/20 105/92/20 23/73/20 +f 105/92/22 106/95/22 24/71/22 +f 106/95/21 91/98/21 9/69/21 +f 91/98/7 92/101/7 10/67/7 +f 93/103/9 94/106/9 12/62/9 +f 92/101/8 93/103/8 11/65/8 +f 100/119/16 101/121/16 19/56/16 +f 101/121/17 102/87/17 20/54/17 +f 102/87/18 103/86/18 21/55/18 +f 108/84/56 110/31/56 109/83/56 +f 112/83/56 114/123/56 113/84/56 +f 116/84/57 118/31/57 117/83/57 +f 120/83/57 122/123/57 121/84/57 +f 123/124/6 126/125/6 124/126/6 +f 127/125/4 128/126/4 129/127/4 +f 133/126/6 132/127/6 134/124/6 +f 138/125/4 137/126/4 136/127/4 +f 141/126/39 142/127/39 140/124/39 +f 145/126/58 146/127/58 144/124/58 +f 147/125/56 149/126/56 150/127/56 +f 151/125/57 152/126/57 153/127/57 +f 124/125/39 129/126/39 128/127/39 +f 133/125/57 128/126/57 129/127/57 +f 136/126/58 137/127/58 124/124/58 +f 133/124/56 132/125/56 137/126/56 +f 57/21/4 156/128/4 155/129/4 +f 51/130/5 155/129/5 156/128/5 +f 158/131/5 157/132/5 51/130/5 +f 157/132/2 158/131/2 55/133/2 +f 55/133/2 160/134/2 159/135/2 +f 159/135/6 160/134/6 54/136/6 +f 51/137/1 157/138/1 45/16/1 +f 56/139/1 159/140/1 43/78/1 +f 58/141/1 155/142/1 49/143/1 +f 43/78/1 159/140/1 53/144/1 +f 54/145/3 160/146/3 44/143/3 +f 55/147/3 158/148/3 46/149/3 +f 46/149/3 52/150/3 50/15/3 +f 50/15/3 57/151/3 48/16/3 +f 167/84/39 168/123/39 166/83/39 +f 169/123/58 171/83/58 172/31/58 +f 175/84/58 176/123/58 174/83/58 +f 178/126/5 180/125/5 177/124/5 +f 181/125/2 184/124/2 183/127/2 +f 188/124/5 186/127/5 187/126/5 +f 190/127/2 191/126/2 192/125/2 +f 194/124/56 196/127/56 195/126/56 +f 198/124/57 200/127/57 199/126/57 +f 201/125/39 202/124/39 204/127/39 +f 205/125/58 208/124/58 207/127/58 +f 182/127/56 183/126/56 178/125/56 +f 183/127/58 182/126/58 187/125/58 +f 178/124/57 191/127/57 190/126/57 +f 190/127/39 191/126/39 186/125/39 +f 5/152/1 6/1/1 1/3/1 +f 6/153/2 7/4/2 2/2/2 +f 7/154/3 8/6/3 3/5/3 +f 8/155/4 5/8/4 4/7/4 f 1/3/5 2/2/5 4/7/5 -f 40/11/1 25/257/1 26/258/1 -f 26/258/1 27/259/1 28/260/1 -f 28/260/1 29/261/1 30/262/1 -f 30/262/1 31/263/1 28/260/1 -f 32/9/1 33/264/1 36/10/1 -f 34/265/1 35/266/1 36/10/1 -f 36/10/1 37/267/1 40/11/1 -f 38/268/1 39/269/1 40/11/1 -f 40/11/1 26/258/1 32/9/1 -f 28/260/1 31/263/1 32/9/1 -f 33/264/1 34/265/1 36/10/1 -f 37/267/1 38/268/1 40/11/1 -f 26/258/1 28/260/1 32/9/1 -f 60/270/6 43/12/6 59/14/6 -f 57/271/5 46/15/5 58/17/5 -f 61/272/2 44/18/2 62/20/2 -f 52/273/4 51/21/4 50/23/4 -f 53/274/2 55/24/2 54/26/2 -f 63/275/4 47/27/4 64/29/4 -f 45/276/5 57/30/5 48/32/5 -f 44/277/6 60/33/6 41/35/6 -f 48/278/2 61/36/2 45/38/2 -f 43/279/4 63/39/4 42/41/4 -f 25/73/7 65/42/7 26/44/7 -f 26/44/8 66/43/8 27/46/8 -f 27/280/9 67/47/9 28/49/9 -f 28/49/10 68/48/10 29/51/10 -f 29/51/11 69/50/11 30/53/11 -f 31/281/12 30/53/12 71/54/12 -f 32/282/13 31/55/13 72/57/13 -f 32/282/14 72/57/14 33/59/14 -f 33/59/15 73/58/15 34/61/15 -f 35/283/16 34/61/16 75/62/16 -f 36/284/17 35/63/17 76/65/17 -f 36/284/18 76/65/18 37/67/18 -f 37/67/19 77/66/19 38/69/19 -f 38/69/20 78/68/20 39/71/20 -f 40/75/21 80/72/21 25/73/21 -f 39/285/22 79/74/22 40/75/22 -f 77/286/23 76/76/23 21/78/23 -f 75/287/24 19/79/24 76/80/24 -f 18/83/25 19/79/25 74/82/25 -f 17/86/26 18/83/26 73/85/26 -f 16/89/27 17/86/27 72/88/27 -f 15/92/28 16/89/28 71/91/28 -f 14/95/29 15/92/29 70/94/29 -f 13/288/30 14/95/30 69/97/30 -f 68/289/31 12/98/31 69/100/31 -f 67/290/32 11/101/32 68/102/32 -f 66/291/33 10/103/33 67/104/33 -f 65/292/34 9/105/34 66/106/34 -f 80/293/35 24/107/35 65/108/35 -f 79/294/36 23/109/36 80/110/36 -f 78/295/37 22/111/37 79/112/37 -f 77/296/38 21/78/38 78/113/38 -f 81/116/3 82/297/3 83/298/3 -f 83/298/3 84/299/3 85/300/3 -f 85/300/3 86/301/3 87/302/3 -f 87/302/3 88/303/3 89/114/3 -f 89/114/3 90/304/3 93/115/3 -f 91/305/3 92/306/3 93/115/3 -f 93/115/3 94/307/3 95/308/3 -f 95/308/3 96/309/3 93/115/3 -f 81/116/3 83/298/3 85/300/3 -f 85/300/3 87/302/3 89/114/3 -f 90/304/3 91/305/3 93/115/3 -f 93/115/3 96/309/3 81/116/3 -f 81/116/3 85/300/3 89/114/3 -f 99/310/3 98/311/3 111/119/3 -f 97/312/3 112/313/3 111/119/3 -f 111/119/3 110/314/3 107/117/3 -f 109/315/3 108/316/3 107/117/3 -f 107/117/3 106/317/3 103/118/3 -f 105/318/3 104/319/3 103/118/3 -f 103/118/3 102/320/3 99/310/3 -f 101/321/3 100/322/3 99/310/3 -f 98/311/3 97/312/3 111/119/3 -f 110/314/3 109/315/3 107/117/3 -f 106/317/3 105/318/3 103/118/3 -f 102/320/3 101/321/3 99/310/3 -f 99/310/3 111/119/3 103/118/3 -f 86/323/39 85/120/39 108/122/39 -f 109/324/40 85/123/40 110/125/40 -f 84/325/41 83/126/41 110/128/41 -f 111/326/42 83/129/42 112/131/42 -f 112/327/43 82/132/43 97/134/43 -f 97/328/44 81/135/44 98/137/44 -f 96/329/45 95/138/45 98/140/45 -f 99/330/46 95/141/46 100/143/46 -f 94/331/47 93/144/47 100/146/47 -f 93/332/48 92/147/48 101/149/48 -f 92/333/49 91/150/49 102/152/49 -f 91/334/50 90/153/50 103/155/50 -f 90/335/51 89/156/51 104/158/51 -f 89/336/52 88/159/52 105/161/52 -f 88/337/53 87/162/53 106/164/53 -f 87/338/54 86/165/54 107/167/54 -f 113/339/4 46/168/4 114/170/4 -f 116/340/4 43/171/4 115/173/4 -f 118/341/4 44/174/4 117/176/4 -f 120/342/4 48/177/4 119/179/4 -f 19/79/16 18/83/16 122/181/16 -f 106/180/16 107/343/16 124/184/16 -f 124/184/16 134/344/16 106/180/16 -f 130/345/16 122/181/16 106/180/16 -f 106/180/16 134/344/16 130/345/16 -f 107/343/17 108/182/17 124/184/17 -f 121/346/17 20/77/17 122/181/17 -f 17/86/15 105/185/15 18/83/15 -f 16/89/14 104/186/14 17/86/14 -f 15/92/13 103/187/13 16/89/13 -f 14/95/12 102/188/12 15/92/12 -f 13/288/11 101/189/11 14/95/11 -f 101/347/10 13/99/10 100/190/10 -f 124/348/3 123/191/3 128/193/3 -f 21/78/18 20/77/18 121/346/18 -f 121/346/18 129/196/18 109/195/18 -f 133/194/18 123/183/18 109/195/18 -f 108/182/18 109/195/18 123/183/18 -f 21/78/18 121/346/18 109/195/18 -f 21/78/19 109/195/19 22/111/19 -f 22/111/20 110/197/20 23/109/20 -f 23/109/22 111/198/22 24/107/22 -f 24/107/21 112/199/21 9/105/21 -f 9/105/7 97/200/7 10/103/7 -f 11/101/9 99/202/9 12/98/9 -f 10/103/8 98/201/8 11/101/8 -f 144/349/17 136/215/17 128/193/17 -f 128/193/17 127/192/17 138/204/17 -f 135/206/17 142/203/17 127/192/17 -f 138/204/17 144/349/17 128/193/17 -f 129/350/22 121/351/22 125/352/22 -f 127/192/22 123/353/22 133/207/22 -f 133/207/22 129/350/22 131/205/22 -f 125/352/22 131/205/22 129/350/22 -f 135/206/22 127/192/22 133/207/22 -f 125/352/1 121/208/1 126/210/1 -f 125/352/17 126/210/17 137/212/17 -f 132/354/17 143/211/17 126/210/17 -f 137/212/17 140/222/17 125/352/17 -f 131/205/17 125/352/17 140/222/17 -f 136/215/17 144/349/17 147/219/17 -f 138/204/17 147/219/17 144/349/17 -f 139/213/17 146/355/17 150/228/17 -f 150/228/17 141/214/17 139/213/17 -f 136/215/17 147/219/17 139/213/17 -f 126/210/13 122/356/13 130/357/13 -f 134/216/13 124/358/13 128/193/13 -f 126/210/13 130/357/13 132/354/13 -f 141/214/13 132/354/13 130/357/13 -f 128/193/13 136/215/13 134/216/13 -f 130/357/13 134/216/13 141/214/13 -f 131/205/17 140/222/17 149/221/17 -f 149/221/17 145/217/17 131/205/17 -f 148/218/17 142/203/17 135/206/17 -f 135/206/17 131/205/17 145/217/17 -f 139/213/17 147/219/17 145/217/17 -f 137/212/17 146/220/17 140/222/17 -f 150/227/3 146/223/3 158/225/3 -f 154/240/13 143/226/13 158/225/13 -f 132/354/17 141/214/17 143/211/17 -f 156/359/17 152/229/17 157/231/17 -f 151/360/17 154/232/17 155/224/17 -f 142/361/22 148/233/22 153/235/22 -f 157/234/1 148/233/1 156/237/1 -f 156/237/13 147/236/13 152/229/13 -f 151/242/1 137/239/1 154/240/1 -f 152/229/3 138/238/3 153/230/3 -f 146/362/22 137/239/22 155/243/22 -f 161/363/17 159/244/17 162/246/17 -f 149/364/22 162/247/22 145/248/22 -f 139/249/3 145/248/3 159/244/3 -f 146/365/13 139/249/13 161/250/13 -f 149/364/1 146/251/1 162/247/1 -f 64/366/1 46/367/1 55/368/1 -f 52/369/3 50/370/3 61/371/3 -f 50/370/3 54/372/3 60/373/3 -f 51/374/1 55/368/1 57/375/1 -f 56/25/6 55/24/6 51/21/6 -f 54/372/3 56/376/3 63/377/3 -f 62/378/1 41/379/1 49/380/1 -f 53/381/5 54/382/5 50/23/5 -f 52/369/3 48/383/3 58/384/3 -f 49/380/1 41/379/1 59/385/1 -f 119/386/55 35/387/55 75/388/55 -f 113/389/56 39/390/56 79/391/56 -f 118/392/56 71/393/56 31/394/56 -f 116/395/57 115/396/57 27/397/57 -f 57/398/56 62/399/56 61/400/56 -f 62/401/55 59/402/55 60/403/55 -f 59/404/56 60/405/56 63/406/56 -f 64/407/55 63/408/55 58/409/55 -f 55/368/1 53/410/1 64/366/1 -f 42/411/1 64/366/1 53/410/1 -f 44/412/3 61/371/3 50/370/3 -f 48/383/3 52/369/3 61/371/3 -f 43/413/3 60/373/3 54/372/3 -f 44/412/3 50/370/3 60/373/3 -f 46/367/1 57/375/1 55/368/1 -f 45/414/1 51/374/1 57/375/1 -f 52/273/6 56/25/6 51/21/6 -f 47/415/3 63/377/3 56/376/3 -f 43/413/3 54/372/3 63/377/3 -f 49/380/1 51/374/1 62/378/1 -f 45/414/1 62/378/1 51/374/1 -f 49/22/5 53/381/5 50/23/5 -f 58/384/3 47/415/3 56/376/3 -f 56/376/3 52/369/3 58/384/3 -f 59/385/1 42/411/1 53/410/1 -f 53/410/1 49/380/1 59/385/1 -f 120/416/55 119/386/55 75/388/55 -f 114/417/56 113/389/56 79/391/56 -f 117/418/56 118/392/56 31/394/56 -f 67/419/57 116/395/57 27/397/57 -f 58/420/56 57/398/56 61/400/56 -f 61/421/55 62/401/55 60/403/55 -f 64/422/56 59/404/56 63/406/56 -f 57/423/55 64/407/55 58/409/55 +f 40/11/1 25/156/1 26/157/1 +f 26/157/1 27/158/1 28/159/1 +f 28/159/1 29/160/1 30/161/1 +f 30/161/1 31/162/1 28/159/1 +f 32/9/1 33/163/1 36/10/1 +f 34/164/1 35/165/1 36/10/1 +f 36/10/1 37/166/1 40/11/1 +f 38/167/1 39/168/1 40/11/1 +f 40/11/1 26/157/1 32/9/1 +f 28/159/1 31/162/1 32/9/1 +f 33/163/1 34/164/1 36/10/1 +f 37/166/1 38/167/1 40/11/1 +f 26/157/1 28/159/1 32/9/1 +f 54/136/6 42/12/6 53/14/6 +f 46/169/4 45/15/4 44/17/4 +f 47/170/2 49/18/2 48/20/2 +f 46/169/6 50/19/6 45/15/6 +f 42/171/4 57/21/4 41/23/4 +f 25/52/7 59/24/7 26/26/7 +f 26/26/8 60/25/8 27/17/8 +f 27/17/9 61/27/9 28/29/9 +f 28/29/10 62/28/10 29/31/10 +f 29/79/11 63/32/11 30/34/11 +f 31/36/12 30/34/12 65/35/12 +f 32/172/13 31/36/13 66/37/13 +f 32/172/14 66/37/14 33/39/14 +f 33/39/15 67/38/15 34/41/15 +f 35/43/16 34/41/16 69/42/16 +f 36/173/17 35/43/17 70/44/17 +f 36/173/18 70/44/18 37/46/18 +f 37/46/19 71/45/19 38/48/19 +f 38/48/20 72/47/20 39/50/20 +f 40/53/21 74/51/21 25/52/21 +f 39/50/22 73/49/22 40/53/22 +f 71/30/23 70/28/23 21/55/23 +f 69/25/24 19/56/24 70/27/24 +f 18/57/25 19/56/25 68/51/25 +f 17/58/26 18/57/26 67/47/26 +f 16/59/27 17/58/27 66/44/27 +f 15/60/28 16/59/28 65/40/28 +f 14/61/29 15/60/29 64/37/29 +f 13/174/30 14/61/30 63/33/30 +f 62/175/31 12/62/31 63/64/31 +f 61/176/32 11/65/32 62/66/32 +f 60/177/33 10/67/33 61/68/33 +f 59/178/34 9/69/34 60/70/34 +f 74/179/35 24/71/35 59/72/35 +f 73/180/36 23/73/36 74/74/36 +f 72/181/37 22/75/37 73/76/37 +f 71/182/38 21/55/38 72/77/38 +f 43/16/5 47/78/5 44/17/5 +f 75/82/3 76/183/3 77/184/3 +f 77/184/3 78/185/3 79/186/3 +f 79/186/3 80/187/3 81/188/3 +f 81/188/3 82/189/3 83/80/3 +f 83/80/3 84/190/3 87/81/3 +f 85/191/3 86/192/3 87/81/3 +f 87/81/3 88/193/3 89/194/3 +f 89/194/3 90/195/3 87/81/3 +f 75/82/3 77/184/3 79/186/3 +f 79/186/3 81/188/3 83/80/3 +f 84/190/3 85/191/3 87/81/3 +f 87/81/3 90/195/3 75/82/3 +f 75/82/3 79/186/3 83/80/3 +f 161/123/39 163/83/39 162/84/39 +f 80/196/40 79/85/40 102/87/40 +f 103/86/41 79/88/41 104/90/41 +f 78/197/42 77/91/42 104/90/42 +f 105/92/43 77/93/43 106/95/43 +f 106/95/44 76/96/44 91/98/44 +f 91/98/45 75/99/45 92/101/45 +f 90/198/46 89/102/46 92/101/46 +f 93/103/47 89/104/47 94/106/47 +f 88/199/48 87/107/48 94/106/48 +f 87/200/49 86/109/49 95/111/49 +f 86/201/50 85/112/50 96/110/50 +f 85/202/51 84/114/51 97/113/51 +f 84/203/52 83/116/52 98/115/52 +f 83/204/53 82/118/53 99/117/53 +f 82/205/54 81/120/54 100/119/54 +f 81/206/55 80/122/55 101/121/55 +f 17/58/15 99/117/15 18/57/15 +f 16/59/14 98/115/14 17/58/14 +f 15/60/13 97/113/13 16/59/13 +f 14/61/12 96/110/12 15/60/12 +f 13/174/11 95/111/11 14/61/11 +f 95/108/10 13/63/10 94/106/10 +f 21/55/19 103/86/19 22/75/19 +f 22/75/20 104/90/20 23/73/20 +f 23/73/22 105/92/22 24/71/22 +f 24/71/21 106/95/21 9/69/21 +f 9/69/7 91/98/7 10/67/7 +f 11/65/9 93/103/9 12/62/9 +f 10/67/8 92/101/8 11/65/8 +f 18/57/16 100/119/16 19/56/16 +f 19/56/17 101/121/17 20/54/17 +f 20/54/18 102/87/18 21/55/18 +f 107/123/56 108/84/56 109/83/56 +f 111/31/56 112/83/56 113/84/56 +f 115/123/57 116/84/57 117/83/57 +f 119/31/57 120/83/57 121/84/57 +f 125/127/6 123/124/6 124/126/6 +f 130/124/4 127/125/4 129/127/4 +f 131/125/6 133/126/6 134/124/6 +f 135/124/4 138/125/4 136/127/4 +f 139/125/39 141/126/39 140/124/39 +f 143/125/58 145/126/58 144/124/58 +f 148/124/56 147/125/56 150/127/56 +f 154/124/57 151/125/57 153/127/57 +f 125/124/39 124/125/39 128/127/39 +f 132/124/57 133/125/57 129/127/57 +f 125/125/58 136/126/58 124/124/58 +f 136/127/56 133/124/56 137/126/56 +f 58/22/4 57/21/4 155/129/4 +f 52/207/5 51/130/5 156/128/5 +f 52/207/5 158/131/5 51/130/5 +f 56/208/2 157/132/2 55/133/2 +f 56/208/2 55/133/2 159/135/2 +f 53/14/6 159/135/6 54/136/6 +f 45/16/1 49/143/1 51/137/1 +f 155/142/1 51/137/1 49/143/1 +f 43/78/1 45/16/1 56/139/1 +f 157/138/1 56/139/1 45/16/1 +f 49/143/1 47/171/1 58/141/1 +f 41/209/1 58/141/1 47/171/1 +f 53/144/1 41/209/1 47/171/1 +f 47/171/1 43/78/1 53/144/1 +f 44/143/3 48/16/3 54/145/3 +f 42/210/3 54/145/3 48/16/3 +f 46/149/3 44/143/3 55/147/3 +f 160/146/3 55/147/3 44/143/3 +f 156/211/3 50/15/3 52/150/3 +f 46/149/3 158/148/3 52/150/3 +f 42/210/3 48/16/3 57/151/3 +f 50/15/3 156/211/3 57/151/3 +f 165/31/39 167/84/39 166/83/39 +f 170/84/58 169/123/58 172/31/58 +f 173/31/58 175/84/58 174/83/58 +f 179/127/5 178/126/5 177/124/5 +f 182/126/2 181/125/2 183/127/2 +f 185/125/5 188/124/5 187/126/5 +f 189/124/2 190/127/2 192/125/2 +f 193/125/56 194/124/56 195/126/56 +f 197/125/57 198/124/57 199/126/57 +f 203/126/39 201/125/39 204/127/39 +f 206/126/58 205/125/58 207/127/58 +f 179/124/56 182/127/56 178/125/56 +f 186/124/58 183/127/58 187/125/58 +f 179/125/57 178/124/57 190/126/57 +f 187/124/39 190/127/39 186/125/39 diff --git a/assets/hbm/textures/gui/lilBoySchematic.png b/assets/hbm/textures/gui/lilBoySchematic.png index fd59b9012..93c78e877 100644 Binary files a/assets/hbm/textures/gui/lilBoySchematic.png and b/assets/hbm/textures/gui/lilBoySchematic.png differ diff --git a/assets/hbm/textures/items/battery_advanced_new.png b/assets/hbm/textures/items/battery_advanced_new.png index 86beb9228..c0850c814 100644 Binary files a/assets/hbm/textures/items/battery_advanced_new.png and b/assets/hbm/textures/items/battery_advanced_new.png differ diff --git a/assets/hbm/textures/items/battery_creative_new.png b/assets/hbm/textures/items/battery_creative_new.png index 55f106d8f..b43d4f7e3 100644 Binary files a/assets/hbm/textures/items/battery_creative_new.png and b/assets/hbm/textures/items/battery_creative_new.png differ diff --git a/assets/hbm/textures/items/battery_generic_new.png b/assets/hbm/textures/items/battery_generic_new.png index 09a4e0649..ee5e0700c 100644 Binary files a/assets/hbm/textures/items/battery_generic_new.png and b/assets/hbm/textures/items/battery_generic_new.png differ diff --git a/assets/hbm/textures/items/battery_schrabidium_new.png b/assets/hbm/textures/items/battery_schrabidium_new.png index 672a39b33..46d944174 100644 Binary files a/assets/hbm/textures/items/battery_schrabidium_new.png and b/assets/hbm/textures/items/battery_schrabidium_new.png differ diff --git a/assets/hbm/textures/items/boy_bullet.png b/assets/hbm/textures/items/boy_bullet.png index 0c59307f6..8cbad4a15 100644 Binary files a/assets/hbm/textures/items/boy_bullet.png and b/assets/hbm/textures/items/boy_bullet.png differ diff --git a/assets/hbm/textures/items/boy_shielding.png b/assets/hbm/textures/items/boy_shielding.png index 6ba20ce0d..b3911fae7 100644 Binary files a/assets/hbm/textures/items/boy_shielding.png and b/assets/hbm/textures/items/boy_shielding.png differ diff --git a/assets/hbm/textures/items/boy_target.png b/assets/hbm/textures/items/boy_target.png index e7b27c76c..6e34d3bf5 100644 Binary files a/assets/hbm/textures/items/boy_target.png and b/assets/hbm/textures/items/boy_target.png differ diff --git a/assets/hbm/textures/items/fins_tri_steel.png b/assets/hbm/textures/items/fins_tri_steel.png index e48bae2df..18027d352 100644 Binary files a/assets/hbm/textures/items/fins_tri_steel.png and b/assets/hbm/textures/items/fins_tri_steel.png differ diff --git a/assets/hbm/textures/items/fluorite.png b/assets/hbm/textures/items/fluorite.png index c1464e5b6..3ccd793a9 100644 Binary files a/assets/hbm/textures/items/fluorite.png and b/assets/hbm/textures/items/fluorite.png differ diff --git a/assets/hbm/textures/items/generator_steel.png b/assets/hbm/textures/items/generator_steel.png index 382baa4b9..ab28fc234 100644 Binary files a/assets/hbm/textures/items/generator_steel.png and b/assets/hbm/textures/items/generator_steel.png differ diff --git a/assets/hbm/textures/items/hull_big_aluminium.png b/assets/hbm/textures/items/hull_big_aluminium.png index aaef2b037..d5124c816 100644 Binary files a/assets/hbm/textures/items/hull_big_aluminium.png and b/assets/hbm/textures/items/hull_big_aluminium.png differ diff --git a/assets/hbm/textures/items/hull_big_steel.png b/assets/hbm/textures/items/hull_big_steel.png index 537029e70..d157a62d1 100644 Binary files a/assets/hbm/textures/items/hull_big_steel.png and b/assets/hbm/textures/items/hull_big_steel.png differ diff --git a/assets/hbm/textures/items/hull_big_titanium.png b/assets/hbm/textures/items/hull_big_titanium.png index d6a37cee8..083347333 100644 Binary files a/assets/hbm/textures/items/hull_big_titanium.png and b/assets/hbm/textures/items/hull_big_titanium.png differ diff --git a/assets/hbm/textures/items/hull_small_aluminium.png b/assets/hbm/textures/items/hull_small_aluminium.png index 07a2e6d4a..655f00050 100644 Binary files a/assets/hbm/textures/items/hull_small_aluminium.png and b/assets/hbm/textures/items/hull_small_aluminium.png differ diff --git a/assets/hbm/textures/items/hull_small_steel.png b/assets/hbm/textures/items/hull_small_steel.png index d030296f1..d4296745c 100644 Binary files a/assets/hbm/textures/items/hull_small_steel.png and b/assets/hbm/textures/items/hull_small_steel.png differ diff --git a/assets/hbm/textures/items/ingot_actinium.png b/assets/hbm/textures/items/ingot_actinium.png index 252a22790..45562d2ee 100644 Binary files a/assets/hbm/textures/items/ingot_actinium.png and b/assets/hbm/textures/items/ingot_actinium.png differ diff --git a/assets/hbm/textures/items/ingot_advanced_alloy.png b/assets/hbm/textures/items/ingot_advanced_alloy.png index cecfb0b8e..f25623fb0 100644 Binary files a/assets/hbm/textures/items/ingot_advanced_alloy.png and b/assets/hbm/textures/items/ingot_advanced_alloy.png differ diff --git a/assets/hbm/textures/items/ingot_aluminium.png b/assets/hbm/textures/items/ingot_aluminium.png index dd91b8c3c..2de4943cf 100644 Binary files a/assets/hbm/textures/items/ingot_aluminium.png and b/assets/hbm/textures/items/ingot_aluminium.png differ diff --git a/assets/hbm/textures/items/ingot_astatine.png b/assets/hbm/textures/items/ingot_astatine.png index 7ec56a9b8..766d664f6 100644 Binary files a/assets/hbm/textures/items/ingot_astatine.png and b/assets/hbm/textures/items/ingot_astatine.png differ diff --git a/assets/hbm/textures/items/ingot_australium.png b/assets/hbm/textures/items/ingot_australium.png index dda63447e..b294d260a 100644 Binary files a/assets/hbm/textures/items/ingot_australium.png and b/assets/hbm/textures/items/ingot_australium.png differ diff --git a/assets/hbm/textures/items/ingot_beryllium.png b/assets/hbm/textures/items/ingot_beryllium.png index 3c9c8279a..26a655d7d 100644 Binary files a/assets/hbm/textures/items/ingot_beryllium.png and b/assets/hbm/textures/items/ingot_beryllium.png differ diff --git a/assets/hbm/textures/items/ingot_bromide.png b/assets/hbm/textures/items/ingot_bromide.png index 1df8615f7..22da43ec9 100644 Binary files a/assets/hbm/textures/items/ingot_bromide.png and b/assets/hbm/textures/items/ingot_bromide.png differ diff --git a/assets/hbm/textures/items/ingot_caesium.png b/assets/hbm/textures/items/ingot_caesium.png index e30f2921a..57a1992fa 100644 Binary files a/assets/hbm/textures/items/ingot_caesium.png and b/assets/hbm/textures/items/ingot_caesium.png differ diff --git a/assets/hbm/textures/items/ingot_cerium.png b/assets/hbm/textures/items/ingot_cerium.png index fa9c5cb37..0c7e65f45 100644 Binary files a/assets/hbm/textures/items/ingot_cerium.png and b/assets/hbm/textures/items/ingot_cerium.png differ diff --git a/assets/hbm/textures/items/ingot_cobalt.png b/assets/hbm/textures/items/ingot_cobalt.png index 652614b2e..82d26fe44 100644 Binary files a/assets/hbm/textures/items/ingot_cobalt.png and b/assets/hbm/textures/items/ingot_cobalt.png differ diff --git a/assets/hbm/textures/items/ingot_combine_steel.png b/assets/hbm/textures/items/ingot_combine_steel.png index f2067374b..46408d2e5 100644 Binary files a/assets/hbm/textures/items/ingot_combine_steel.png and b/assets/hbm/textures/items/ingot_combine_steel.png differ diff --git a/assets/hbm/textures/items/ingot_copper.png b/assets/hbm/textures/items/ingot_copper.png index aa6573bfc..f2b5cd4c3 100644 Binary files a/assets/hbm/textures/items/ingot_copper.png and b/assets/hbm/textures/items/ingot_copper.png differ diff --git a/assets/hbm/textures/items/ingot_daffergon.png b/assets/hbm/textures/items/ingot_daffergon.png index 67c13939c..c3dcf4d13 100644 Binary files a/assets/hbm/textures/items/ingot_daffergon.png and b/assets/hbm/textures/items/ingot_daffergon.png differ diff --git a/assets/hbm/textures/items/ingot_desh.png b/assets/hbm/textures/items/ingot_desh.png index 5d6e1e85e..0291578da 100644 Binary files a/assets/hbm/textures/items/ingot_desh.png and b/assets/hbm/textures/items/ingot_desh.png differ diff --git a/assets/hbm/textures/items/ingot_dineutronium.png b/assets/hbm/textures/items/ingot_dineutronium.png index 87f87b2c1..69e0db57f 100644 Binary files a/assets/hbm/textures/items/ingot_dineutronium.png and b/assets/hbm/textures/items/ingot_dineutronium.png differ diff --git a/assets/hbm/textures/items/ingot_dura_steel.png b/assets/hbm/textures/items/ingot_dura_steel.png index 1fa1ed683..42070483a 100644 Binary files a/assets/hbm/textures/items/ingot_dura_steel.png and b/assets/hbm/textures/items/ingot_dura_steel.png differ diff --git a/assets/hbm/textures/items/ingot_euphemium.png b/assets/hbm/textures/items/ingot_euphemium.png index 502a95c5a..9067e1b6b 100644 Binary files a/assets/hbm/textures/items/ingot_euphemium.png and b/assets/hbm/textures/items/ingot_euphemium.png differ diff --git a/assets/hbm/textures/items/ingot_hes.png b/assets/hbm/textures/items/ingot_hes.png index 78fb3e07b..57203d797 100644 Binary files a/assets/hbm/textures/items/ingot_hes.png and b/assets/hbm/textures/items/ingot_hes.png differ diff --git a/assets/hbm/textures/items/ingot_iodine.png b/assets/hbm/textures/items/ingot_iodine.png index fe61e78e7..8160ac180 100644 Binary files a/assets/hbm/textures/items/ingot_iodine.png and b/assets/hbm/textures/items/ingot_iodine.png differ diff --git a/assets/hbm/textures/items/ingot_iron.png b/assets/hbm/textures/items/ingot_iron.png new file mode 100644 index 000000000..02481b875 Binary files /dev/null and b/assets/hbm/textures/items/ingot_iron.png differ diff --git a/assets/hbm/textures/items/ingot_iron_small.png b/assets/hbm/textures/items/ingot_iron_small.png new file mode 100644 index 000000000..7e76764c3 Binary files /dev/null and b/assets/hbm/textures/items/ingot_iron_small.png differ diff --git a/assets/hbm/textures/items/ingot_lanthanium.png b/assets/hbm/textures/items/ingot_lanthanium.png index 6d5fdb7d0..4e99ab5c1 100644 Binary files a/assets/hbm/textures/items/ingot_lanthanium.png and b/assets/hbm/textures/items/ingot_lanthanium.png differ diff --git a/assets/hbm/textures/items/ingot_lead.png b/assets/hbm/textures/items/ingot_lead.png index d34c6fa28..83e02fec6 100644 Binary files a/assets/hbm/textures/items/ingot_lead.png and b/assets/hbm/textures/items/ingot_lead.png differ diff --git a/assets/hbm/textures/items/ingot_les.png b/assets/hbm/textures/items/ingot_les.png index 696a32b41..70770b245 100644 Binary files a/assets/hbm/textures/items/ingot_les.png and b/assets/hbm/textures/items/ingot_les.png differ diff --git a/assets/hbm/textures/items/ingot_magnetized_tungsten.png b/assets/hbm/textures/items/ingot_magnetized_tungsten.png index edea1b776..47d449d8b 100644 Binary files a/assets/hbm/textures/items/ingot_magnetized_tungsten.png and b/assets/hbm/textures/items/ingot_magnetized_tungsten.png differ diff --git a/assets/hbm/textures/items/ingot_mox_fuel.png b/assets/hbm/textures/items/ingot_mox_fuel.png index 9ebb1fc61..884f507da 100644 Binary files a/assets/hbm/textures/items/ingot_mox_fuel.png and b/assets/hbm/textures/items/ingot_mox_fuel.png differ diff --git a/assets/hbm/textures/items/ingot_neodymium.png b/assets/hbm/textures/items/ingot_neodymium.png index 1552d8968..dff32bc7b 100644 Binary files a/assets/hbm/textures/items/ingot_neodymium.png and b/assets/hbm/textures/items/ingot_neodymium.png differ diff --git a/assets/hbm/textures/items/ingot_neptunium.png b/assets/hbm/textures/items/ingot_neptunium.png index 3949ac11b..eb13cea49 100644 Binary files a/assets/hbm/textures/items/ingot_neptunium.png and b/assets/hbm/textures/items/ingot_neptunium.png differ diff --git a/assets/hbm/textures/items/ingot_niobium.png b/assets/hbm/textures/items/ingot_niobium.png index 2e05e786a..000665f79 100644 Binary files a/assets/hbm/textures/items/ingot_niobium.png and b/assets/hbm/textures/items/ingot_niobium.png differ diff --git a/assets/hbm/textures/items/ingot_plutonium.png b/assets/hbm/textures/items/ingot_plutonium.png index e450a9df4..52879a2ee 100644 Binary files a/assets/hbm/textures/items/ingot_plutonium.png and b/assets/hbm/textures/items/ingot_plutonium.png differ diff --git a/assets/hbm/textures/items/ingot_plutonium_fuel.png b/assets/hbm/textures/items/ingot_plutonium_fuel.png index f441bc7a7..0a0124cd7 100644 Binary files a/assets/hbm/textures/items/ingot_plutonium_fuel.png and b/assets/hbm/textures/items/ingot_plutonium_fuel.png differ diff --git a/assets/hbm/textures/items/ingot_polymer.png b/assets/hbm/textures/items/ingot_polymer.png index d259eda1d..8ee8495ce 100644 Binary files a/assets/hbm/textures/items/ingot_polymer.png and b/assets/hbm/textures/items/ingot_polymer.png differ diff --git a/assets/hbm/textures/items/ingot_pu238.png b/assets/hbm/textures/items/ingot_pu238.png index 6e4d99c53..f2758f042 100644 Binary files a/assets/hbm/textures/items/ingot_pu238.png and b/assets/hbm/textures/items/ingot_pu238.png differ diff --git a/assets/hbm/textures/items/ingot_pu239.png b/assets/hbm/textures/items/ingot_pu239.png index b1bf20307..0dc5c7e5d 100644 Binary files a/assets/hbm/textures/items/ingot_pu239.png and b/assets/hbm/textures/items/ingot_pu239.png differ diff --git a/assets/hbm/textures/items/ingot_pu240.png b/assets/hbm/textures/items/ingot_pu240.png index 1ae3965c8..8214d4cbb 100644 Binary files a/assets/hbm/textures/items/ingot_pu240.png and b/assets/hbm/textures/items/ingot_pu240.png differ diff --git a/assets/hbm/textures/items/ingot_red_copper.png b/assets/hbm/textures/items/ingot_red_copper.png index 1ff8aeb57..00b49d769 100644 Binary files a/assets/hbm/textures/items/ingot_red_copper.png and b/assets/hbm/textures/items/ingot_red_copper.png differ diff --git a/assets/hbm/textures/items/ingot_reiium.png b/assets/hbm/textures/items/ingot_reiium.png index 6ae5a0db3..f63295fc8 100644 Binary files a/assets/hbm/textures/items/ingot_reiium.png and b/assets/hbm/textures/items/ingot_reiium.png differ diff --git a/assets/hbm/textures/items/ingot_saturnite.png b/assets/hbm/textures/items/ingot_saturnite.png index 0bcab71ad..b5b61003a 100644 Binary files a/assets/hbm/textures/items/ingot_saturnite.png and b/assets/hbm/textures/items/ingot_saturnite.png differ diff --git a/assets/hbm/textures/items/ingot_schrabidium.png b/assets/hbm/textures/items/ingot_schrabidium.png index e0c69b164..20a2393a2 100644 Binary files a/assets/hbm/textures/items/ingot_schrabidium.png and b/assets/hbm/textures/items/ingot_schrabidium.png differ diff --git a/assets/hbm/textures/items/ingot_schrabidium_fuel.png b/assets/hbm/textures/items/ingot_schrabidium_fuel.png index eca7f21c3..f418c8e61 100644 Binary files a/assets/hbm/textures/items/ingot_schrabidium_fuel.png and b/assets/hbm/textures/items/ingot_schrabidium_fuel.png differ diff --git a/assets/hbm/textures/items/ingot_selenium.png b/assets/hbm/textures/items/ingot_selenium.png index ff9b77458..0f9c81f14 100644 Binary files a/assets/hbm/textures/items/ingot_selenium.png and b/assets/hbm/textures/items/ingot_selenium.png differ diff --git a/assets/hbm/textures/items/ingot_solinium.png b/assets/hbm/textures/items/ingot_solinium.png index ea191cef5..9a9ca07a1 100644 Binary files a/assets/hbm/textures/items/ingot_solinium.png and b/assets/hbm/textures/items/ingot_solinium.png differ diff --git a/assets/hbm/textures/items/ingot_starmetal.png b/assets/hbm/textures/items/ingot_starmetal.png index 5c4484da2..6843c3959 100644 Binary files a/assets/hbm/textures/items/ingot_starmetal.png and b/assets/hbm/textures/items/ingot_starmetal.png differ diff --git a/assets/hbm/textures/items/ingot_steel.png b/assets/hbm/textures/items/ingot_steel.png index 62c497927..8357ef1ca 100644 Binary files a/assets/hbm/textures/items/ingot_steel.png and b/assets/hbm/textures/items/ingot_steel.png differ diff --git a/assets/hbm/textures/items/ingot_strontium.png b/assets/hbm/textures/items/ingot_strontium.png index aa6c7c20a..e6cdd37a5 100644 Binary files a/assets/hbm/textures/items/ingot_strontium.png and b/assets/hbm/textures/items/ingot_strontium.png differ diff --git a/assets/hbm/textures/items/ingot_tennessine.png b/assets/hbm/textures/items/ingot_tennessine.png index 3d4a077d8..c39e0282c 100644 Binary files a/assets/hbm/textures/items/ingot_tennessine.png and b/assets/hbm/textures/items/ingot_tennessine.png differ diff --git a/assets/hbm/textures/items/ingot_th232.png b/assets/hbm/textures/items/ingot_th232.png index 9ef1ba0a6..ec67120ec 100644 Binary files a/assets/hbm/textures/items/ingot_th232.png and b/assets/hbm/textures/items/ingot_th232.png differ diff --git a/assets/hbm/textures/items/ingot_thorium.png b/assets/hbm/textures/items/ingot_thorium.png index 7fd2aec9d..b96b06e2b 100644 Binary files a/assets/hbm/textures/items/ingot_thorium.png and b/assets/hbm/textures/items/ingot_thorium.png differ diff --git a/assets/hbm/textures/items/ingot_thorium_fuel.png b/assets/hbm/textures/items/ingot_thorium_fuel.png index 5c78f43f1..4d23cd278 100644 Binary files a/assets/hbm/textures/items/ingot_thorium_fuel.png and b/assets/hbm/textures/items/ingot_thorium_fuel.png differ diff --git a/assets/hbm/textures/items/ingot_titanium.png b/assets/hbm/textures/items/ingot_titanium.png index 3b0f79421..9ba133aac 100644 Binary files a/assets/hbm/textures/items/ingot_titanium.png and b/assets/hbm/textures/items/ingot_titanium.png differ diff --git a/assets/hbm/textures/items/ingot_tungsten.png b/assets/hbm/textures/items/ingot_tungsten.png index 4bc2ca9a0..6692b7d76 100644 Binary files a/assets/hbm/textures/items/ingot_tungsten.png and b/assets/hbm/textures/items/ingot_tungsten.png differ diff --git a/assets/hbm/textures/items/ingot_u233.png b/assets/hbm/textures/items/ingot_u233.png index dca9de1a6..61ba1a91c 100644 Binary files a/assets/hbm/textures/items/ingot_u233.png and b/assets/hbm/textures/items/ingot_u233.png differ diff --git a/assets/hbm/textures/items/ingot_u235.png b/assets/hbm/textures/items/ingot_u235.png index c43116a70..013428833 100644 Binary files a/assets/hbm/textures/items/ingot_u235.png and b/assets/hbm/textures/items/ingot_u235.png differ diff --git a/assets/hbm/textures/items/ingot_u238.png b/assets/hbm/textures/items/ingot_u238.png index b2f5b584f..57b504eef 100644 Binary files a/assets/hbm/textures/items/ingot_u238.png and b/assets/hbm/textures/items/ingot_u238.png differ diff --git a/assets/hbm/textures/items/ingot_unobtainium.png b/assets/hbm/textures/items/ingot_unobtainium.png index dd03f216c..08db56ca0 100644 Binary files a/assets/hbm/textures/items/ingot_unobtainium.png and b/assets/hbm/textures/items/ingot_unobtainium.png differ diff --git a/assets/hbm/textures/items/ingot_uranium.png b/assets/hbm/textures/items/ingot_uranium.png index 36392f48d..96c253364 100644 Binary files a/assets/hbm/textures/items/ingot_uranium.png and b/assets/hbm/textures/items/ingot_uranium.png differ diff --git a/assets/hbm/textures/items/ingot_uranium_fuel.png b/assets/hbm/textures/items/ingot_uranium_fuel.png index b3e526967..e20b8402c 100644 Binary files a/assets/hbm/textures/items/ingot_uranium_fuel.png and b/assets/hbm/textures/items/ingot_uranium_fuel.png differ diff --git a/assets/hbm/textures/items/ingot_verticium.png b/assets/hbm/textures/items/ingot_verticium.png index 479d3e821..2ac0d8be7 100644 Binary files a/assets/hbm/textures/items/ingot_verticium.png and b/assets/hbm/textures/items/ingot_verticium.png differ diff --git a/assets/hbm/textures/items/ingot_weidanium.png b/assets/hbm/textures/items/ingot_weidanium.png index 23dcdff98..c5b9329d7 100644 Binary files a/assets/hbm/textures/items/ingot_weidanium.png and b/assets/hbm/textures/items/ingot_weidanium.png differ diff --git a/assets/hbm/textures/items/neutron_reflector.png b/assets/hbm/textures/items/neutron_reflector.png index 9e1bb1a29..ce45a91ba 100644 Binary files a/assets/hbm/textures/items/neutron_reflector.png and b/assets/hbm/textures/items/neutron_reflector.png differ diff --git a/assets/hbm/textures/items/nugget_neptunium.png b/assets/hbm/textures/items/nugget_neptunium.png index 867ac7a64..e7ab62132 100644 Binary files a/assets/hbm/textures/items/nugget_neptunium.png and b/assets/hbm/textures/items/nugget_neptunium.png differ diff --git a/assets/hbm/textures/items/pellet_advanced.png b/assets/hbm/textures/items/pellet_advanced.png index b694aed0b..6155ef86f 100644 Binary files a/assets/hbm/textures/items/pellet_advanced.png and b/assets/hbm/textures/items/pellet_advanced.png differ diff --git a/assets/hbm/textures/items/pellet_beryllium.png b/assets/hbm/textures/items/pellet_beryllium.png index 04f4928df..a5e2f78a0 100644 Binary files a/assets/hbm/textures/items/pellet_beryllium.png and b/assets/hbm/textures/items/pellet_beryllium.png differ diff --git a/assets/hbm/textures/items/pellet_hes.png b/assets/hbm/textures/items/pellet_hes.png index 87888df6a..02f8ba8bc 100644 Binary files a/assets/hbm/textures/items/pellet_hes.png and b/assets/hbm/textures/items/pellet_hes.png differ diff --git a/assets/hbm/textures/items/pellet_lead.png b/assets/hbm/textures/items/pellet_lead.png index 47d94382a..1a647b6a3 100644 Binary files a/assets/hbm/textures/items/pellet_lead.png and b/assets/hbm/textures/items/pellet_lead.png differ diff --git a/assets/hbm/textures/items/pellet_les.png b/assets/hbm/textures/items/pellet_les.png index e3ddcfc96..a7cec73fd 100644 Binary files a/assets/hbm/textures/items/pellet_les.png and b/assets/hbm/textures/items/pellet_les.png differ diff --git a/assets/hbm/textures/items/pellet_mes.png b/assets/hbm/textures/items/pellet_mes.png index e3181a01e..fae0a33ed 100644 Binary files a/assets/hbm/textures/items/pellet_mes.png and b/assets/hbm/textures/items/pellet_mes.png differ diff --git a/assets/hbm/textures/items/pellet_neptunium.png b/assets/hbm/textures/items/pellet_neptunium.png index 4f6d2c874..9b5ac03ce 100644 Binary files a/assets/hbm/textures/items/pellet_neptunium.png and b/assets/hbm/textures/items/pellet_neptunium.png differ diff --git a/assets/hbm/textures/items/pellet_schrabidium.png b/assets/hbm/textures/items/pellet_schrabidium.png index 8a4f7ac0d..511125d6d 100644 Binary files a/assets/hbm/textures/items/pellet_schrabidium.png and b/assets/hbm/textures/items/pellet_schrabidium.png differ diff --git a/assets/hbm/textures/items/plate_advanced_alloy.png b/assets/hbm/textures/items/plate_advanced_alloy.png index dcea22779..2b4dc1db0 100644 Binary files a/assets/hbm/textures/items/plate_advanced_alloy.png and b/assets/hbm/textures/items/plate_advanced_alloy.png differ diff --git a/assets/hbm/textures/items/plate_aluminium.png b/assets/hbm/textures/items/plate_aluminium.png index 599cea78c..98bd541dc 100644 Binary files a/assets/hbm/textures/items/plate_aluminium.png and b/assets/hbm/textures/items/plate_aluminium.png differ diff --git a/assets/hbm/textures/items/plate_combine_steel.png b/assets/hbm/textures/items/plate_combine_steel.png index 1757528c0..805ef9b2a 100644 Binary files a/assets/hbm/textures/items/plate_combine_steel.png and b/assets/hbm/textures/items/plate_combine_steel.png differ diff --git a/assets/hbm/textures/items/plate_copper.png b/assets/hbm/textures/items/plate_copper.png index 280e44986..22915ecf5 100644 Binary files a/assets/hbm/textures/items/plate_copper.png and b/assets/hbm/textures/items/plate_copper.png differ diff --git a/assets/hbm/textures/items/plate_desh.png b/assets/hbm/textures/items/plate_desh.png index 081e5ded5..e7fe1ba83 100644 Binary files a/assets/hbm/textures/items/plate_desh.png and b/assets/hbm/textures/items/plate_desh.png differ diff --git a/assets/hbm/textures/items/plate_dineutronium.png b/assets/hbm/textures/items/plate_dineutronium.png index 59bef6521..ef3708302 100644 Binary files a/assets/hbm/textures/items/plate_dineutronium.png and b/assets/hbm/textures/items/plate_dineutronium.png differ diff --git a/assets/hbm/textures/items/plate_euphemium.png b/assets/hbm/textures/items/plate_euphemium.png index 0f329642f..6f4a7edfc 100644 Binary files a/assets/hbm/textures/items/plate_euphemium.png and b/assets/hbm/textures/items/plate_euphemium.png differ diff --git a/assets/hbm/textures/items/plate_gold.png b/assets/hbm/textures/items/plate_gold.png index 4d12b301f..32664effe 100644 Binary files a/assets/hbm/textures/items/plate_gold.png and b/assets/hbm/textures/items/plate_gold.png differ diff --git a/assets/hbm/textures/items/plate_iron.png b/assets/hbm/textures/items/plate_iron.png index dc8853d1d..857fae4f5 100644 Binary files a/assets/hbm/textures/items/plate_iron.png and b/assets/hbm/textures/items/plate_iron.png differ diff --git a/assets/hbm/textures/items/plate_kevlar.png b/assets/hbm/textures/items/plate_kevlar.png index 7c2c41326..cf32dbb30 100644 Binary files a/assets/hbm/textures/items/plate_kevlar.png and b/assets/hbm/textures/items/plate_kevlar.png differ diff --git a/assets/hbm/textures/items/plate_lead.png b/assets/hbm/textures/items/plate_lead.png index 911c5b818..982f13a88 100644 Binary files a/assets/hbm/textures/items/plate_lead.png and b/assets/hbm/textures/items/plate_lead.png differ diff --git a/assets/hbm/textures/items/plate_mixed.png b/assets/hbm/textures/items/plate_mixed.png index df388da15..8a5273f53 100644 Binary files a/assets/hbm/textures/items/plate_mixed.png and b/assets/hbm/textures/items/plate_mixed.png differ diff --git a/assets/hbm/textures/items/plate_paa.png b/assets/hbm/textures/items/plate_paa.png index db8b7bea1..3ce695ac1 100644 Binary files a/assets/hbm/textures/items/plate_paa.png and b/assets/hbm/textures/items/plate_paa.png differ diff --git a/assets/hbm/textures/items/plate_polymer.png b/assets/hbm/textures/items/plate_polymer.png index 0d77c8f28..a1a901356 100644 Binary files a/assets/hbm/textures/items/plate_polymer.png and b/assets/hbm/textures/items/plate_polymer.png differ diff --git a/assets/hbm/textures/items/plate_saturnite.png b/assets/hbm/textures/items/plate_saturnite.png index 2722749eb..ef0b49e24 100644 Binary files a/assets/hbm/textures/items/plate_saturnite.png and b/assets/hbm/textures/items/plate_saturnite.png differ diff --git a/assets/hbm/textures/items/plate_schrabidium.png b/assets/hbm/textures/items/plate_schrabidium.png index 46faf14b1..b1134d6d7 100644 Binary files a/assets/hbm/textures/items/plate_schrabidium.png and b/assets/hbm/textures/items/plate_schrabidium.png differ diff --git a/assets/hbm/textures/items/plate_steel.png b/assets/hbm/textures/items/plate_steel.png index 93f8200a5..e29cc7f44 100644 Binary files a/assets/hbm/textures/items/plate_steel.png and b/assets/hbm/textures/items/plate_steel.png differ diff --git a/assets/hbm/textures/items/plate_titanium.png b/assets/hbm/textures/items/plate_titanium.png index 35c23403f..caa15bb4e 100644 Binary files a/assets/hbm/textures/items/plate_titanium.png and b/assets/hbm/textures/items/plate_titanium.png differ diff --git a/assets/hbm/textures/items/potential plate.png b/assets/hbm/textures/items/potential plate.png new file mode 100644 index 000000000..7c6f69591 Binary files /dev/null and b/assets/hbm/textures/items/potential plate.png differ diff --git a/assets/hbm/textures/items/powder_actinium.png b/assets/hbm/textures/items/powder_actinium.png index 4add4915d..6359b8cde 100644 Binary files a/assets/hbm/textures/items/powder_actinium.png and b/assets/hbm/textures/items/powder_actinium.png differ diff --git a/assets/hbm/textures/items/powder_advanced_alloy.png b/assets/hbm/textures/items/powder_advanced_alloy.png index 029ff191a..f2e18bf73 100644 Binary files a/assets/hbm/textures/items/powder_advanced_alloy.png and b/assets/hbm/textures/items/powder_advanced_alloy.png differ diff --git a/assets/hbm/textures/items/powder_aluminium.png b/assets/hbm/textures/items/powder_aluminium.png index 35742891f..9816dadd2 100644 Binary files a/assets/hbm/textures/items/powder_aluminium.png and b/assets/hbm/textures/items/powder_aluminium.png differ diff --git a/assets/hbm/textures/items/powder_astatine.png b/assets/hbm/textures/items/powder_astatine.png index 5c5d0e954..dd3ccb811 100644 Binary files a/assets/hbm/textures/items/powder_astatine.png and b/assets/hbm/textures/items/powder_astatine.png differ diff --git a/assets/hbm/textures/items/powder_australium.png b/assets/hbm/textures/items/powder_australium.png index 7870153a8..8a670496f 100644 Binary files a/assets/hbm/textures/items/powder_australium.png and b/assets/hbm/textures/items/powder_australium.png differ diff --git a/assets/hbm/textures/items/powder_beryllium.png b/assets/hbm/textures/items/powder_beryllium.png index 77e0df52d..3989a68ff 100644 Binary files a/assets/hbm/textures/items/powder_beryllium.png and b/assets/hbm/textures/items/powder_beryllium.png differ diff --git a/assets/hbm/textures/items/powder_bromine.png b/assets/hbm/textures/items/powder_bromine.png index 4320f750c..adeb97cb9 100644 Binary files a/assets/hbm/textures/items/powder_bromine.png and b/assets/hbm/textures/items/powder_bromine.png differ diff --git a/assets/hbm/textures/items/powder_caesium.png b/assets/hbm/textures/items/powder_caesium.png index be2317107..9cf79e96b 100644 Binary files a/assets/hbm/textures/items/powder_caesium.png and b/assets/hbm/textures/items/powder_caesium.png differ diff --git a/assets/hbm/textures/items/powder_cerium.png b/assets/hbm/textures/items/powder_cerium.png index 399cca8b3..b07541ecb 100644 Binary files a/assets/hbm/textures/items/powder_cerium.png and b/assets/hbm/textures/items/powder_cerium.png differ diff --git a/assets/hbm/textures/items/powder_cloud.png b/assets/hbm/textures/items/powder_cloud.png index 0451673fc..94a25916f 100644 Binary files a/assets/hbm/textures/items/powder_cloud.png and b/assets/hbm/textures/items/powder_cloud.png differ diff --git a/assets/hbm/textures/items/powder_coal.png b/assets/hbm/textures/items/powder_coal.png index fc507721a..8e6cea196 100644 Binary files a/assets/hbm/textures/items/powder_coal.png and b/assets/hbm/textures/items/powder_coal.png differ diff --git a/assets/hbm/textures/items/powder_cobalt.png b/assets/hbm/textures/items/powder_cobalt.png index 52897c805..fbfacc574 100644 Binary files a/assets/hbm/textures/items/powder_cobalt.png and b/assets/hbm/textures/items/powder_cobalt.png differ diff --git a/assets/hbm/textures/items/powder_combine_steel.png b/assets/hbm/textures/items/powder_combine_steel.png index 951f6ed09..db1f193d0 100644 Binary files a/assets/hbm/textures/items/powder_combine_steel.png and b/assets/hbm/textures/items/powder_combine_steel.png differ diff --git a/assets/hbm/textures/items/powder_copper.png b/assets/hbm/textures/items/powder_copper.png index e6955b2b1..15e48cb01 100644 Binary files a/assets/hbm/textures/items/powder_copper.png and b/assets/hbm/textures/items/powder_copper.png differ diff --git a/assets/hbm/textures/items/powder_daffergon.png b/assets/hbm/textures/items/powder_daffergon.png index 1546cc4f3..f9afea212 100644 Binary files a/assets/hbm/textures/items/powder_daffergon.png and b/assets/hbm/textures/items/powder_daffergon.png differ diff --git a/assets/hbm/textures/items/powder_desh.png b/assets/hbm/textures/items/powder_desh.png index 5ae4a5f24..d852380d5 100644 Binary files a/assets/hbm/textures/items/powder_desh.png and b/assets/hbm/textures/items/powder_desh.png differ diff --git a/assets/hbm/textures/items/powder_desh_mix.png b/assets/hbm/textures/items/powder_desh_mix.png index 11239d9f1..1f80b3cf5 100644 Binary files a/assets/hbm/textures/items/powder_desh_mix.png and b/assets/hbm/textures/items/powder_desh_mix.png differ diff --git a/assets/hbm/textures/items/powder_diamond.png b/assets/hbm/textures/items/powder_diamond.png index 230258c61..e926b715d 100644 Binary files a/assets/hbm/textures/items/powder_diamond.png and b/assets/hbm/textures/items/powder_diamond.png differ diff --git a/assets/hbm/textures/items/powder_dineutronium.png b/assets/hbm/textures/items/powder_dineutronium.png index 2f6ee9fbc..3f5919231 100644 Binary files a/assets/hbm/textures/items/powder_dineutronium.png and b/assets/hbm/textures/items/powder_dineutronium.png differ diff --git a/assets/hbm/textures/items/powder_dura_steel.png b/assets/hbm/textures/items/powder_dura_steel.png index 1e64c4a89..6dc3e599d 100644 Binary files a/assets/hbm/textures/items/powder_dura_steel.png and b/assets/hbm/textures/items/powder_dura_steel.png differ diff --git a/assets/hbm/textures/items/powder_emerald.png b/assets/hbm/textures/items/powder_emerald.png index 09520b6fa..4c8aacf3e 100644 Binary files a/assets/hbm/textures/items/powder_emerald.png and b/assets/hbm/textures/items/powder_emerald.png differ diff --git a/assets/hbm/textures/items/powder_energy_alt.png b/assets/hbm/textures/items/powder_energy_alt.png index 6f4481b22..4c46651c4 100644 Binary files a/assets/hbm/textures/items/powder_energy_alt.png and b/assets/hbm/textures/items/powder_energy_alt.png differ diff --git a/assets/hbm/textures/items/powder_euphemium.png b/assets/hbm/textures/items/powder_euphemium.png index e5880acca..4ea689cca 100644 Binary files a/assets/hbm/textures/items/powder_euphemium.png and b/assets/hbm/textures/items/powder_euphemium.png differ diff --git a/assets/hbm/textures/items/powder_fire.png b/assets/hbm/textures/items/powder_fire.png index 059122110..50cff646a 100644 Binary files a/assets/hbm/textures/items/powder_fire.png and b/assets/hbm/textures/items/powder_fire.png differ diff --git a/assets/hbm/textures/items/powder_gold.png b/assets/hbm/textures/items/powder_gold.png index 8f9a1525e..e0352986b 100644 Binary files a/assets/hbm/textures/items/powder_gold.png and b/assets/hbm/textures/items/powder_gold.png differ diff --git a/assets/hbm/textures/items/powder_ice.png b/assets/hbm/textures/items/powder_ice.png index f3820823e..75ea89240 100644 Binary files a/assets/hbm/textures/items/powder_ice.png and b/assets/hbm/textures/items/powder_ice.png differ diff --git a/assets/hbm/textures/items/powder_iodine.png b/assets/hbm/textures/items/powder_iodine.png index 12f7eff50..7f13cee60 100644 Binary files a/assets/hbm/textures/items/powder_iodine.png and b/assets/hbm/textures/items/powder_iodine.png differ diff --git a/assets/hbm/textures/items/powder_iron.png b/assets/hbm/textures/items/powder_iron.png index a97dd5dd6..2069f1918 100644 Binary files a/assets/hbm/textures/items/powder_iron.png and b/assets/hbm/textures/items/powder_iron.png differ diff --git a/assets/hbm/textures/items/powder_lanthanium.png b/assets/hbm/textures/items/powder_lanthanium.png index c1d1bf66e..9c58186f9 100644 Binary files a/assets/hbm/textures/items/powder_lanthanium.png and b/assets/hbm/textures/items/powder_lanthanium.png differ diff --git a/assets/hbm/textures/items/powder_lapis.png b/assets/hbm/textures/items/powder_lapis.png index 5262d57f2..90494daa1 100644 Binary files a/assets/hbm/textures/items/powder_lapis.png and b/assets/hbm/textures/items/powder_lapis.png differ diff --git a/assets/hbm/textures/items/powder_lead.png b/assets/hbm/textures/items/powder_lead.png index 0a32a56fc..6f73642de 100644 Binary files a/assets/hbm/textures/items/powder_lead.png and b/assets/hbm/textures/items/powder_lead.png differ diff --git a/assets/hbm/textures/items/powder_lignite.png b/assets/hbm/textures/items/powder_lignite.png index 4b629c87f..b573829f7 100644 Binary files a/assets/hbm/textures/items/powder_lignite.png and b/assets/hbm/textures/items/powder_lignite.png differ diff --git a/assets/hbm/textures/items/powder_lithium.png b/assets/hbm/textures/items/powder_lithium.png index 2def3fee1..bd5e90c04 100644 Binary files a/assets/hbm/textures/items/powder_lithium.png and b/assets/hbm/textures/items/powder_lithium.png differ diff --git a/assets/hbm/textures/items/powder_magic.png b/assets/hbm/textures/items/powder_magic.png index 94e50a7ca..8e60dd451 100644 Binary files a/assets/hbm/textures/items/powder_magic.png and b/assets/hbm/textures/items/powder_magic.png differ diff --git a/assets/hbm/textures/items/powder_magnetized_tungsten.png b/assets/hbm/textures/items/powder_magnetized_tungsten.png index 984624b71..c47df49c2 100644 Binary files a/assets/hbm/textures/items/powder_magnetized_tungsten.png and b/assets/hbm/textures/items/powder_magnetized_tungsten.png differ diff --git a/assets/hbm/textures/items/powder_meteorite.png b/assets/hbm/textures/items/powder_meteorite.png index 139b29b5c..c9021f591 100644 Binary files a/assets/hbm/textures/items/powder_meteorite.png and b/assets/hbm/textures/items/powder_meteorite.png differ diff --git a/assets/hbm/textures/items/powder_neodymium.png b/assets/hbm/textures/items/powder_neodymium.png index d2b5aa44d..4dc2b0fcd 100644 Binary files a/assets/hbm/textures/items/powder_neodymium.png and b/assets/hbm/textures/items/powder_neodymium.png differ diff --git a/assets/hbm/textures/items/powder_neptunium.png b/assets/hbm/textures/items/powder_neptunium.png index 2e13a7af1..6a658bc01 100644 Binary files a/assets/hbm/textures/items/powder_neptunium.png and b/assets/hbm/textures/items/powder_neptunium.png differ diff --git a/assets/hbm/textures/items/powder_niobium.png b/assets/hbm/textures/items/powder_niobium.png index a259e29c1..518f89121 100644 Binary files a/assets/hbm/textures/items/powder_niobium.png and b/assets/hbm/textures/items/powder_niobium.png differ diff --git a/assets/hbm/textures/items/powder_nitan_mix.png b/assets/hbm/textures/items/powder_nitan_mix.png index aae036fbd..9cf657516 100644 Binary files a/assets/hbm/textures/items/powder_nitan_mix.png and b/assets/hbm/textures/items/powder_nitan_mix.png differ diff --git a/assets/hbm/textures/items/powder_plutonium.png b/assets/hbm/textures/items/powder_plutonium.png index 7f52da135..3ea58c895 100644 Binary files a/assets/hbm/textures/items/powder_plutonium.png and b/assets/hbm/textures/items/powder_plutonium.png differ diff --git a/assets/hbm/textures/items/powder_poison.png b/assets/hbm/textures/items/powder_poison.png index 3d53d2192..0099243da 100644 Binary files a/assets/hbm/textures/items/powder_poison.png and b/assets/hbm/textures/items/powder_poison.png differ diff --git a/assets/hbm/textures/items/powder_polymer.png b/assets/hbm/textures/items/powder_polymer.png index cf4f93ca6..718537548 100644 Binary files a/assets/hbm/textures/items/powder_polymer.png and b/assets/hbm/textures/items/powder_polymer.png differ diff --git a/assets/hbm/textures/items/powder_quartz.png b/assets/hbm/textures/items/powder_quartz.png index bd1157268..b122ec91d 100644 Binary files a/assets/hbm/textures/items/powder_quartz.png and b/assets/hbm/textures/items/powder_quartz.png differ diff --git a/assets/hbm/textures/items/powder_red_copper.png b/assets/hbm/textures/items/powder_red_copper.png index 684c597db..d1027d60c 100644 Binary files a/assets/hbm/textures/items/powder_red_copper.png and b/assets/hbm/textures/items/powder_red_copper.png differ diff --git a/assets/hbm/textures/items/powder_reiium.png b/assets/hbm/textures/items/powder_reiium.png index 3670d5540..52bd800c8 100644 Binary files a/assets/hbm/textures/items/powder_reiium.png and b/assets/hbm/textures/items/powder_reiium.png differ diff --git a/assets/hbm/textures/items/powder_schrabidium.png b/assets/hbm/textures/items/powder_schrabidium.png index 782e322b0..0c60ddb00 100644 Binary files a/assets/hbm/textures/items/powder_schrabidium.png and b/assets/hbm/textures/items/powder_schrabidium.png differ diff --git a/assets/hbm/textures/items/powder_spark_mix.png b/assets/hbm/textures/items/powder_spark_mix.png index 74c3907f4..bea134159 100644 Binary files a/assets/hbm/textures/items/powder_spark_mix.png and b/assets/hbm/textures/items/powder_spark_mix.png differ diff --git a/assets/hbm/textures/items/powder_steel.png b/assets/hbm/textures/items/powder_steel.png index 7027b9e29..d2ec707d6 100644 Binary files a/assets/hbm/textures/items/powder_steel.png and b/assets/hbm/textures/items/powder_steel.png differ diff --git a/assets/hbm/textures/items/powder_strontium.png b/assets/hbm/textures/items/powder_strontium.png index 3ab9b54ea..10706acf4 100644 Binary files a/assets/hbm/textures/items/powder_strontium.png and b/assets/hbm/textures/items/powder_strontium.png differ diff --git a/assets/hbm/textures/items/powder_tennessine.png b/assets/hbm/textures/items/powder_tennessine.png index 8e19254e3..281b9652b 100644 Binary files a/assets/hbm/textures/items/powder_tennessine.png and b/assets/hbm/textures/items/powder_tennessine.png differ diff --git a/assets/hbm/textures/items/powder_thermite.png b/assets/hbm/textures/items/powder_thermite.png index 4fe5c8fa8..178515d78 100644 Binary files a/assets/hbm/textures/items/powder_thermite.png and b/assets/hbm/textures/items/powder_thermite.png differ diff --git a/assets/hbm/textures/items/powder_thorium.png b/assets/hbm/textures/items/powder_thorium.png index 78c56cfeb..4da90e7d6 100644 Binary files a/assets/hbm/textures/items/powder_thorium.png and b/assets/hbm/textures/items/powder_thorium.png differ diff --git a/assets/hbm/textures/items/powder_titanium.png b/assets/hbm/textures/items/powder_titanium.png index 6502fba87..be0593e41 100644 Binary files a/assets/hbm/textures/items/powder_titanium.png and b/assets/hbm/textures/items/powder_titanium.png differ diff --git a/assets/hbm/textures/items/powder_tungsten.png b/assets/hbm/textures/items/powder_tungsten.png index 65bb0342b..e8682f7c6 100644 Binary files a/assets/hbm/textures/items/powder_tungsten.png and b/assets/hbm/textures/items/powder_tungsten.png differ diff --git a/assets/hbm/textures/items/powder_unobtainium.png b/assets/hbm/textures/items/powder_unobtainium.png index 43350795f..2f26e8148 100644 Binary files a/assets/hbm/textures/items/powder_unobtainium.png and b/assets/hbm/textures/items/powder_unobtainium.png differ diff --git a/assets/hbm/textures/items/powder_uranium.png b/assets/hbm/textures/items/powder_uranium.png index 833a87b09..ef65f4772 100644 Binary files a/assets/hbm/textures/items/powder_uranium.png and b/assets/hbm/textures/items/powder_uranium.png differ diff --git a/assets/hbm/textures/items/powder_verticium.png b/assets/hbm/textures/items/powder_verticium.png index 9b082e73c..5346e7b44 100644 Binary files a/assets/hbm/textures/items/powder_verticium.png and b/assets/hbm/textures/items/powder_verticium.png differ diff --git a/assets/hbm/textures/items/powder_weidanium.png b/assets/hbm/textures/items/powder_weidanium.png index 0bd182d65..cc7c044d1 100644 Binary files a/assets/hbm/textures/items/powder_weidanium.png and b/assets/hbm/textures/items/powder_weidanium.png differ diff --git a/assets/hbm/textures/items/powder_yellowcake.png b/assets/hbm/textures/items/powder_yellowcake.png index be32a231a..63000e90b 100644 Binary files a/assets/hbm/textures/items/powder_yellowcake.png and b/assets/hbm/textures/items/powder_yellowcake.png differ diff --git a/assets/hbm/textures/items/pudding.png b/assets/hbm/textures/items/pudding.png new file mode 100644 index 000000000..369c32384 Binary files /dev/null and b/assets/hbm/textures/items/pudding.png differ diff --git a/assets/hbm/textures/models/CapeHoboy.png b/assets/hbm/textures/models/CapeHoboy.png index 49c2bceae..74dc8a966 100644 Binary files a/assets/hbm/textures/models/CapeHoboy.png and b/assets/hbm/textures/models/CapeHoboy.png differ diff --git a/assets/hbm/textures/models/lilboy.png b/assets/hbm/textures/models/lilboy.png new file mode 100644 index 000000000..19b7f0670 Binary files /dev/null and b/assets/hbm/textures/models/lilboy.png differ diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index c47fb1441..7ae944b38 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -18,6 +18,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; import net.minecraft.block.BlockFalling; +import net.minecraft.block.BlockStairs; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.block.material.MaterialLiquid; @@ -711,6 +712,7 @@ public class ModBlocks { public static Block pink_log; public static Block pink_planks; public static Block pink_slab; + public static Block pink_double_slab; public static Block pink_stairs; public static Block ff; @@ -1263,6 +1265,12 @@ public class ModBlocks { dummy_plate_cargo = new DummyBlockMachine(Material.iron, guiID_dock, sat_dock).setBounds(0, 0, 0, 16, 8, 16).setBlockName("dummy_plate_cargo").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); ntm_dirt = new BlockNTMDirt().setBlockName("ntm_dirt").setHardness(0.5F).setStepSound(Block.soundTypeGravel).setCreativeTab(null).setBlockTextureName("dirt"); + + pink_log = new BlockPinkLog().setBlockName("pink_log").setHardness(0.5F).setStepSound(Block.soundTypeWood).setCreativeTab(null); + pink_planks = new BlockGeneric(Material.wood).setBlockName("pink_planks").setStepSound(Block.soundTypeWood).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":pink_planks"); + pink_slab = new BlockPinkSlab(false, Material.wood).setBlockName("pink_slab").setStepSound(Block.soundTypeWood).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":pink_planks"); + pink_double_slab = new BlockPinkSlab(true, Material.wood).setBlockName("pink_double_slab").setStepSound(Block.soundTypeWood).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":pink_planks"); + pink_stairs = new BlockPinkStairs(pink_planks, 0).setBlockName("pink_stairs").setStepSound(Block.soundTypeWood).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":pink_planks"); ff = new BlockFF(Material.iron).setBlockName("ff").setHardness(0.5F).setStepSound(Block.soundTypeGravel).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":code"); } @@ -1826,6 +1834,11 @@ public class ModBlocks { GameRegistry.registerBlock(cheater_virus, cheater_virus.getUnlocalizedName()); GameRegistry.registerBlock(cheater_virus_seed, cheater_virus_seed.getUnlocalizedName()); GameRegistry.registerBlock(ntm_dirt, ntm_dirt.getUnlocalizedName()); + GameRegistry.registerBlock(pink_log, pink_log.getUnlocalizedName()); + GameRegistry.registerBlock(pink_planks, pink_planks.getUnlocalizedName()); + GameRegistry.registerBlock(pink_slab, pink_slab.getUnlocalizedName()); + GameRegistry.registerBlock(pink_double_slab, pink_double_slab.getUnlocalizedName()); + GameRegistry.registerBlock(pink_stairs, pink_stairs.getUnlocalizedName()); GameRegistry.registerBlock(ff, ff.getUnlocalizedName()); } } diff --git a/com/hbm/blocks/generic/BlockCanCrate.java b/com/hbm/blocks/generic/BlockCanCrate.java index 95176c6fa..0f2b591dc 100644 --- a/com/hbm/blocks/generic/BlockCanCrate.java +++ b/com/hbm/blocks/generic/BlockCanCrate.java @@ -95,6 +95,7 @@ public class BlockCanCrate extends Block { items.add(ModItems.can_luna); items.add(ModItems.can_breen); items.add(ModItems.can_bepis); + items.add(ModItems.pudding); return items.get(rand.nextInt(items.size())); } diff --git a/com/hbm/blocks/generic/BlockPinkLog.java b/com/hbm/blocks/generic/BlockPinkLog.java new file mode 100644 index 000000000..cd6ed4f7c --- /dev/null +++ b/com/hbm/blocks/generic/BlockPinkLog.java @@ -0,0 +1,21 @@ +package com.hbm.blocks.generic; + +import com.hbm.lib.RefStrings; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.BlockLog; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + +public class BlockPinkLog extends BlockLog { + + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister reg) + { + this.field_150167_a = new IIcon[1]; + this.field_150166_b = new IIcon[1]; + this.field_150167_a[0] = reg.registerIcon("log_oak"); + this.field_150166_b[0] = reg.registerIcon(RefStrings.MODID + ":pink_log"); + } +} diff --git a/com/hbm/blocks/generic/BlockPinkSlab.java b/com/hbm/blocks/generic/BlockPinkSlab.java new file mode 100644 index 000000000..0a40ad9c1 --- /dev/null +++ b/com/hbm/blocks/generic/BlockPinkSlab.java @@ -0,0 +1,34 @@ +package com.hbm.blocks.generic; + +import java.util.Random; + +import com.hbm.blocks.ModBlocks; + +import net.minecraft.block.BlockSlab; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class BlockPinkSlab extends BlockSlab { + + public BlockPinkSlab(boolean bool, Material mat) { + super(bool, mat); + } + + public Item getItemDropped(int i, Random rand, int j) + { + return Item.getItemFromBlock(ModBlocks.pink_slab); + } + + protected ItemStack createStackedBlock(int i) + { + return new ItemStack(Item.getItemFromBlock(ModBlocks.pink_slab), 2, i & 7); + } + + @Override + public String func_150002_b(int p_150002_1_) { + return null; + } + +} diff --git a/com/hbm/blocks/generic/BlockPinkStairs.java b/com/hbm/blocks/generic/BlockPinkStairs.java new file mode 100644 index 000000000..501caa6ac --- /dev/null +++ b/com/hbm/blocks/generic/BlockPinkStairs.java @@ -0,0 +1,12 @@ +package com.hbm.blocks.generic; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockStairs; + +public class BlockPinkStairs extends BlockStairs { + + public BlockPinkStairs(Block p_i45428_1_, int p_i45428_2_) { + super(p_i45428_1_, p_i45428_2_); + } + +} diff --git a/com/hbm/entity/logic/EntityBomber.java b/com/hbm/entity/logic/EntityBomber.java index 3ff58a10b..105c844d9 100644 --- a/com/hbm/entity/logic/EntityBomber.java +++ b/com/hbm/entity/logic/EntityBomber.java @@ -201,6 +201,9 @@ public class EntityBomber extends Entity implements IChunkLoader { worldObj.spawnEntityInWorld(zeta); } } + + if(!worldObj.isRemote) + loadNeighboringChunks((int)(posX / 16), (int)(posZ / 16)); } @@ -212,6 +215,7 @@ public class EntityBomber extends Entity implements IChunkLoader { vector.zCoord *= MainRegistry.enableBomberShortMode ? 1 : 2; this.setLocationAndAngles(x - vector.xCoord * 100, y + 50, z - vector.zCoord * 100, 0.0F, 0.0F); + this.loadNeighboringChunks((int)(x / 16), (int)(z / 16)); this.motionX = vector.xCoord; this.motionZ = vector.zCoord; diff --git a/com/hbm/inventory/container/ContainerNukeBoy.java b/com/hbm/inventory/container/ContainerNukeBoy.java index 73b89df1c..439ad03b6 100644 --- a/com/hbm/inventory/container/ContainerNukeBoy.java +++ b/com/hbm/inventory/container/ContainerNukeBoy.java @@ -26,13 +26,13 @@ private TileEntityNukeBoy nukeBoy; { for(int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); + this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18 + 56)); } } for(int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142)); + this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142 + 56)); } } diff --git a/com/hbm/inventory/gui/GUINukeBoy.java b/com/hbm/inventory/gui/GUINukeBoy.java index c4d018d3a..330d892e4 100644 --- a/com/hbm/inventory/gui/GUINukeBoy.java +++ b/com/hbm/inventory/gui/GUINukeBoy.java @@ -3,6 +3,7 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerNukeBoy; +import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import com.hbm.tileentity.bomb.TileEntityNukeBoy; @@ -22,7 +23,7 @@ public class GUINukeBoy extends GuiContainer { testNuke = tedf; this.xSize = 176; - this.ySize = 166; + this.ySize = 222; } @Override @@ -41,8 +42,19 @@ public class GUINukeBoy extends GuiContainer { if(testNuke.isReady()) { - drawTexturedModalRect(guiLeft + 142, guiTop + 36, 176, 0, 16, 16); + drawTexturedModalRect(guiLeft + 142, guiTop + 90, 176, 0, 16, 16); } + + if(testNuke.getStackInSlot(0) != null && testNuke.getStackInSlot(0).getItem() == ModItems.boy_shielding) + drawTexturedModalRect(guiLeft + 27, guiTop + 87, 176, 16, 21, 22); + if(testNuke.getStackInSlot(1) != null && testNuke.getStackInSlot(1).getItem() == ModItems.boy_target) + drawTexturedModalRect(guiLeft + 27, guiTop + 89, 176, 38, 21, 18); + if(testNuke.getStackInSlot(2) != null && testNuke.getStackInSlot(2).getItem() == ModItems.boy_bullet) + drawTexturedModalRect(guiLeft + 74, guiTop + 94, 176, 57, 19, 8); + if(testNuke.getStackInSlot(3) != null && testNuke.getStackInSlot(3).getItem() == ModItems.boy_propellant) + drawTexturedModalRect(guiLeft + 92, guiTop + 95, 176, 66, 12, 6); + if(testNuke.getStackInSlot(4) != null && testNuke.getStackInSlot(4).getItem() == ModItems.boy_igniter) + drawTexturedModalRect(guiLeft + 107, guiTop + 91, 176, 75, 16, 14); } } diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index a28682928..b9f1707b7 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -1251,6 +1251,7 @@ public class ModItems { public static Item fooditem; public static Item twinkie; public static Item static_sandwich; + public static Item pudding; public static Item med_ipecac; public static Item med_ptsd; @@ -2943,6 +2944,7 @@ public class ModItems { fooditem = new ItemLemon(2, 5, false).setUnlocalizedName("fooditem").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":fooditem"); twinkie = new ItemLemon(3, 5, false).setUnlocalizedName("twinkie").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":twinkie"); static_sandwich = new ItemLemon(6, 5, false).setUnlocalizedName("static_sandwich").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":static_sandwich"); + pudding = new ItemLemon(6, 15, false).setUnlocalizedName("pudding").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pudding"); canteen_13 = new ItemCanteen(1 * 60 * 20).setUnlocalizedName("canteen_13").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_13"); canteen_vodka = new ItemCanteen(3 * 60 * 20).setUnlocalizedName("canteen_vodka").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_vodka"); @@ -4930,6 +4932,7 @@ public class ModItems { GameRegistry.registerItem(fooditem, fooditem.getUnlocalizedName()); GameRegistry.registerItem(twinkie, twinkie.getUnlocalizedName()); GameRegistry.registerItem(static_sandwich, static_sandwich.getUnlocalizedName()); + GameRegistry.registerItem(pudding, pudding.getUnlocalizedName()); GameRegistry.registerItem(med_ipecac, med_ipecac.getUnlocalizedName()); GameRegistry.registerItem(med_ptsd, med_ptsd.getUnlocalizedName()); //GameRegistry.registerItem(med_schizophrenia, med_schizophrenia.getUnlocalizedName()); diff --git a/com/hbm/items/food/ItemLemon.java b/com/hbm/items/food/ItemLemon.java index 656a015f0..5c5dfbeee 100644 --- a/com/hbm/items/food/ItemLemon.java +++ b/com/hbm/items/food/ItemLemon.java @@ -141,7 +141,7 @@ public class ItemLemon extends ItemFood { } if(this == ModItems.canned_chinese) { - list.add("In China, Chineese food is just called food."); + list.add("In China, Chinese food is just called food."); } if(this == ModItems.canned_oil) { @@ -197,6 +197,12 @@ public class ItemLemon extends ItemFood { if(this == ModItems.canned_bark) { list.add("Extra cronchy!"); } + + if(this == ModItems.pudding) { + list.add("What if he did?"); + list.add("What if he didn't?"); + list.add("What if the world was made of pudding?"); + } } diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java index 3983a0857..a90f579cc 100644 --- a/com/hbm/lib/RefStrings.java +++ b/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (3200)"; + public static final String VERSION = "1.0.27 BETA (3231)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index f2586ab3b..c1c09dc07 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -1560,6 +1560,14 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_geo, 1), new Object[] { "ITI", "PCP", "ITI", 'I', "ingotDuraSteel", 'T', ModItems.thermo_element, 'P', ModItems.board_copper, 'C', ModBlocks.red_wire_coated })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_minirtg, 1), new Object[] { "LLL", "PPP", "TRT", 'L', "plateLead", 'P', "Pu238", 'T', ModItems.thermo_element, 'R', ModItems.rtg_unit })); + GameRegistry.addRecipe(new ItemStack(ModBlocks.pink_planks, 4), new Object[] { "W", 'W', ModBlocks.pink_log }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.pink_slab, 6), new Object[] { "WWW", 'W', ModBlocks.pink_planks }); + GameRegistry.addRecipe(new ItemStack(ModBlocks.pink_stairs, 6), new Object[] { "W ", "WW ", "WWW", 'W', ModBlocks.pink_planks }); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.door_metal, 1), new Object[] { "II", "SS", "II", 'I', "plateIron", 'S', "plateSteel" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.door_office, 1), new Object[] { "II", "SS", "II", 'I', "plankWood", 'S', "plateIron" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.door_bunker, 1), new Object[] { "II", "SS", "II", 'I', "plateSteel", 'S', "plateLead" })); + GameRegistry.addShapelessRecipe(new ItemStack(Items.paper, 1), new Object[] { new ItemStack(ModItems.assembly_template, 1, OreDictionary.WILDCARD_VALUE) }); GameRegistry.addShapelessRecipe(new ItemStack(Items.paper, 1), new Object[] { new ItemStack(ModItems.chemistry_template, 1, OreDictionary.WILDCARD_VALUE) }); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 5114f629b..92b6075f4 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -1265,6 +1265,11 @@ public class MainRegistry OreDictionary.registerOre("blockDaffergon", ModBlocks.block_daffergon); OreDictionary.registerOre("blockVerticium", ModBlocks.block_verticium); OreDictionary.registerOre("blockDesh", ModBlocks.block_desh); + + OreDictionary.registerOre("logWood", ModBlocks.pink_log); + OreDictionary.registerOre("plankWood", ModBlocks.pink_planks); + OreDictionary.registerOre("slabWood", ModBlocks.pink_slab); + OreDictionary.registerOre("stairWood", ModBlocks.pink_stairs); } @EventHandler diff --git a/com/hbm/main/NEIConfig.java b/com/hbm/main/NEIConfig.java index 4fc100f47..8ae4e53a3 100644 --- a/com/hbm/main/NEIConfig.java +++ b/com/hbm/main/NEIConfig.java @@ -93,6 +93,12 @@ public class NEIConfig implements IConfigureNEI { API.hideItem(new ItemStack(ModBlocks.dummy_block_ams_emitter)); API.hideItem(new ItemStack(ModBlocks.dummy_block_ams_limiter)); API.hideItem(new ItemStack(ModBlocks.dummy_block_reactor_small)); + API.hideItem(new ItemStack(ModBlocks.dummy_block_radgen)); + API.hideItem(new ItemStack(ModBlocks.dummy_block_vault)); + API.hideItem(new ItemStack(ModBlocks.dummy_block_blast)); + API.hideItem(new ItemStack(ModBlocks.dummy_block_gascent)); + API.hideItem(new ItemStack(ModBlocks.dummy_block_uf6)); + API.hideItem(new ItemStack(ModBlocks.dummy_block_puf6)); API.hideItem(new ItemStack(ModBlocks.dummy_port_assembler)); API.hideItem(new ItemStack(ModBlocks.dummy_port_chemplant)); API.hideItem(new ItemStack(ModBlocks.dummy_port_cyclotron)); @@ -108,6 +114,18 @@ public class NEIConfig implements IConfigureNEI { API.hideItem(new ItemStack(ModBlocks.dummy_port_ams_emitter)); API.hideItem(new ItemStack(ModBlocks.dummy_port_ams_limiter)); API.hideItem(new ItemStack(ModBlocks.dummy_port_reactor_small)); + API.hideItem(new ItemStack(ModBlocks.dummy_port_radgen)); + API.hideItem(new ItemStack(ModBlocks.dummy_port_compact_launcher)); + API.hideItem(new ItemStack(ModBlocks.dummy_port_launch_table)); + API.hideItem(new ItemStack(ModBlocks.dummy_plate_compact_launcher)); + API.hideItem(new ItemStack(ModBlocks.dummy_plate_launch_table)); + API.hideItem(new ItemStack(ModBlocks.dummy_plate_cargo)); + + API.hideItem(new ItemStack(ModBlocks.pink_log)); + API.hideItem(new ItemStack(ModBlocks.pink_planks)); + API.hideItem(new ItemStack(ModBlocks.pink_slab)); + API.hideItem(new ItemStack(ModBlocks.pink_double_slab)); + API.hideItem(new ItemStack(ModBlocks.pink_stairs)); } @Override diff --git a/com/hbm/render/tileentity/RenderNukeBoy.java b/com/hbm/render/tileentity/RenderNukeBoy.java index d2fdf6059..5b62b5945 100644 --- a/com/hbm/render/tileentity/RenderNukeBoy.java +++ b/com/hbm/render/tileentity/RenderNukeBoy.java @@ -19,7 +19,7 @@ public class RenderNukeBoy extends TileEntitySpecialRenderer { public RenderNukeBoy() { boyModel = AdvancedModelLoader.loadModel(objTesterModelRL); - boyTexture = new ResourceLocation(RefStrings.MODID, "textures/models/LilBoy2.png"); + boyTexture = new ResourceLocation(RefStrings.MODID, "textures/models/lilboy.png"); } @Override @@ -28,7 +28,7 @@ public class RenderNukeBoy extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslated(x + 0.5D, y, z + 0.5D); GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glEnable(GL11.GL_CULL_FACE); switch(tileEntity.getBlockMetadata()) { case 2: @@ -47,8 +47,6 @@ public class RenderNukeBoy extends TileEntitySpecialRenderer { bindTexture(boyTexture); boyModel.renderAll(); - - GL11.glEnable(GL11.GL_LIGHTING); GL11.glPopMatrix(); }