aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
AgeCommit message (Collapse)Author
2018-10-07cherry pick 6a1b45f2be752afd77db32e011bbd1118949b8ae [6a1b45f]Dream-Master
fix(blockmachines): persistency on harvest (#1498) This patch fixes persistency of NBT tags in machine item when machine block is harvested. Machines with an @Override on setItemNBT will now persist data correctly when harvested? Change fixes intended persistency behaviour of following machines: - Item buffers will persist screwdriver configured output stack size when harvested. - Item distributors will persist setings of items per face.
2018-10-07cherry pick b46a466878c07f8343894899304dce605b6b1d44 [b46a466]Dream-Master
Fixed bug in macerator recipes. (#1468)
2018-10-07chery pick eef9513ef22c8f48b70e968c2699bb9e2f179643 [eef9513]redmage17
Add config for Small Boiler Automation (#1449) * Add config for Small Boiler Automation Default is off * Update GT_Mod.java * Update GT_Mod.java * Update GT_MetaTileEntity_Boiler.java Fixed retarded logic
2018-10-06Merge remote-tracking branch 'origin/bmf2' into testDream-Master
2018-10-06OreDictDuctTapebartimaeusnek
2018-10-05Pyrotheum and Cryotheum beesDream-Master
2018-10-05Add new beesDream-Master
Apatite, Ash and Fertilizer
2018-10-05buff bees in autoclave alotDream-Master
2018-10-05remove super cheap growth medium recipesDream-Master
2018-10-03refined automatic bee exchangebartimaeusnek
2018-09-30+added unification of Gedustry bees -> GT beesbartimaeusnek
+fixed NPE without certain Mods Loaded
2018-09-23remove unused codeDream-Master
2018-09-23change forestry squeezer recipesDream-Master
2018-09-23added missingfix recipesfor magnesium beesDream-Master
2018-09-23fixDream-Master
2018-09-23fix squeezer recipesDream-Master
2018-09-22add forestry squeezer recipes to dropsDream-Master
2018-09-22Add the last com recipesDream-Master
added uev motor for uev centrifuge for infinity combs spell fixings
2018-09-22add more recipesto space combsDream-Master
2018-09-22fix spelling issueDream-Master
2018-09-22All gendustry bees in code.Dream-Master
Comb recipes will follow
2018-09-22add more comb recipesDream-Master
add drop recipes
2018-09-22fixed bees loaclizer, comb colors and bee namesDream-Master
2018-09-22Merge branch 'GT_Bees_dev_experimental' into GT_Bees_devDream-Master
# Conflicts: # src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
2018-09-22+added <1% bee mutation ratebartimaeusnek
+fixed crashing w/o mods for bees
2018-09-22fixed recipes and comb colorsDream-Master
2018-09-21add bee comb recipesDream-Master
2018-09-21fixcolors effects and localizersDream-Master
2018-09-21Add tf bees combs will followDream-Master
2018-09-21finish radiactive branch. Comb recipes will followDream-Master
2018-09-20More rare metal and radioactive beesDream-Master
2018-09-20fix some spellibng errors and color derps from combsDream-Master
2018-09-20more metal beesDream-Master
2018-09-20added comb recipes to gem bees in gt codeDream-Master
2018-09-20add more gem bees to gt codeDream-Master
2018-09-16add more bees and combs and recipesDream-Master
2018-09-16rename dropsDream-Master
2018-09-16fix comb recipesDream-Master
2018-09-16Add more bee combsDream-Master
2018-09-16add more bee combs recipesDream-Master
2018-09-16work on comb recipesDream-Master
2018-09-15fix derpDream-Master
fix bugs
2018-09-15optimize importsDream-Master
2018-09-15Add Propolis and PollenDream-Master
optimize imports
2018-09-15Add Drops recipe and change ROCK to rock in flowers alleleDream-Master
2018-09-15fix derpDream-Master
2018-09-15Add drops to gtDream-Master
2018-09-15More Thaumic Bee worksDream-Master
2018-09-15fixed and change bee recipesDream-Master
2018-09-15replace whole bee template with the traits copied from branchDream-Master