From d009832cf6582057041344efa823bb58c6b29a75 Mon Sep 17 00:00:00 2001
From: HbmMods <hbmmods@gmail.com>
Date: Sat, 21 Apr 2018 19:25:39 +0200
Subject: [PATCH] raging vortex, mk4 fix, missing lang entries

---
 assets/hbm/lang/de_DE.lang                    |  15 +-
 assets/hbm/lang/en_US.lang                    |   8 +-
 assets/hbm/models/sphere_uv.hmf               | 444 ++++++++++++++++++
 assets/hbm/models/sphere_uv.obj               | 444 ++++++++++++++++++
 assets/hbm/textures/items/gearwheel_brass.png | Bin 0 -> 560 bytes
 com/hbm/entity/effect/EntityRagingVortex.java |  64 +++
 .../grenade/EntityGrenadeBlackHole.java       |   1 +
 .../entity/logic/EntityNukeExplosionMK4.java  |   2 +-
 com/hbm/explosion/ExplosionNukeGeneric.java   |   4 +
 com/hbm/items/special/ItemStarterKit.java     |   1 +
 com/hbm/main/ClientProxy.java                 |   3 +-
 com/hbm/main/MainRegistry.java                |  10 +-
 com/hbm/main/ModEventHandler.java             |   5 +-
 com/hbm/main/ResourceManager.java             |   2 +
 com/hbm/render/entity/RenderBlackHole.java    |  34 +-
 15 files changed, 1024 insertions(+), 13 deletions(-)
 create mode 100644 assets/hbm/models/sphere_uv.hmf
 create mode 100644 assets/hbm/models/sphere_uv.obj
 create mode 100644 assets/hbm/textures/items/gearwheel_brass.png
 create mode 100644 com/hbm/entity/effect/EntityRagingVortex.java

diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang
index 545e2acd5..85f2e4868 100644
--- a/assets/hbm/lang/de_DE.lang
+++ b/assets/hbm/lang/de_DE.lang
@@ -16,8 +16,14 @@ achievement.selenium=Und täglich grüßt der Mond
 achievement.selenium.desc=Lange nicht gesehen!
 achievement.potato=Machtgeile KI
 achievement.potato.desc=Du stichst mich! Was soll denn das?
+achievement.c44=Kapitel 44
+achievement.c44.desc=Galvanisch verzinkt! ...das macht in der Übersetzung sowas von keinen Sinn.
+achievement.c20_5=Kapitel [ZWANZIG KOMMA FÜNF]
+achievement.c20_5.desc=???
 
 potion.hbm_taint=Verdorben
+potion.hbm_taint_boost=Verdorbenes Herz
+potion.hbm_radiation=Strahlenkrankheit
 
 hbmfluid.none=Nichts
 hbmfluid.water=Wasser
@@ -840,7 +846,8 @@ item.rod_pu239.name=Pu239-Brennstab
 item.rod_pu240.name=Pu240-Brennstab
 item.rod_neptunium.name=Neptuniumbrennstab
 item.rod_lead.name=Bleistab
-item.rod_schrabidium.name=Schrabidiumbrennstab
+item.rod_schrabidium.name=Sa326-Brennstab
+item.rod_solinium.name=Sa327-Brennstab
 item.rod_euphemium.name=Euphemiumbrennstab
 item.rod_australium.name=Australiumbrennstab
 item.rod_weidanium.name=Weidaniumbrennstab
@@ -859,7 +866,8 @@ item.rod_dual_pu239.name=Pu239-Doppelbrennstab
 item.rod_dual_pu240.name=Pu240-Doppelbrennstab
 item.rod_dual_neptunium.name=Neptuniumdoppelbrennstab
 item.rod_dual_lead.name=Bleidoppelstab
-item.rod_dual_schrabidium.name=Schrabidiumdoppelbrennstab
+item.rod_dual_schrabidium.name=Sa326-Doppelbrennstab
+item.rod_dual_solinium.name=Sa327-Doppelbrennstab
 
 item.rod_quad_empty.name=Leerer Vierfachbrennstab
 item.rod_quad_uranium.name=Uranvierfachbrennstab
@@ -871,7 +879,8 @@ item.rod_quad_pu239.name=Pu239-Vierfachbrennstab
 item.rod_quad_pu240.name=Pu240-Vierfachbrennstab
 item.rod_quad_neptunium.name=Neptuniumvierfachbrennstab
 item.rod_quad_lead.name=Bleivierfachstab
-item.rod_quad_schrabidium.name=Schrabidiumvierfachbrennstab
+item.rod_quad_schrabidium.name=Sa326-Vierfachbrennstab
+item.rod_quad_solinium.name=Sa327-Vierfachbrennstab
 
 item.rod_uranium_fuel_depleted.name=Erschöpfte Urankernbrennstoffzelle
 item.rod_dual_uranium_fuel_depleted.name=Erschöpfte Urandoppelkernbrennstoffzelle
diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang
index e297efa3a..381159f7f 100644
--- a/assets/hbm/lang/en_US.lang
+++ b/assets/hbm/lang/en_US.lang
@@ -16,8 +16,14 @@ achievement.selenium=XVIII The Moon
 achievement.selenium.desc=Yeah.
 achievement.potato=Rogue AI
 achievement.potato.desc=You stabbed me! What is WRONG with yo-WOOOAAH
+achievement.c44=Chapter 44
+achievement.c44.desc=Galvanized! I mean, zinc!
+achievement.c20_5=Chapter [TWENTY POINT FIVE]
+achievement.c20_5.desc=???
 
 potion.hbm_taint=Tainted
+potion.hbm_taint_boost=Tainted Heart
+potion.hbm_radiation=Radiation Sickness
 
 hbmfluid.none=None
 hbmfluid.water=Water
@@ -1210,7 +1216,7 @@ item.plate_euphemium.name=Euphemium Compound Plate
 item.plate_dineutronium.name=Dineutronium Compound Plate
 item.plate_desh.name=Desh Compound Plate
 
-item.euphemium_helmet.name=Euphemium Helemt
+item.euphemium_helmet.name=Euphemium Helmet
 item.euphemium_plate.name=Euphemium Chestplate
 item.euphemium_legs.name=Euphemium Leggings
 item.euphemium_boots.name=Euphemiums Boots
