Merge branch 'next' into instancing-rework

src/main/java/com/paneedah/weaponlib/Weapon.java

@@ -115,7 +115,7 @@ public static class Builder {
         private CreativeTabs creativeTab;
         private WeaponRenderer renderer;
         //float zoom = Weapon.DEFAULT_ZOOM;
-        @Getter List<Integer> maxShots = new ArrayList<>();
+        @Getter List<Integer> maxShots = new ArrayList<>(); // ! TODO: This is despicable
         String crosshair;
         String crosshairRunning;
         String crosshairZoomed;