Commit Graph
231 Commits
Author SHA1 Message Date
Cricket d6e790ef1f Merge pull request #52 from warlordjones/patch-1
Fix Voidstone recipe conflict with CC wireless modems
2014-12-14 05:48:13 -08:00
Cricket e3fef1f18b Merge pull request #54 from warlordjones/patch-2
Fix spelling of a fantasy block.
2014-12-14 05:47:28 -08:00
Arona Jones 1809441433 Fix spelling! 2014-12-14 12:23:21 +00:00
Arona Jones 9bbbb0a1a4 Fix Voidstone recipe conflict with CC wireless modems 2014-12-14 10:48:30 +00:00
TheCricket 5d0fe396ca Optimize imports 2014-12-11 20:09:54 -05:00
TheCricket fc44eb6d1f Merge branch 'master' of https://github.com/TheCricket/Chisel-2 2014-12-11 07:54:10 -08:00
TheCricket f73c06e2d7 Textures are back 2014-12-11 07:53:41 -08:00
Cricket fab001658b Changed it so it doesn't crash 2014-12-11 07:42:55 -08:00
Cricket a787d21d2d Added back a voidstone 2014-12-11 07:41:02 -08:00
TheCricket 77c543a68a Auto chisel prep, done with #44 2014-12-10 20:13:52 -05:00
TheCricket 867be9a38c Recipes, lang, and ore dict 2014-12-08 16:42:43 -05:00
TheCricket fdab9c219f No more broken recipes, Fixes #46 2014-12-08 16:26:02 -05:00
TheCricket 222a2dd0fc Hex Plating added, I know no lang stuff 2014-12-07 20:45:17 -05:00
TheCricket bb69d2f1d3 How to get people to stop shouting in one easy commit! You cannot miss this! 2014-12-06 11:37:02 -05:00
TheCricket 9b04ad6dff forgot a couple textures 2014-12-03 21:00:11 -05:00
TheCricket f7e2dc0c07 Trying to add multiblock but it aint working 2014-12-03 20:59:03 -05:00
Drullkus ab2cd0f372 Textures for upgrades \o/
They’re kinda weird. I can come up with something different if needed.
:P
2014-12-03 17:06:18 -08:00
TheCricket 8caa6e557a FMP support added 2014-12-02 21:00:52 -05:00
TheCricket 16624321ae Fixes the Access Transformers in NEI not loading 2014-12-02 20:19:44 -05:00
Cricket 2af3d6e5aa Removed NEI until I can get this fixed 2014-12-02 19:15:47 -05:00
Cricket 97f400ab8b Update build.gradle 2014-12-02 19:02:46 -05:00
Cricket 29557b36f6 Update build.gradle 2014-12-02 16:57:08 -05:00
Cricket 17c48fe5c0 Update changelog 2014-12-02 16:40:15 -05:00
TheCricket 7020143e9c New Voidstone textures, The skulls one was removed and another put in its place 2014-12-01 19:54:35 -05:00
Cricket c3b1e879d1 Merge pull request #40 from MikeLydeamore/master
Fixed NPE in CTM fixes #39 and #28
2014-12-01 16:53:11 -08:00
Michael Lydeamore 19e85a99f0 Fixed NPE in CTM 2014-12-02 10:13:12 +10:30
TheCricket 1a04a7f86a I guess something changed in this? it really wants to commit 2014-12-01 15:32:16 -05:00
TheCricket 594ea146dd Merge remote-tracking branch 'origin/master' 2014-12-01 09:12:55 -05:00
TheCricket 68e1704b67 Version bump 2014-12-01 09:10:57 -05:00
TheCricket 2b175d8dd5 Oopsy 2014-12-01 09:08:33 -05:00
Cricket ce43d0318b Merge pull request #35 from Cobra1117/master
Reolves Issue #32: Updated "next variation" algorithm to properly select next index
2014-12-01 07:45:38 -05:00
Cricket 0c5627425b Merge pull request #34 from ViKaleidoscope/patch-2
Update zh_CN.lang
2014-12-01 07:44:14 -05:00
ViKaleidoscope a4bf937c37 Update zh_CN.lang 2014-12-01 13:39:00 +08:00
Cobra1117 7e7737790e Issue #32: Updated "next variation" algorithm to properly select next index instead of relying on incrementing metadata value. 2014-12-01 00:37:09 -05:00
TheCricket 25c370e580 Fixes #27 2014-11-30 18:17:37 -05:00
TheCricket b7d93a8345 Fixes #30 2014-11-30 18:10:51 -05:00
TheCricket 8768180d54 Added Waterstone 2014-11-30 18:02:58 -05:00
Cricket 932deee7fd Sorry, fixed #24 2014-11-29 12:34:26 -05:00
TheCricket df4dbad4c4 Version bump 2014-11-28 08:40:42 -05:00
TheCricket 171e065803 Version bump 2014-11-27 13:12:04 -05:00
TheCricket 7d41512d43 Chest will be done nearer to christmas 2014-11-27 13:07:59 -05:00
TheCricket 6c1178edb6 Chest commit 1 2014-11-26 20:03:54 -05:00
TheCricket 7badc6f8b1 Fancy Render system, leaves, lang changes, leaf description added 2014-11-24 18:48:10 -05:00
TheCricket 7b8e3bf10d Forgot you don't need this 2014-11-23 18:48:14 -05:00
TheCricket 5e7f601eac Worlds transfer now 2014-11-23 18:47:05 -05:00
TheCricket 1fe52ac4d2 Ready for a 2.0.0.3 with a little extra 2014-11-09 12:01:44 -05:00
TheCricket 5c604f34f1 Fixes #10 2014-11-09 10:33:31 -05:00
TheCricket e0c8b28611 Merge remote-tracking branch 'origin/master' 2014-11-03 17:16:35 -05:00
TheCricket d956325388 Fixes #11 2014-11-03 17:16:23 -05:00
Cricket ab2d808760 Merge pull request #8 from ViKaleidoscope/patch-2
Update zh_CN.lang
2014-11-03 15:41:46 -05:00