diff --git a/assets/hbm/models/sphere_uv.hmf b/assets/hbm/models/sphere_uv.hmf
new file mode 100644
index 000000000..48a1bd000
--- /dev/null
+++ b/assets/hbm/models/sphere_uv.hmf
@@ -0,0 +1,444 @@
+# Blender v2.76 (sub 0) OBJ File: 'sphere_uv.blend'
+# www.blender.org
+o Sphere
+v -0.382683 0.923880 0.000000
+v -0.707107 0.707107 0.000000
+v -0.923880 0.382683 0.000000
+v -1.000000 -0.000000 0.000000
+v -0.923880 -0.382684 0.000000
+v -0.707107 -0.707107 0.000000
+v -0.382683 -0.923880 0.000000
+v -0.000000 -1.000000 0.000000
+v -0.331414 0.923880 -0.191342
+v -0.612372 0.707107 -0.353553
+v -0.800103 0.382683 -0.461940
+v -0.866025 -0.000000 -0.500000
+v -0.800103 -0.382684 -0.461940
+v -0.612372 -0.707107 -0.353553
+v -0.331414 -0.923880 -0.191342
+v -0.191342 0.923880 -0.331413
+v -0.353553 0.707107 -0.612372
+v -0.461940 0.382683 -0.800103
+v -0.500000 -0.000000 -0.866025
+v -0.461940 -0.382684 -0.800103
+v -0.353553 -0.707107 -0.612372
+v -0.191342 -0.923880 -0.331413
+v -0.000000 0.923880 -0.382683
+v -0.000000 0.707107 -0.707107
+v -0.000000 0.382683 -0.923879
+v -0.000000 -0.000000 -1.000000
+v -0.000000 -0.382684 -0.923879
+v -0.000000 -0.707107 -0.707107
+v -0.000000 -0.923880 -0.382683
+v -0.000000 1.000000 0.000000
+v 0.191341 0.923880 -0.331413
+v 0.353553 0.707107 -0.612372
+v 0.461940 0.382683 -0.800103
+v 0.500000 -0.000000 -0.866025
+v 0.461940 -0.382684 -0.800103
+v 0.353553 -0.707107 -0.612372
+v 0.191342 -0.923880 -0.331413
+v 0.331413 0.923880 -0.191342
+v 0.612372 0.707107 -0.353553
+v 0.800103 0.382683 -0.461940
+v 0.866025 -0.000000 -0.500000
+v 0.800103 -0.382684 -0.461940
+v 0.612372 -0.707107 -0.353553
+v 0.331413 -0.923880 -0.191342
+v 0.382683 0.923880 0.000000
+v 0.707106 0.707107 0.000000
+v 0.923879 0.382683 0.000000
+v 1.000000 -0.000000 0.000000
+v 0.923879 -0.382684 0.000000
+v 0.707106 -0.707107 0.000000
+v 0.382683 -0.923880 0.000000
+v 0.331413 0.923880 0.191342
+v 0.612372 0.707107 0.353553
+v 0.800103 0.382683 0.461940
+v 0.866025 -0.000000 0.500000
+v 0.800103 -0.382684 0.461940
+v 0.612372 -0.707107 0.353553
+v 0.331413 -0.923880 0.191342
+v 0.191341 0.923880 0.331413
+v 0.353553 0.707107 0.612372
+v 0.461940 0.382683 0.800103
+v 0.500000 -0.000000 0.866025
+v 0.461940 -0.382684 0.800103
+v 0.353553 -0.707107 0.612372
+v 0.191341 -0.923880 0.331413
+v -0.000000 0.923880 0.382683
+v -0.000000 0.707107 0.707107
+v -0.000000 0.382683 0.923879
+v -0.000000 -0.000000 1.000000
+v -0.000000 -0.382684 0.923879
+v -0.000000 -0.707107 0.707107
+v -0.000000 -0.923880 0.382683
+v -0.191342 0.923880 0.331413
+v -0.353554 0.707107 0.612372
+v -0.461940 0.382683 0.800103
+v -0.500000 -0.000000 0.866025
+v -0.461940 -0.382684 0.800103
+v -0.353554 -0.707107 0.612372
+v -0.191342 -0.923880 0.331413
+v -0.331414 0.923880 0.191342
+v -0.612373 0.707107 0.353553
+v -0.800103 0.382683 0.461940
+v -0.866025 -0.000000 0.500000
+v -0.800103 -0.382684 0.461940
+v -0.612373 -0.707107 0.353553
+v -0.331414 -0.923880 0.191342
+vt 0.577178 0.375212
+vt 0.424418 0.375493
+vt 0.442112 0.252123
+vt 0.583701 0.499674
+vt 0.577637 0.624159
+vt 0.424878 0.624441
+vt 0.533347 0.869292
+vt 0.470072 0.869409
+vt 0.443026 0.747746
+vt 0.531984 0.130244
+vt 0.559029 0.251907
+vt 0.418355 0.499979
+vt 0.559943 0.747530
+vt 0.559030 0.252039
+vt 0.442113 0.252255
+vt 0.468710 0.130493
+vt 0.577179 0.375344
+vt 0.583702 0.499806
+vt 0.418356 0.500111
+vt 0.577639 0.624292
+vt 0.559945 0.747663
+vt 0.443028 0.747878
+vt 0.424420 0.375626
+vt 0.424879 0.624574
+vt 0.533348 0.869425
+vt 0.470073 0.869542
+vt 0.418349 0.500014
+vt 0.559938 0.747565
+vt 0.443021 0.747781
+vt 0.442106 0.252158
+vt 0.424872 0.624476
+vt 0.468703 0.130395
+vt 0.577261 0.375276
+vt 0.424501 0.375558
+vt 0.442195 0.252187
+vt 0.577720 0.624224
+vt 0.424961 0.624506
+vt 0.533430 0.869357
+vt 0.470155 0.869474
+vt 0.443109 0.747811
+vt 0.559112 0.251972
+vt 0.468792 0.130425
+vt 0.583784 0.499738
+vt 0.560027 0.747595
+vt 0.577722 0.624357
+vt 0.424962 0.624639
+vt 0.418439 0.500176
+vt 0.533431 0.869490
+vt 0.470156 0.869607
+vt 0.443111 0.747943
+vt 0.559114 0.252104
+vt 0.442196 0.252320
+vt 0.468793 0.130558
+vt 0.583785 0.499871
+vt 0.424503 0.375691
+vt 0.560028 0.747728
+vt 0.577262 0.375409
+vt 0.577715 0.624259
+vt 0.468786 0.130460
+vt 0.583778 0.499774
+vt 0.577147 0.375446
+vt 0.424387 0.375727
+vt 0.442081 0.252357
+vt 0.577606 0.624394
+vt 0.424846 0.624675
+vt 0.418324 0.500213
+vt 0.559912 0.747764
+vt 0.533316 0.869527
+vt 0.470041 0.869643
+vt 0.531952 0.130478
+vt 0.558998 0.252141
+vt 0.583669 0.499908
+vt 0.442995 0.747980
+vt 0.470088 0.869579
+vt 0.577194 0.375382
+vt 0.531991 0.130341
+vt 0.500123 0.009751
+vt 0.501932 0.989902
+vt 0.501933 0.990034
+vt 0.500125 0.009884
+vt 0.531985 0.130376
+vt 0.500207 0.009816
+vt 0.532067 0.130308
+vt 0.502015 0.989966
+vt 0.502016 0.990099
+vt 0.500208 0.009949
+vt 0.532068 0.130441
+vt 0.500092 0.009986
+vt 0.468677 0.130594
+vt 0.501901 0.990136
+vn -0.811600 -0.542300 -0.217500
+vn -0.948600 0.188700 -0.254200
+vn -0.549500 0.822400 -0.147200
+vn -0.549500 -0.822400 -0.147200
+vn -0.948600 -0.188700 -0.254200
+vn -0.811600 0.542300 -0.217500
+vn -0.402300 -0.822400 -0.402300
+vn -0.694400 -0.188700 -0.694400
+vn -0.594100 0.542300 -0.594100
+vn -0.594100 -0.542300 -0.594100
+vn -0.694400 0.188700 -0.694400
+vn -0.402300 0.822400 -0.402300
+vn -0.254200 -0.188700 -0.948600
+vn -0.217500 0.542300 -0.811600
+vn -0.217500 -0.542300 -0.811600
+vn -0.254200 0.188700 -0.948600
+vn -0.147200 0.822400 -0.549500
+vn -0.147200 -0.822400 -0.549500
+vn 0.217500 -0.542300 -0.811600
+vn 0.254200 0.188700 -0.948600
+vn 0.147200 0.822400 -0.549500
+vn 0.147200 -0.822400 -0.549500
+vn 0.254200 -0.188700 -0.948600
+vn 0.217500 0.542300 -0.811600
+vn 0.694400 0.188700 -0.694400
+vn 0.402300 0.822400 -0.402300
+vn 0.402300 -0.822400 -0.402300
+vn 0.694400 -0.188700 -0.694400
+vn 0.594100 0.542300 -0.594100
+vn 0.594100 -0.542300 -0.594100
+vn 0.549500 -0.822400 -0.147200
+vn 0.948600 -0.188700 -0.254200
+vn 0.811600 0.542300 -0.217500
+vn 0.811600 -0.542300 -0.217500
+vn 0.948600 0.188700 -0.254200
+vn 0.549500 0.822400 -0.147200
+vn 0.811600 0.542300 0.217500
+vn 0.811600 -0.542300 0.217500
+vn 0.948600 0.188700 0.254200
+vn 0.549500 0.822400 0.147200
+vn 0.549500 -0.822400 0.147200
+vn 0.948600 -0.188700 0.254200
+vn 0.594100 -0.542300 0.594100
+vn 0.694400 0.188700 0.694400
+vn 0.402300 0.822400 0.402300
+vn 0.402300 -0.822400 0.402300
+vn 0.694400 -0.188700 0.694400
+vn 0.594100 0.542300 0.594100
+vn 0.147200 0.822400 0.549500
+vn 0.147200 -0.822400 0.549500
+vn 0.254200 -0.188700 0.948600
+vn 0.217500 0.542300 0.811600
+vn 0.217500 -0.542300 0.811600
+vn 0.254200 0.188700 0.948600
+vn -0.147200 -0.822400 0.549500
+vn -0.254200 -0.188700 0.948600
+vn -0.217500 0.542300 0.811600
+vn -0.217500 -0.542300 0.811600
+vn -0.254200 0.188700 0.948600
+vn -0.147200 0.822400 0.549500
+vn -0.594100 -0.542300 0.594100
+vn -0.694400 0.188700 0.694400
+vn -0.402300 0.822400 0.402300
+vn -0.402300 -0.822400 0.402300
+vn -0.694400 -0.188700 0.694400
+vn -0.594100 0.542300 0.594100
+vn -0.194800 -0.979400 -0.052200
+vn -0.194800 0.979400 -0.052200
+vn -0.142600 0.979400 -0.142600
+vn -0.142600 -0.979400 -0.142600
+vn -0.052200 0.979400 -0.194800
+vn -0.052200 -0.979400 -0.194800
+vn 0.052200 -0.979400 -0.194800
+vn 0.052200 0.979400 -0.194800
+vn 0.142600 0.979400 -0.142600
+vn 0.142600 -0.979400 -0.142600
+vn 0.194800 0.979400 -0.052200
+vn 0.194800 -0.979400 -0.052200
+vn 0.194800 0.979400 0.052200
+vn 0.194800 -0.979400 0.052200
+vn 0.142600 -0.979400 0.142600
+vn 0.142600 0.979400 0.142600
+vn 0.052200 0.979400 0.194800
+vn 0.052200 -0.979400 0.194800
+vn -0.052200 0.979400 0.194800
+vn -0.052200 -0.979400 0.194800
+vn -0.142600 0.979400 0.142600
+vn -0.142600 -0.979400 0.142600
+vn -0.811600 -0.542300 0.217500
+vn -0.948600 0.188700 0.254200
+vn -0.549500 0.822400 0.147200
+vn -0.549500 -0.822400 0.147200
+vn -0.948600 -0.188700 0.254200
+vn -0.811600 0.542300 0.217500
+vn -0.194800 0.979400 0.052200
+vn -0.194800 -0.979400 0.052200
+s off
+f 5/1/1 13/2/1 14/3/1
+f 4/4/2 3/5/2 11/6/2
+f 1/7/3 9/8/3 10/9/3
+f 7/10/4 6/11/4 14/3/4
+f 4/4/5 12/12/5 13/2/5
+f 2/13/6 10/9/6 11/6/6
+f 14/14/7 21/15/7 22/16/7
+f 13/17/8 12/18/8 19/19/8
+f 11/20/9 10/21/9 17/22/9
+f 13/17/10 20/23/10 21/15/10
+f 11/20/11 18/24/11 19/19/11
+f 10/21/12 9/25/12 16/26/12
+f 20/1/13 19/4/13 26/27/13
+f 18/5/14 17/28/14 24/29/14
+f 20/1/15 27/2/15 28/30/15
+f 18/5/16 25/31/16 26/27/16
+f 16/7/17 23/8/17 24/29/17
+f 21/11/18 28/30/18 29/32/18
+f 27/33/19 35/34/19 36/35/19
+f 25/36/20 33/37/20 34/12/20
+f 23/38/21 31/39/21 32/40/21
+f 28/41/22 36/35/22 37/42/22
+f 27/33/23 26/43/23 34/12/23
+f 24/44/24 32/40/24 33/37/24
+f 33/45/25 40/46/25 41/47/25
+f 31/48/26 38/49/26 39/50/26
+f 36/51/27 43/52/27 44/53/27
+f 34/54/28 41/47/28 42/55/28
+f 32/56/29 39/50/29 40/46/29
+f 35/57/30 42/55/30 43/52/30
+f 43/14/31 50/30/31 51/32/31
+f 41/4/32 48/19/32 49/23/32
+f 39/44/33 46/29/33 47/31/33
+f 42/17/34 49/23/34 50/30/34
+f 40/5/35 47/31/35 48/19/35
+f 39/44/36 38/38/36 45/26/36
+f 46/44/37 53/40/37 54/37/37
+f 49/33/38 56/34/38 57/35/38
+f 47/58/39 54/37/39 55/19/39
+f 45/38/40 52/26/40 53/40/40
+f 50/41/41 57/35/41 58/59/41
+f 48/60/42 55/19/42 56/34/42
+f 56/61/43 63/62/43 64/63/43
+f 54/64/44 61/65/44 62/66/44
+f 53/67/45 52/68/45 59/69/45
+f 58/70/46 57/71/46 64/63/46
+f 55/72/47 62/66/47 63/62/47
+f 54/64/48 53/67/48 60/73/48
+f 60/56/49 59/48/49 66/74/49
+f 64/71/50 71/15/50 72/16/50
+f 62/18/51 69/19/51 70/62/51
+f 60/56/52 67/22/52 68/24/52
+f 63/75/53 70/62/53 71/15/53
+f 61/58/54 68/24/54 69/19/54
+f 71/51/55 78/52/55 79/59/55
+f 69/60/56 76/19/56 77/55/56
+f 68/58/57 67/56/57 74/50/57
+f 71/51/58 70/57/58 77/55/58
+f 69/60/59 68/58/59 75/46/59
+f 66/48/60 73/49/60 74/50/60
+f 78/14/61 77/17/61 84/23/61
+f 75/20/62 82/31/62 83/19/62
+f 73/38/63 80/26/63 81/29/63
+f 79/76/64 78/14/64 85/30/64
+f 76/18/65 83/19/65 84/23/65
+f 74/44/66 81/29/66 82/31/66
+f 8/77/67 7/10/67 15/32/67
+f 1/7/68 30/78/68 9/8/68
+f 9/25/69 30/79/69 16/26/69
+f 8/80/70 15/81/70 22/16/70
+f 16/7/71 30/78/71 23/8/71
+f 8/77/72 22/76/72 29/32/72
+f 8/82/73 29/83/73 37/42/73
+f 23/38/74 30/84/74 31/39/74
+f 31/48/75 30/85/75 38/49/75
+f 8/86/76 37/87/76 44/53/76
+f 38/38/77 30/79/77 45/26/77
+f 8/77/78 44/76/78 51/32/78
+f 45/38/79 30/84/79 52/26/79
+f 8/86/80 51/83/80 58/59/80
+f 8/88/81 58/70/81 65/89/81
+f 52/68/82 30/90/82 59/69/82
+f 59/48/83 30/90/83 66/74/83
+f 8/80/84 65/81/84 72/16/84
+f 66/48/85 30/85/85 73/49/85
+f 8/86/86 72/87/86 79/59/86
+f 73/38/87 30/79/87 80/26/87
+f 8/77/88 79/76/88 86/16/88
+f 85/71/89 84/75/89 5/62/89
+f 82/64/90 3/24/90 4/66/90
+f 80/68/91 1/69/91 2/22/91
+f 85/71/92 6/15/92 7/89/92
+f 83/72/93 4/66/93 5/62/93
+f 81/21/94 2/22/94 3/24/94
+f 80/68/95 30/90/95 1/69/95
+f 8/88/96 86/81/96 7/89/96
+f 6/11/1 5/1/1 14/3/1
+f 12/12/2 4/4/2 11/6/2
+f 2/13/3 1/7/3 10/9/3
+f 15/32/4 7/10/4 14/3/4
+f 5/1/5 4/4/5 13/2/5
+f 3/5/6 2/13/6 11/6/6
+f 15/81/7 14/14/7 22/16/7
+f 20/23/8 13/17/8 19/19/8
+f 18/24/9 11/20/9 17/22/9
+f 14/14/10 13/17/10 21/15/10
+f 12/18/11 11/20/11 19/19/11
+f 17/22/12 10/21/12 16/26/12
+f 27/2/13 20/1/13 26/27/13
+f 25/31/14 18/5/14 24/29/14
+f 21/11/15 20/1/15 28/30/15
+f 19/4/16 18/5/16 26/27/16
+f 17/28/17 16/7/17 24/29/17
+f 22/76/18 21/11/18 29/32/18
+f 28/41/19 27/33/19 36/35/19
+f 26/43/20 25/36/20 34/12/20
+f 24/44/21 23/38/21 32/40/21
+f 29/83/22 28/41/22 37/42/22
+f 35/34/23 27/33/23 34/12/23
+f 25/36/24 24/44/24 33/37/24
+f 34/54/25 33/45/25 41/47/25
+f 32/56/26 31/48/26 39/50/26
+f 37/87/27 36/51/27 44/53/27
+f 35/57/28 34/54/28 42/55/28
+f 33/45/29 32/56/29 40/46/29
+f 36/51/30 35/57/30 43/52/30
+f 44/76/31 43/14/31 51/32/31
+f 42/17/32 41/4/32 49/23/32
+f 40/5/33 39/44/33 47/31/33
+f 43/14/34 42/17/34 50/30/34
+f 41/4/35 40/5/35 48/19/35
+f 46/29/36 39/44/36 45/26/36
+f 47/58/37 46/44/37 54/37/37
+f 50/41/38 49/33/38 57/35/38
+f 48/60/39 47/58/39 55/19/39
+f 46/44/40 45/38/40 53/40/40
+f 51/83/41 50/41/41 58/59/41
+f 49/33/42 48/60/42 56/34/42
+f 57/71/43 56/61/43 64/63/43
+f 55/72/44 54/64/44 62/66/44
+f 60/73/45 53/67/45 59/69/45
+f 65/89/46 58/70/46 64/63/46
+f 56/61/47 55/72/47 63/62/47
+f 61/65/48 54/64/48 60/73/48
+f 67/22/49 60/56/49 66/74/49
+f 65/81/50 64/71/50 72/16/50
+f 63/75/51 62/18/51 70/62/51
+f 61/58/52 60/56/52 68/24/52
+f 64/71/53 63/75/53 71/15/53
+f 62/18/54 61/58/54 69/19/54
+f 72/87/55 71/51/55 79/59/55
+f 70/57/56 69/60/56 77/55/56
+f 75/46/57 68/58/57 74/50/57
+f 78/52/58 71/51/58 77/55/58
+f 76/19/59 69/60/59 75/46/59
+f 67/56/60 66/48/60 74/50/60
+f 85/30/61 78/14/61 84/23/61
+f 76/18/62 75/20/62 83/19/62
+f 74/44/63 73/38/63 81/29/63
+f 86/16/64 79/76/64 85/30/64
+f 77/17/65 76/18/65 84/23/65
+f 75/20/66 74/44/66 82/31/66
+f 6/15/89 85/71/89 5/62/89
+f 83/72/90 82/64/90 4/66/90
+f 81/21/91 80/68/91 2/22/91
+f 86/81/92 85/71/92 7/89/92
+f 84/75/93 83/72/93 5/62/93
+f 82/64/94 81/21/94 3/24/94
diff --git a/assets/hbm/models/sphere_uv.obj b/assets/hbm/models/sphere_uv.obj
new file mode 100644
index 000000000..48a1bd000
--- /dev/null
+++ b/assets/hbm/models/sphere_uv.obj
@@ -0,0 +1,444 @@
+# Blender v2.76 (sub 0) OBJ File: 'sphere_uv.blend'
+# www.blender.org
+o Sphere
+v -0.382683 0.923880 0.000000
+v -0.707107 0.707107 0.000000
+v -0.923880 0.382683 0.000000
+v -1.000000 -0.000000 0.000000
+v -0.923880 -0.382684 0.000000
+v -0.707107 -0.707107 0.000000
+v -0.382683 -0.923880 0.000000
+v -0.000000 -1.000000 0.000000
+v -0.331414 0.923880 -0.191342
+v -0.612372 0.707107 -0.353553
+v -0.800103 0.382683 -0.461940
+v -0.866025 -0.000000 -0.500000
+v -0.800103 -0.382684 -0.461940
+v -0.612372 -0.707107 -0.353553
+v -0.331414 -0.923880 -0.191342
+v -0.191342 0.923880 -0.331413
+v -0.353553 0.707107 -0.612372
+v -0.461940 0.382683 -0.800103
+v -0.500000 -0.000000 -0.866025
+v -0.461940 -0.382684 -0.800103
+v -0.353553 -0.707107 -0.612372
+v -0.191342 -0.923880 -0.331413
+v -0.000000 0.923880 -0.382683
+v -0.000000 0.707107 -0.707107
+v -0.000000 0.382683 -0.923879
+v -0.000000 -0.000000 -1.000000
+v -0.000000 -0.382684 -0.923879
+v -0.000000 -0.707107 -0.707107
+v -0.000000 -0.923880 -0.382683
+v -0.000000 1.000000 0.000000
+v 0.191341 0.923880 -0.331413
+v 0.353553 0.707107 -0.612372
+v 0.461940 0.382683 -0.800103
+v 0.500000 -0.000000 -0.866025
+v 0.461940 -0.382684 -0.800103
+v 0.353553 -0.707107 -0.612372
+v 0.191342 -0.923880 -0.331413
+v 0.331413 0.923880 -0.191342
+v 0.612372 0.707107 -0.353553
+v 0.800103 0.382683 -0.461940
+v 0.866025 -0.000000 -0.500000
+v 0.800103 -0.382684 -0.461940
+v 0.612372 -0.707107 -0.353553
+v 0.331413 -0.923880 -0.191342
+v 0.382683 0.923880 0.000000
+v 0.707106 0.707107 0.000000
+v 0.923879 0.382683 0.000000
+v 1.000000 -0.000000 0.000000
+v 0.923879 -0.382684 0.000000
+v 0.707106 -0.707107 0.000000
+v 0.382683 -0.923880 0.000000
+v 0.331413 0.923880 0.191342
+v 0.612372 0.707107 0.353553
+v 0.800103 0.382683 0.461940
+v 0.866025 -0.000000 0.500000
+v 0.800103 -0.382684 0.461940
+v 0.612372 -0.707107 0.353553
+v 0.331413 -0.923880 0.191342
+v 0.191341 0.923880 0.331413
+v 0.353553 0.707107 0.612372
+v 0.461940 0.382683 0.800103
+v 0.500000 -0.000000 0.866025
+v 0.461940 -0.382684 0.800103
+v 0.353553 -0.707107 0.612372
+v 0.191341 -0.923880 0.331413
+v -0.000000 0.923880 0.382683
+v -0.000000 0.707107 0.707107
+v -0.000000 0.382683 0.923879
+v -0.000000 -0.000000 1.000000
+v -0.000000 -0.382684 0.923879
+v -0.000000 -0.707107 0.707107
+v -0.000000 -0.923880 0.382683
+v -0.191342 0.923880 0.331413
+v -0.353554 0.707107 0.612372
+v -0.461940 0.382683 0.800103
+v -0.500000 -0.000000 0.866025
+v -0.461940 -0.382684 0.800103
+v -0.353554 -0.707107 0.612372
+v -0.191342 -0.923880 0.331413
+v -0.331414 0.923880 0.191342
+v -0.612373 0.707107 0.353553
+v -0.800103 0.382683 0.461940
+v -0.866025 -0.000000 0.500000
+v -0.800103 -0.382684 0.461940
+v -0.612373 -0.707107 0.353553
+v -0.331414 -0.923880 0.191342
+vt 0.577178 0.375212
+vt 0.424418 0.375493
+vt 0.442112 0.252123
+vt 0.583701 0.499674
+vt 0.577637 0.624159
+vt 0.424878 0.624441
+vt 0.533347 0.869292
+vt 0.470072 0.869409
+vt 0.443026 0.747746
+vt 0.531984 0.130244
+vt 0.559029 0.251907
+vt 0.418355 0.499979
+vt 0.559943 0.747530
+vt 0.559030 0.252039
+vt 0.442113 0.252255
+vt 0.468710 0.130493
+vt 0.577179 0.375344
+vt 0.583702 0.499806
+vt 0.418356 0.500111
+vt 0.577639 0.624292
+vt 0.559945 0.747663
+vt 0.443028 0.747878
+vt 0.424420 0.375626
+vt 0.424879 0.624574
+vt 0.533348 0.869425
+vt 0.470073 0.869542
+vt 0.418349 0.500014
+vt 0.559938 0.747565
+vt 0.443021 0.747781
+vt 0.442106 0.252158
+vt 0.424872 0.624476
+vt 0.468703 0.130395
+vt 0.577261 0.375276
+vt 0.424501 0.375558
+vt 0.442195 0.252187
+vt 0.577720 0.624224
+vt 0.424961 0.624506
+vt 0.533430 0.869357
+vt 0.470155 0.869474
+vt 0.443109 0.747811
+vt 0.559112 0.251972
+vt 0.468792 0.130425
+vt 0.583784 0.499738
+vt 0.560027 0.747595
+vt 0.577722 0.624357
+vt 0.424962 0.624639
+vt 0.418439 0.500176
+vt 0.533431 0.869490
+vt 0.470156 0.869607
+vt 0.443111 0.747943
+vt 0.559114 0.252104
+vt 0.442196 0.252320
+vt 0.468793 0.130558
+vt 0.583785 0.499871
+vt 0.424503 0.375691
+vt 0.560028 0.747728
+vt 0.577262 0.375409
+vt 0.577715 0.624259
+vt 0.468786 0.130460
+vt 0.583778 0.499774
+vt 0.577147 0.375446
+vt 0.424387 0.375727
+vt 0.442081 0.252357
+vt 0.577606 0.624394
+vt 0.424846 0.624675
+vt 0.418324 0.500213
+vt 0.559912 0.747764
+vt 0.533316 0.869527
+vt 0.470041 0.869643
+vt 0.531952 0.130478
+vt 0.558998 0.252141
+vt 0.583669 0.499908
+vt 0.442995 0.747980
+vt 0.470088 0.869579
+vt 0.577194 0.375382
+vt 0.531991 0.130341
+vt 0.500123 0.009751
+vt 0.501932 0.989902
+vt 0.501933 0.990034
+vt 0.500125 0.009884
+vt 0.531985 0.130376
+vt 0.500207 0.009816
+vt 0.532067 0.130308
+vt 0.502015 0.989966
+vt 0.502016 0.990099
+vt 0.500208 0.009949
+vt 0.532068 0.130441
+vt 0.500092 0.009986
+vt 0.468677 0.130594
+vt 0.501901 0.990136
+vn -0.811600 -0.542300 -0.217500
+vn -0.948600 0.188700 -0.254200
+vn -0.549500 0.822400 -0.147200
+vn -0.549500 -0.822400 -0.147200
+vn -0.948600 -0.188700 -0.254200
+vn -0.811600 0.542300 -0.217500
+vn -0.402300 -0.822400 -0.402300
+vn -0.694400 -0.188700 -0.694400
+vn -0.594100 0.542300 -0.594100
+vn -0.594100 -0.542300 -0.594100
+vn -0.694400 0.188700 -0.694400
+vn -0.402300 0.822400 -0.402300
+vn -0.254200 -0.188700 -0.948600
+vn -0.217500 0.542300 -0.811600
+vn -0.217500 -0.542300 -0.811600
+vn -0.254200 0.188700 -0.948600
+vn -0.147200 0.822400 -0.549500
+vn -0.147200 -0.822400 -0.549500
+vn 0.217500 -0.542300 -0.811600
+vn 0.254200 0.188700 -0.948600
+vn 0.147200 0.822400 -0.549500
+vn 0.147200 -0.822400 -0.549500
+vn 0.254200 -0.188700 -0.948600
+vn 0.217500 0.542300 -0.811600
+vn 0.694400 0.188700 -0.694400
+vn 0.402300 0.822400 -0.402300
+vn 0.402300 -0.822400 -0.402300
+vn 0.694400 -0.188700 -0.694400
+vn 0.594100 0.542300 -0.594100
+vn 0.594100 -0.542300 -0.594100
+vn 0.549500 -0.822400 -0.147200
+vn 0.948600 -0.188700 -0.254200
+vn 0.811600 0.542300 -0.217500
+vn 0.811600 -0.542300 -0.217500
+vn 0.948600 0.188700 -0.254200
+vn 0.549500 0.822400 -0.147200
+vn 0.811600 0.542300 0.217500
+vn 0.811600 -0.542300 0.217500
+vn 0.948600 0.188700 0.254200
+vn 0.549500 0.822400 0.147200
+vn 0.549500 -0.822400 0.147200
+vn 0.948600 -0.188700 0.254200
+vn 0.594100 -0.542300 0.594100
+vn 0.694400 0.188700 0.694400
+vn 0.402300 0.822400 0.402300
+vn 0.402300 -0.822400 0.402300
+vn 0.694400 -0.188700 0.694400
+vn 0.594100 0.542300 0.594100
+vn 0.147200 0.822400 0.549500
+vn 0.147200 -0.822400 0.549500
+vn 0.254200 -0.188700 0.948600
+vn 0.217500 0.542300 0.811600
+vn 0.217500 -0.542300 0.811600
+vn 0.254200 0.188700 0.948600
+vn -0.147200 -0.822400 0.549500
+vn -0.254200 -0.188700 0.948600
+vn -0.217500 0.542300 0.811600
+vn -0.217500 -0.542300 0.811600
+vn -0.254200 0.188700 0.948600
+vn -0.147200 0.822400 0.549500
+vn -0.594100 -0.542300 0.594100
+vn -0.694400 0.188700 0.694400
+vn -0.402300 0.822400 0.402300
+vn -0.402300 -0.822400 0.402300
+vn -0.694400 -0.188700 0.694400
+vn -0.594100 0.542300 0.594100
+vn -0.194800 -0.979400 -0.052200
+vn -0.194800 0.979400 -0.052200
+vn -0.142600 0.979400 -0.142600
+vn -0.142600 -0.979400 -0.142600
+vn -0.052200 0.979400 -0.194800
+vn -0.052200 -0.979400 -0.194800
+vn 0.052200 -0.979400 -0.194800
+vn 0.052200 0.979400 -0.194800
+vn 0.142600 0.979400 -0.142600
+vn 0.142600 -0.979400 -0.142600
+vn 0.194800 0.979400 -0.052200
+vn 0.194800 -0.979400 -0.052200
+vn 0.194800 0.979400 0.052200
+vn 0.194800 -0.979400 0.052200
+vn 0.142600 -0.979400 0.142600
+vn 0.142600 0.979400 0.142600
+vn 0.052200 0.979400 0.194800
+vn 0.052200 -0.979400 0.194800
+vn -0.052200 0.979400 0.194800
+vn -0.052200 -0.979400 0.194800
+vn -0.142600 0.979400 0.142600
+vn -0.142600 -0.979400 0.142600
+vn -0.811600 -0.542300 0.217500
+vn -0.948600 0.188700 0.254200
+vn -0.549500 0.822400 0.147200
+vn -0.549500 -0.822400 0.147200
+vn -0.948600 -0.188700 0.254200
+vn -0.811600 0.542300 0.217500
+vn -0.194800 0.979400 0.052200
+vn -0.194800 -0.979400 0.052200
+s off
+f 5/1/1 13/2/1 14/3/1
+f 4/4/2 3/5/2 11/6/2
+f 1/7/3 9/8/3 10/9/3
+f 7/10/4 6/11/4 14/3/4
+f 4/4/5 12/12/5 13/2/5
+f 2/13/6 10/9/6 11/6/6
+f 14/14/7 21/15/7 22/16/7
+f 13/17/8 12/18/8 19/19/8
+f 11/20/9 10/21/9 17/22/9
+f 13/17/10 20/23/10 21/15/10
+f 11/20/11 18/24/11 19/19/11
+f 10/21/12 9/25/12 16/26/12
+f 20/1/13 19/4/13 26/27/13
+f 18/5/14 17/28/14 24/29/14
+f 20/1/15 27/2/15 28/30/15
+f 18/5/16 25/31/16 26/27/16
+f 16/7/17 23/8/17 24/29/17
+f 21/11/18 28/30/18 29/32/18
+f 27/33/19 35/34/19 36/35/19
+f 25/36/20 33/37/20 34/12/20
+f 23/38/21 31/39/21 32/40/21
+f 28/41/22 36/35/22 37/42/22
+f 27/33/23 26/43/23 34/12/23
+f 24/44/24 32/40/24 33/37/24
+f 33/45/25 40/46/25 41/47/25
+f 31/48/26 38/49/26 39/50/26
+f 36/51/27 43/52/27 44/53/27
+f 34/54/28 41/47/28 42/55/28
+f 32/56/29 39/50/29 40/46/29
+f 35/57/30 42/55/30 43/52/30
+f 43/14/31 50/30/31 51/32/31
+f 41/4/32 48/19/32 49/23/32
+f 39/44/33 46/29/33 47/31/33
+f 42/17/34 49/23/34 50/30/34
+f 40/5/35 47/31/35 48/19/35
+f 39/44/36 38/38/36 45/26/36
+f 46/44/37 53/40/37 54/37/37
+f 49/33/38 56/34/38 57/35/38
+f 47/58/39 54/37/39 55/19/39
+f 45/38/40 52/26/40 53/40/40
+f 50/41/41 57/35/41 58/59/41
+f 48/60/42 55/19/42 56/34/42
+f 56/61/43 63/62/43 64/63/43
+f 54/64/44 61/65/44 62/66/44
+f 53/67/45 52/68/45 59/69/45
+f 58/70/46 57/71/46 64/63/46
+f 55/72/47 62/66/47 63/62/47
+f 54/64/48 53/67/48 60/73/48
+f 60/56/49 59/48/49 66/74/49
+f 64/71/50 71/15/50 72/16/50
+f 62/18/51 69/19/51 70/62/51
+f 60/56/52 67/22/52 68/24/52
+f 63/75/53 70/62/53 71/15/53
+f 61/58/54 68/24/54 69/19/54
+f 71/51/55 78/52/55 79/59/55
+f 69/60/56 76/19/56 77/55/56
+f 68/58/57 67/56/57 74/50/57
+f 71/51/58 70/57/58 77/55/58
+f 69/60/59 68/58/59 75/46/59
+f 66/48/60 73/49/60 74/50/60
+f 78/14/61 77/17/61 84/23/61
+f 75/20/62 82/31/62 83/19/62
+f 73/38/63 80/26/63 81/29/63
+f 79/76/64 78/14/64 85/30/64
+f 76/18/65 83/19/65 84/23/65
+f 74/44/66 81/29/66 82/31/66
+f 8/77/67 7/10/67 15/32/67
+f 1/7/68 30/78/68 9/8/68
+f 9/25/69 30/79/69 16/26/69
+f 8/80/70 15/81/70 22/16/70
+f 16/7/71 30/78/71 23/8/71
+f 8/77/72 22/76/72 29/32/72
+f 8/82/73 29/83/73 37/42/73
+f 23/38/74 30/84/74 31/39/74
+f 31/48/75 30/85/75 38/49/75
+f 8/86/76 37/87/76 44/53/76
+f 38/38/77 30/79/77 45/26/77
+f 8/77/78 44/76/78 51/32/78
+f 45/38/79 30/84/79 52/26/79
+f 8/86/80 51/83/80 58/59/80
+f 8/88/81 58/70/81 65/89/81
+f 52/68/82 30/90/82 59/69/82
+f 59/48/83 30/90/83 66/74/83
+f 8/80/84 65/81/84 72/16/84
+f 66/48/85 30/85/85 73/49/85
+f 8/86/86 72/87/86 79/59/86
+f 73/38/87 30/79/87 80/26/87
+f 8/77/88 79/76/88 86/16/88
+f 85/71/89 84/75/89 5/62/89
+f 82/64/90 3/24/90 4/66/90
+f 80/68/91 1/69/91 2/22/91
+f 85/71/92 6/15/92 7/89/92
+f 83/72/93 4/66/93 5/62/93
+f 81/21/94 2/22/94 3/24/94
+f 80/68/95 30/90/95 1/69/95
+f 8/88/96 86/81/96 7/89/96
+f 6/11/1 5/1/1 14/3/1
+f 12/12/2 4/4/2 11/6/2
+f 2/13/3 1/7/3 10/9/3
+f 15/32/4 7/10/4 14/3/4
+f 5/1/5 4/4/5 13/2/5
+f 3/5/6 2/13/6 11/6/6
+f 15/81/7 14/14/7 22/16/7
+f 20/23/8 13/17/8 19/19/8
+f 18/24/9 11/20/9 17/22/9
+f 14/14/10 13/17/10 21/15/10
+f 12/18/11 11/20/11 19/19/11
+f 17/22/12 10/21/12 16/26/12
+f 27/2/13 20/1/13 26/27/13
+f 25/31/14 18/5/14 24/29/14
+f 21/11/15 20/1/15 28/30/15
+f 19/4/16 18/5/16 26/27/16
+f 17/28/17 16/7/17 24/29/17
+f 22/76/18 21/11/18 29/32/18
+f 28/41/19 27/33/19 36/35/19
+f 26/43/20 25/36/20 34/12/20
+f 24/44/21 23/38/21 32/40/21
+f 29/83/22 28/41/22 37/42/22
+f 35/34/23 27/33/23 34/12/23
+f 25/36/24 24/44/24 33/37/24
+f 34/54/25 33/45/25 41/47/25
+f 32/56/26 31/48/26 39/50/26
+f 37/87/27 36/51/27 44/53/27
+f 35/57/28 34/54/28 42/55/28
+f 33/45/29 32/56/29 40/46/29
+f 36/51/30 35/57/30 43/52/30
+f 44/76/31 43/14/31 51/32/31
+f 42/17/32 41/4/32 49/23/32
+f 40/5/33 39/44/33 47/31/33
+f 43/14/34 42/17/34 50/30/34
+f 41/4/35 40/5/35 48/19/35
+f 46/29/36 39/44/36 45/26/36
+f 47/58/37 46/44/37 54/37/37
+f 50/41/38 49/33/38 57/35/38
+f 48/60/39 47/58/39 55/19/39
+f 46/44/40 45/38/40 53/40/40
+f 51/83/41 50/41/41 58/59/41
+f 49/33/42 48/60/42 56/34/42
+f 57/71/43 56/61/43 64/63/43
+f 55/72/44 54/64/44 62/66/44
+f 60/73/45 53/67/45 59/69/45
+f 65/89/46 58/70/46 64/63/46
+f 56/61/47 55/72/47 63/62/47
+f 61/65/48 54/64/48 60/73/48
+f 67/22/49 60/56/49 66/74/49
+f 65/81/50 64/71/50 72/16/50
+f 63/75/51 62/18/51 70/62/51
+f 61/58/52 60/56/52 68/24/52
+f 64/71/53 63/75/53 71/15/53
+f 62/18/54 61/58/54 69/19/54
+f 72/87/55 71/51/55 79/59/55
+f 70/57/56 69/60/56 77/55/56
+f 75/46/57 68/58/57 74/50/57
+f 78/52/58 71/51/58 77/55/58
+f 76/19/59 69/60/59 75/46/59
+f 67/56/60 66/48/60 74/50/60
+f 85/30/61 78/14/61 84/23/61
+f 76/18/62 75/20/62 83/19/62
+f 74/44/63 73/38/63 81/29/63
+f 86/16/64 79/76/64 85/30/64
+f 77/17/65 76/18/65 84/23/65
+f 75/20/66 74/44/66 82/31/66
+f 6/15/89 85/71/89 5/62/89
+f 83/72/90 82/64/90 4/66/90
+f 81/21/91 80/68/91 2/22/91
+f 86/81/92 85/71/92 7/89/92
+f 84/75/93 83/72/93 5/62/93
+f 82/64/94 81/21/94 3/24/94
diff --git a/assets/hbm/textures/items/gearwheel_brass.png b/assets/hbm/textures/items/gearwheel_brass.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ff83a95e0d1f13202d5e2cff5f5b249691d9c6b
GIT binary patch
literal 560
zcmV-00?+-4P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004b3#c}2nYxW
zd<bNS0005!Nkl<Zc%1E<+m6E^3`C*o|NnCOgj69ez6`broTptifnjPx0&Yr&lO6kh
zs{dWId^|dh#5KTMfH%h*U_J5F6JHNAT~-}Y2i{|u&ZrU41Fo0TU=gnop*5fYGlJR>
z>Y?SS?roWBI!{m<=?Ti!=Mq7bduN8IjL<BDPr`-th@5l=4WSqyO%pUDBgB1EBf#^e
zsRn8ScVM&mfQxozY3X6Lg?JS9jE+{{tVqxr5Fs_pRso9{9|c(})c|#_Ek>LQ(iDg^
z_<~3i#ekhczh<gk5&;pv{Q_It%z&N0{lahz+z5#L?H9}+gtq1yF!<~Z`CsUcg%bhj
z{C_%sBOq(_N`cmZT_UdD)}maiW$6|dqo0&g${YjUNIrfQ_%g12V+yc#Tal{(dTWi+
zN3(6O6ljSFUm>z`tzP+zF=S-G4lh1bx??$h6}Sd4uixQ;33@K@hIwE(21yD;jsmte
z<mqrkrrM>GV8kd8Y0?~zM>0Wta^<-rv=Xx&p$Jj1yhP@oXsMt+v_)2CNZONDh`?T_
z(Wk=}(E!~`&`xZl0dr~)HT8<r`>{9vq1obcFO;;{<{I_6MX4+Ys};e#SenZ!BV5bn
yC4?)FH*2`Vu|Jt<aep`&fop)b0B?>r;COyBOi*nBo$bc}0000<MNUMnLSTZW2=tWz

literal 0
HcmV?d00001

diff --git a/com/hbm/entity/effect/EntityRagingVortex.java b/com/hbm/entity/effect/EntityRagingVortex.java
new file mode 100644
index 000000000..a9d8c2328
--- /dev/null
+++ b/com/hbm/entity/effect/EntityRagingVortex.java
@@ -0,0 +1,64 @@
+package com.hbm.entity.effect;
+
+import com.hbm.entity.projectile.EntityBullet;
+import com.hbm.explosion.ExplosionChaos;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
+public class EntityRagingVortex extends EntityBlackHole {
+	
+	int timer = 0;
+
+	public EntityRagingVortex(World p_i1582_1_) {
+		super(p_i1582_1_);
+		this.ignoreFrustumCheck = true;
+		this.isImmuneToFire = true;
+	}
+
+	public EntityRagingVortex(World world, float size) {
+		super(world);
+		this.dataWatcher.updateObject(16, size);
+	}
+	
+	@Override
+	public void onUpdate() {
+		
+		timer++;
+		
+		if(timer <= 20)
+			timer -= 20;
+		
+		float pulse = (float)(Math.sin(timer) * Math.PI / 20D) * 0.35F;
+		
+		float dec = 0.0F;
+		
+		if(rand.nextInt(100) == 0) {
+			dec = 0.1F;
+			worldObj.createExplosion(null, posX, posY, posZ, 10F, false);
+		}
+		
+		this.dataWatcher.updateObject(16, this.dataWatcher.getWatchableObjectFloat(16) - pulse - dec);
+		if(this.dataWatcher.getWatchableObjectFloat(16) <= 0) {
+			this.setDead();
+			return;
+		}
+		
+		super.onUpdate();
+	}
+
+	@Override
+	protected void readEntityFromNBT(NBTTagCompound nbt) {
+		super.readEntityFromNBT(nbt);
+		
+		timer = nbt.getInteger("vortexTimer");
+	}
+
+	@Override
+	protected void writeEntityToNBT(NBTTagCompound nbt) {
+		super.writeEntityToNBT(nbt);
+		
+		nbt.setInteger("vortexTimer", timer);
+	}
+}
\ No newline at end of file
diff --git a/com/hbm/entity/grenade/EntityGrenadeBlackHole.java b/com/hbm/entity/grenade/EntityGrenadeBlackHole.java
index 11dd1e269..c0780dce6 100644
--- a/com/hbm/entity/grenade/EntityGrenadeBlackHole.java
+++ b/com/hbm/entity/grenade/EntityGrenadeBlackHole.java
@@ -4,6 +4,7 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.world.World;
 
 import com.hbm.entity.effect.EntityBlackHole;
+import com.hbm.entity.effect.EntityRagingVortex;
 
 public class EntityGrenadeBlackHole extends EntityGrenadeBase
 {
diff --git a/com/hbm/entity/logic/EntityNukeExplosionMK4.java b/com/hbm/entity/logic/EntityNukeExplosionMK4.java
index 0485b68ce..f82ea3d54 100644
--- a/com/hbm/entity/logic/EntityNukeExplosionMK4.java
+++ b/com/hbm/entity/logic/EntityNukeExplosionMK4.java
@@ -54,7 +54,7 @@ public class EntityNukeExplosionMK4 extends Entity {
 			//MainRegistry.logger.info(explosion.getStoredSize() + " / " + count / length);
 			//explosion.collectTip(speed * 10);
 			explosion.collectTipExperimental(speed * 10);
-		} else if(explosion.getProgress() < count / length) {
+		} else if(explosion.getProgress() < (count / length) * 0.99) {
 			//if(!worldObj.isRemote)
 			//MainRegistry.logger.info(explosion.getProgress() + " / " + count / length);
 				explosion.processTip(speed);
diff --git a/com/hbm/explosion/ExplosionNukeGeneric.java b/com/hbm/explosion/ExplosionNukeGeneric.java
index fb0a37a6c..bc29cb716 100644
--- a/com/hbm/explosion/ExplosionNukeGeneric.java
+++ b/com/hbm/explosion/ExplosionNukeGeneric.java
@@ -206,6 +206,10 @@ public class ExplosionNukeGeneric {
 
 		for (int i1 = 0; i1 < list.size(); ++i1) {
 			Entity entity = (Entity) list.get(i1);
+			
+			if(entity instanceof EntityBlackHole)
+				continue;
+			
 			double d4 = entity.getDistance(x, y, z) / radius;
 
 			if (d4 <= 1.0D) {
diff --git a/com/hbm/items/special/ItemStarterKit.java b/com/hbm/items/special/ItemStarterKit.java
index 2f7b81584..462cf8ca8 100644
--- a/com/hbm/items/special/ItemStarterKit.java
+++ b/com/hbm/items/special/ItemStarterKit.java
@@ -327,6 +327,7 @@ public class ItemStarterKit extends Item {
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_exo, 1));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_doomsday, 1));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_taint, 1));
+			player.inventory.addItemStackToInventory(new ItemStack(ModItems.missile_micro, 1));
 		}
 		
 		if(this == ModItems.t45_kit)
diff --git a/com/hbm/main/ClientProxy.java b/com/hbm/main/ClientProxy.java
index 5d2ce35df..854f532dd 100644
--- a/com/hbm/main/ClientProxy.java
+++ b/com/hbm/main/ClientProxy.java
@@ -149,7 +149,8 @@ public class ClientProxy extends ServerProxy
 	    RenderingRegistry.registerEntityRenderingHandler(EntityNukeCloudNoShroom.class, new RenderNoCloud());
 	    RenderingRegistry.registerEntityRenderingHandler(EntityFalloutRain.class, new RenderFallout());
 	    RenderingRegistry.registerEntityRenderingHandler(EntityBlackHole.class, new RenderBlackHole());
-	    RenderingRegistry.registerEntityRenderingHandler(EntityVortex.class, new RenderVortex());
+	    RenderingRegistry.registerEntityRenderingHandler(EntityVortex.class, new RenderBlackHole());
+	    RenderingRegistry.registerEntityRenderingHandler(EntityRagingVortex.class, new RenderBlackHole());
 
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoTapeRecorder.class, new RenderTapeRecorder());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoSteelPoles.class, new RenderSteelPoles());
diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java
index 716b3bc32..01c740fed 100644
--- a/com/hbm/main/MainRegistry.java
+++ b/com/hbm/main/MainRegistry.java
@@ -57,6 +57,7 @@ import com.hbm.entity.effect.EntityFalloutRain;
 import com.hbm.entity.effect.EntityNukeCloudBig;
 import com.hbm.entity.effect.EntityNukeCloudNoShroom;
 import com.hbm.entity.effect.EntityNukeCloudSmall;
