aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Java/gregtech/api/util/Recipe_GT.java2
-rw-r--r--src/Java/gtPlusPlus/GTplusplus.java96
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java17
-rw-r--r--src/Java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java5
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/IonParticles.java117
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java2
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java90
-rw-r--r--src/Java/gtPlusPlus/core/item/general/BufferCore.java66
-rw-r--r--src/Java/gtPlusPlus/core/item/general/ItemControlCore.java11
-rw-r--r--src/Java/gtPlusPlus/core/material/Material.java2
-rw-r--r--src/Java/gtPlusPlus/core/material/Particle.java47
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java256
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java274
-rw-r--r--src/Java/gtPlusPlus/core/recipe/common/CI.java276
-rw-r--r--src/Java/gtPlusPlus/core/util/Utils.java5
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java29
-rw-r--r--src/Java/gtPlusPlus/preloader/asm/AsmConfig.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java31
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java1
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java278
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java150
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java12
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java11
-rw-r--r--src/resources/assets/miscutils/lang/en_US.lang23
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/101.pngbin0 -> 309 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/105.pngbin0 -> 30527 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/0.pngbin0 -> 112 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/1.pngbin0 -> 146 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/10.pngbin0 -> 161 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/100.pngbin0 -> 161 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/101.pngbin0 -> 153 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/102.pngbin0 -> 124 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/103.pngbin0 -> 148 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/104.pngbin0 -> 156 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/105.pngbin0 -> 175 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/106.pngbin0 -> 148 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/107.pngbin0 -> 143 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/108.pngbin0 -> 152 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/109.pngbin0 -> 154 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/11.pngbin0 -> 178 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/110.pngbin0 -> 163 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/111.pngbin0 -> 146 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/112.pngbin0 -> 148 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/113.pngbin0 -> 113 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/114.pngbin0 -> 160 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/115.pngbin0 -> 138 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/116.pngbin0 -> 140 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/117.pngbin0 -> 166 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/12.pngbin0 -> 147 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/13.pngbin0 -> 151 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/14.pngbin0 -> 125 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/15.pngbin0 -> 136 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/16.pngbin0 -> 136 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/17.pngbin0 -> 148 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/18.pngbin0 -> 143 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/19.pngbin0 -> 161 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/2.pngbin0 -> 115 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/20.pngbin0 -> 155 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/21.pngbin0 -> 115 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/22.pngbin0 -> 132 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/23.pngbin0 -> 144 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/24.pngbin0 -> 150 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/25.pngbin0 -> 141 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/26.pngbin0 -> 148 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/27.pngbin0 -> 141 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/28.pngbin0 -> 142 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/29.pngbin0 -> 145 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/3.pngbin0 -> 150 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/30.pngbin0 -> 159 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/31.pngbin0 -> 157 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/32.pngbin0 -> 158 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/33.pngbin0 -> 158 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/34.pngbin0 -> 144 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/35.pngbin0 -> 159 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/36.pngbin0 -> 155 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/37.pngbin0 -> 149 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/38.pngbin0 -> 135 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/39.pngbin0 -> 141 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/4.pngbin0 -> 125 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/40.pngbin0 -> 157 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/41.pngbin0 -> 162 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/42.pngbin0 -> 133 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/43.pngbin0 -> 147 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/44.pngbin0 -> 155 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/45.pngbin0 -> 152 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/46.pngbin0 -> 173 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/47.pngbin0 -> 154 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/48.pngbin0 -> 129 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/49.pngbin0 -> 152 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/5.pngbin0 -> 127 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/50.pngbin0 -> 163 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/51.pngbin0 -> 142 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/52.pngbin0 -> 110 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/53.pngbin0 -> 167 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/54.pngbin0 -> 155 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/55.pngbin0 -> 152 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/56.pngbin0 -> 142 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/57.pngbin0 -> 154 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/58.pngbin0 -> 136 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/59.pngbin0 -> 156 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/6.pngbin0 -> 131 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/60.pngbin0 -> 142 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/61.pngbin0 -> 157 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/62.pngbin0 -> 129 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/63.pngbin0 -> 165 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/64.pngbin0 -> 134 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/65.pngbin0 -> 157 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/66.pngbin0 -> 139 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/67.pngbin0 -> 129 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/68.pngbin0 -> 126 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/69.pngbin0 -> 157 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/7.pngbin0 -> 128 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/70.pngbin0 -> 121 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/71.pngbin0 -> 127 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/72.pngbin0 -> 137 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/73.pngbin0 -> 150 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/74.pngbin0 -> 153 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/75.pngbin0 -> 154 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/76.pngbin0 -> 126 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/77.pngbin0 -> 138 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/78.pngbin0 -> 152 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/79.pngbin0 -> 157 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/8.pngbin0 -> 107 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/80.pngbin0 -> 112 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/81.pngbin0 -> 151 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/82.pngbin0 -> 139 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/83.pngbin0 -> 149 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/84.pngbin0 -> 153 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/85.pngbin0 -> 152 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/86.pngbin0 -> 125 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/87.pngbin0 -> 153 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/88.pngbin0 -> 157 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/89.pngbin0 -> 125 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/9.pngbin0 -> 161 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/90.pngbin0 -> 146 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/91.pngbin0 -> 119 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/92.pngbin0 -> 163 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/93.pngbin0 -> 138 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/94.pngbin0 -> 153 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/95.pngbin0 -> 150 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/96.pngbin0 -> 157 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/97.pngbin0 -> 146 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/98.pngbin0 -> 143 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/99.pngbin0 -> 128 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/ion/IonBase.pngbin0 -> 1789 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/itemBufferCore.pngbin3115 -> 1329 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/0.PNGbin0 -> 1672 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/1.pngbin0 -> 1669 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/10.PNGbin0 -> 1644 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/11.PNGbin0 -> 1678 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/12.PNGbin0 -> 1658 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/13.PNGbin0 -> 1668 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/14.PNGbin0 -> 1676 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/15.PNGbin0 -> 1675 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/16.PNGbin0 -> 1679 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/17.PNGbin0 -> 1674 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/18.PNGbin0 -> 1674 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/19.PNGbin0 -> 1685 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/2.pngbin0 -> 1683 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/20.PNGbin0 -> 1663 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/21.PNGbin0 -> 1653 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/22.PNGbin0 -> 1665 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/23.PNGbin0 -> 1680 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/24.PNGbin0 -> 1673 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/3.pngbin0 -> 1681 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/4.pngbin0 -> 1682 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/5.pngbin0 -> 1675 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/6.pngbin0 -> 1674 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/7.PNGbin0 -> 1667 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/8.PNGbin0 -> 1656 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/particle/9.PNGbin0 -> 1663 bytes
173 files changed, 1361 insertions, 451 deletions
diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java
index 8a5abb529d..611f55c8b0 100644
--- a/src/Java/gregtech/api/util/Recipe_GT.java
+++ b/src/Java/gregtech/api/util/Recipe_GT.java
@@ -271,7 +271,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
"Fuel Value: ", 1000, " EU", true, false);
//Cyclotron recipe map
- public static final GT_Recipe_Map sCyclotronRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(200), "gt.recipe.cyclotron", "COMET - Compact Cyclotron", null, RES_PATH_GUI + "basicmachines/BlastSmel