Commit Graph

168 Commits (58f58c45602ac39a0930500767610e52db66135d)

Author SHA1 Message Date
Dylan Knox 58f58c4560 fixes blocks in gui lighting issue #111 , cleans up import and drawItemStack 2016-01-11 18:36:18 -06:00
einsteinsci 51dc7b809f Fixed food NEI crash 2016-01-10 11:48:43 -08:00
einsteinsci c0b215cf69 Removed old JARs 2016-01-10 11:38:07 -08:00
einsteinsci 5b939b11f3 Removed Scala stupidity import 2016-01-10 11:36:01 -08:00
einsteinsci 9fbd2fd323 Merge remote-tracking branch 'MC_1.8/main' into main 2016-01-10 11:35:08 -08:00
einsteinsci 79e31960a1 Simplified CampfireCachedRecipe.getIngredients() code, *possibly* fixing food NEI crash. Only time can tell. 2016-01-10 11:27:26 -08:00
sealed interface 7493092c00 Merge pull request #113 from Adaptivity/main
A couple of tweaks
2016-01-09 13:06:06 -08:00
Adaptivity 9ab18231bd A couple of tweaks
Set mod version in code automatically
2016-01-10 00:00:56 +03:00
einsteinsci 00e52855a7 Prismarine no longer can quadruple in ender smelter 2016-01-08 22:33:12 -08:00
sealed interface 5200fed3f3 Update README.md 2016-01-08 22:29:56 -08:00
einsteinsci a7500ad73a Various tweaks 2016-01-08 21:17:07 -08:00
sealed interface 8c7b9ac3b0 Merge pull request #109 from knoxx093/main
More intuitive catalyst display - fixed
2016-01-08 20:41:03 -08:00
einsteinsci ffaedb89ce Redesigned smelters. 2016-01-08 20:36:51 -08:00
einsteinsci 8474609ecd Created abstract class for smelters. 2016-01-08 18:19:24 -08:00
einsteinsci a891607afe Created abstract class for kilns. 2016-01-08 17:54:53 -08:00
einsteinsci acf0be54f3 Created abstract class for brick ovens. 2016-01-08 14:06:14 -08:00
Dylan Knox a6c85a2230 Merge branch 'main' of github.com:einsteinsci/betterbeginnings into main 2016-01-08 15:53:00 -06:00
Dylan Knox e456343115 slot agnostic version of adaptive catalyst indicators 2016-01-08 15:48:11 -06:00
einsteinsci ff415690fa Moved SwitchEnumFacing to BlockSpecializedFurnace 2016-01-08 13:15:06 -08:00
einsteinsci 2e4eddcc9e Updated mod credits. 2016-01-08 13:12:12 -08:00
Dylan Knox a92a008471 Merge branch 'main' of github.com:einsteinsci/betterbeginnings into main 2016-01-08 14:48:57 -06:00
Dylan Knox ba4199cac7 Merge branch 'oredict' of github.com:knoxx093/betterbeginnings into main 2016-01-08 14:48:34 -06:00
einsteinsci e20d7257e2 Minor refactoring within recipe handlers 2016-01-08 12:29:04 -08:00
sealed interface 8cd290bfe9 Merge pull request #110 from knoxx093/oredict
Fixed ore dictionary compatibility missed previously.
2016-01-08 12:01:25 -08:00
einsteinsci 994035f074 Renamed SLOT_PAN and stackPan() to 'utensil' instead 2016-01-08 12:00:30 -08:00
einsteinsci 81d45917d4 Fixed minor changes missed by Leviathan143 cleanup. 2016-01-08 11:59:06 -08:00
Dylan Knox e522de6e93 Merge remote-tracking branch 'upstream/main' into main 2016-01-08 13:49:41 -06:00
sealed interface 31d1518c17 Merge pull request #108 from Leviathan143/cleanup
Mega-Cleanup in furnace code from Leviathan143
2016-01-08 11:46:12 -08:00
Dylan Knox 82c4cb6eee revert changes to iron nugget->ingot recipe 2016-01-08 13:33:11 -06:00
Dylan Knox 6abcf40a0e Revert "More ore dictionary compatibility. Some structure changes."
This reverts commit 1f62c5c7b2.
2016-01-08 13:30:15 -06:00
Dylan Knox 9f0f9a55e1 More ore dictionary compatibility. Some structure changes. 2016-01-08 12:04:58 -06:00
Dylan Knox 1f62c5c7b2 More ore dictionary compatibility. Some structure changes. 2016-01-08 11:58:50 -06:00
Dylan Knox f7c998e6d4 Merge branch 'main' of github.com:knoxx093/betterbeginnings into main 2016-01-08 11:06:06 -06:00
Dylan Knox e1f8d0c152 A little cleanup of the checkMatch algorithm, mainly moving the catalyst
checks out of the inner loops and different organization of fail
conditions. Adds some internal null checking to OreRecipeElement. Catalyst
positions are now required to match.
2016-01-08 11:05:25 -06:00
Dylan Knox f9d9877bde Fixes the catalyst stack display to count down as intended 2016-01-08 11:05:25 -06:00
Dylan Knox 3d7b78cbac More intuitive catalyst display 2016-01-08 11:05:25 -06:00
Dylan Knox 0ea606277d More intuitive catalyst display 2016-01-08 11:05:25 -06:00
Dylan Knox cfe945fb1c A little cleanup of the checkMatch algorithm, mainly moving the catalyst
checks out of the inner loops and different organization of fail
conditions. Adds some internal null checking to OreRecipeElement. Catalyst
positions are now required to match.
2016-01-08 11:04:00 -06:00
Dylan Knox 3122c5e241 Fixes the catalyst stack display to count down as intended 2016-01-08 11:02:55 -06:00
einsteinsci a284ee3afa Cleanup Furnace code
Moved common furnace Container code to a base class and unified some variables.

Moved common furnace TE code to a base class and unified some variables.

Moved common furnace Block code to a base class and unified some variables.
2016-01-08 19:24:33 +13:00
einsteinsci 52b04968a5 Added "shortcut" recipe for leather strips from rabbit hide. 2016-01-07 19:42:13 -08:00
einsteinsci 4e74e828f4 Fixed #106 occuring in the Nether Brick Oven as well. 2016-01-07 19:12:59 -08:00
einsteinsci d9fcd990f7 Fixed duplication glitch #107 (off-by-one error). Probably still occurs in 1.7.10. 2016-01-07 19:05:18 -08:00
Dylan Knox f53e3396c8 More intuitive catalyst display 2016-01-07 14:42:21 -06:00
Dylan Knox 6386ce7f59 More intuitive catalyst display 2016-01-07 14:41:19 -06:00
Leviathan143 d10d1671ea Merge branch 'main' of https://github.com/einsteinsci/betterbeginnings into main 2016-01-03 20:28:00 +13:00
einsteinsci b3ec3ec3c7 Added helpful tooltips to campfire and simple workbench. 2016-01-02 12:05:21 -08:00
einsteinsci 2f1a159ec0 ItemKnife.getContainerItem() now properly returns a copy of the input stack. Might help with #97. 2016-01-01 14:56:15 -08:00
sealed interface 2960dd0baf Merge pull request #103 from knoxx093/main
Bugfix: Simple workbench gui closes instantly
2016-01-01 10:37:35 -08:00
Dylan Knox 514e32a604 removing unused import 2016-01-01 09:52:41 -06:00