+import com.hbm.entity.effect.EntityRagingVortex;
 import com.hbm.entity.effect.EntityVortex;
 import com.hbm.entity.grenade.EntityGrenadeASchrab;
 import com.hbm.entity.grenade.EntityGrenadeBlackHole;
@@ -385,6 +386,8 @@ public class MainRegistry
 	public static Achievement achFreytag;
 	public static Achievement achSelenium;
 	public static Achievement achPotato;
+	public static Achievement achC44;
+	public static Achievement achC20_5;
 	
 	public static boolean enableDebugMode = true;
 	public static boolean enableMycelium = false;
@@ -712,6 +715,7 @@ public class MainRegistry
 	    EntityRegistry.registerModEntity(EntityRocketHoming.class, "entity_stinger", 93, this, 1000, 1, true);
 	    EntityRegistry.registerModEntity(EntityMissileMicro.class, "entity_missile_taint", 94, this, 1000, 1, true);
 	    EntityRegistry.registerModEntity(EntityCloudSolinium.class, "entity_cloud_rainbow", 95, this, 1000, 1, true);
+	    EntityRegistry.registerModEntity(EntityRagingVortex.class, "entity_raging_vortex", 96, this, 250, 1, true);
 	    
 	    EntityRegistry.registerGlobalEntityID(EntityNuclearCreeper.class, "entity_mob_nuclear_creeper", EntityRegistry.findGlobalUniqueEntityId(), 0x204131, 0x75CE00);
 	    EntityRegistry.registerGlobalEntityID(EntityHunterChopper.class, "entity_mob_hunter_chopper", EntityRegistry.findGlobalUniqueEntityId(), 0x000020, 0x2D2D72);
