diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-01-25 04:43:40 +0000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-01-25 04:43:40 +0000 |
| commit | f25534d89a96449f6d7a1adda952c35d234672f5 (patch) | |
| tree | ad0dff32f74ce7e0f54233291963abc6db8c68c3 /src/Java/gregtech/api | |
| parent | b41d734f18e0ec5a6d38fda93be8143fdcaf4c24 (diff) | |
| parent | c7c62d38eec9034c09a09dbdec02dcb492ec55e7 (diff) | |
| download | GT5-Unofficial-f25534d89a96449f6d7a1adda952c35d234672f5.tar.gz GT5-Unofficial-f25534d89a96449f6d7a1adda952c35d234672f5.tar.bz2 GT5-Unofficial-f25534d89a96449f6d7a1adda952c35d234672f5.zip | |
Merge branch 'master' into imgbot
# Conflicts:
# src/resources/assets/miscutils/textures/items/itemBufferCore.png
Diffstat (limited to 'src/Java/gregtech/api')
| -rw-r--r-- | src/Java/gregtech/api/util/Recipe_GT.java | 2 |
1 files changed, 1 insertions, 1 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/BlastSmelter", 1, 1, 1, 0, 1, E, 1, E, true, true); + 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/BlastSmelter", 2, 16, 0, 0, 1, E, 1, E, true, true); //Advanced Mixer public static final GT_Recipe_Map sAdvancedMixerRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(1000), "gt.recipe.advanced.mixer", |