@@ -905,6 +909,8 @@ public class MainRegistry
 		achFreytag = new Achievement("achievement.freytag", "freytag", 0, -2, ModItems.gun_mp40, null).initIndependentStat().setSpecial().registerStat();
 		achSelenium = new Achievement("achievement.selenium", "selenium", -2, -2, ModItems.ingot_starmetal, null).initIndependentStat().setSpecial().registerStat();
 		achPotato = new Achievement("achievement.potato", "potato", -2, 0, ModItems.battery_potatos, null).initIndependentStat().setSpecial().registerStat();
+		achC44 = new Achievement("achievement.c44", "c44", 2, -2, ModItems.gun_revolver_pip, null).initIndependentStat().setSpecial().registerStat();
+		achC20_5 = new Achievement("achievement.c20_5", "c20_5", 4, -2, ModItems.gun_dampfmaschine, null).initIndependentStat().setSpecial().registerStat();
 		
 		AchievementPage.registerAchievementPage(new AchievementPage("Nuclear Tech", new Achievement[]{ 
 				achSacrifice,
@@ -912,7 +918,9 @@ public class MainRegistry
 				achTOB,
 				achFreytag,
 				achSelenium,
-				achPotato
+				achPotato,
+				achC44,
+				achC20_5
 		}));
 		
 		OreDictionary.registerOre("ingotUranium", ModItems.ingot_uranium);
diff --git a/com/hbm/main/ModEventHandler.java b/com/hbm/main/ModEventHandler.java
index 1a3439be9..80a3f09ac 100644
--- a/com/hbm/main/ModEventHandler.java
+++ b/com/hbm/main/ModEventHandler.java
@@ -87,12 +87,15 @@ public class ModEventHandler
 		if(item == ModItems.gun_mp40) {
 			e.player.addStat(MainRegistry.achFreytag, 1);
 		}
-		if(item == ModItems.piston_selenium) {
+		if(item == ModItems.piston_selenium || item == ModItems.gun_b92) {
 			e.player.addStat(MainRegistry.achSelenium, 1);
 		}
 		if(item == ModItems.battery_potatos) {
 			e.player.addStat(MainRegistry.achPotato, 1);
 		}
+		if(item == ModItems.gun_revolver_pip) {
+			e.player.addStat(MainRegistry.achC44, 1);
+		}
 	}
 	
 	/*@SubscribeEvent
diff --git a/com/hbm/main/ResourceManager.java b/com/hbm/main/ResourceManager.java
index 8ba21f066..e53e2e6e1 100644
--- a/com/hbm/main/ResourceManager.java
+++ b/com/hbm/main/ResourceManager.java
@@ -62,6 +62,8 @@ public class ResourceManager {
 	//Sphere
 	public static final IModelCustom sphere_ruv = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/sphere_ruv.obj"));
 	public static final IModelCustom sphere_iuv = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/sphere_iuv.obj"));
+	public static final IModelCustom sphere_uv = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/sphere_uv.obj"));
+	public static final IModelCustom sphere_uv_anim = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/sphere_uv.hmf"));
 	
 	//Radgen
 	public static final IModelCustom radgen_body = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/rad_gen_body.obj"));
diff --git a/com/hbm/render/entity/RenderBlackHole.java b/com/hbm/render/entity/RenderBlackHole.java
index 6804dd173..c1e37e9fb 100644
--- a/com/hbm/render/entity/RenderBlackHole.java
+++ b/com/hbm/render/entity/RenderBlackHole.java
@@ -5,6 +5,8 @@ import java.util.Random;
 import org.lwjgl.opengl.GL11;
 
 import com.hbm.entity.effect.EntityBlackHole;
+import com.hbm.entity.effect.EntityRagingVortex;
+import com.hbm.entity.effect.EntityVortex;
 import com.hbm.lib.RefStrings;
 
 import net.minecraft.client.renderer.RenderHelper;
@@ -91,11 +93,9 @@ public class RenderBlackHole extends Render {
                 tessellator.startDrawing(6);
                 float f3 = random.nextFloat() * 20.0F + 5.0F + f2 * 10.0F;
                 float f4 = random.nextFloat() * 2.0F + 1.0F + f2 * 2.0F;
-                //tessellator.setColorRGBA_I(16777215, (int)(255.0F * (1.0F - f2)));
-                tessellator.setColorRGBA_I(59345715, (int)(255.0F * (1.0F/* - f2*/)));
+                setColorFull(entity, tessellator);
                 tessellator.addVertex(0.0D, 0.0D, 0.0D);
-                //tessellator.setColorRGBA_I(16711935, 0);
-                tessellator.setColorRGBA_I(59345735, 0);
+                setColorNone(entity, tessellator);
                 tessellator.addVertex(-0.866D * f4, f3, -0.5F * f4);
                 tessellator.addVertex(0.866D * f4, f3, -0.5F * f4);
                 tessellator.addVertex(0.0D, f3, 1.0F * f4);
@@ -117,7 +117,31 @@ public class RenderBlackHole extends Render {
             
 		}
 	}
-
+	
+	private void setColorFull(Entity e, Tessellator tessellator) {
+		
+		if(e instanceof EntityVortex)
+			tessellator.setColorRGBA_I(0x3898b3, (int)(255.0F * (1.0F)));
+		
+		else if(e instanceof EntityRagingVortex)
+			tessellator.setColorRGBA_I(0xe8390d, (int)(255.0F * (1.0F)));
+		
+		else 
+            tessellator.setColorRGBA_I(59345715, (int)(255.0F * (1.0F)));
+	}
+	
+	private void setColorNone(Entity e, Tessellator tessellator) {
+		
+		if(e instanceof EntityVortex)
+			tessellator.setColorRGBA_I(0x3898b3, 0);
+		
+		else if(e instanceof EntityRagingVortex)
+			tessellator.setColorRGBA_I(0xe8390d, 0);
+		
+		else 
+            tessellator.setColorRGBA_I(59345715, 0);
+	}
+	
 	@Override
 	protected ResourceLocation getEntityTexture(Entity p_110775_1_) {
 		return null;