Commit Graph
99 Commits
Author SHA1 Message Date
TheCricket bdaf0f2340 Voidstone fixed, and now configurable because some people like the animated texture 2014-12-14 19:08:11 -05:00
Arona Jones 1052955560 Grimstone dig SFX 2014-12-14 22:12:17 +00:00
Arona Jones 3fcc34bd10 Fix what I broke and new grimstone particle texture 2014-12-14 21:56:19 +00:00
Arona Jones 00e61ee729 Item texture organisation and new smashing rock texture 2014-12-14 21:35:24 +00:00
Arona Jones fadcf82673 Fix some non-critical errors/warnings, probably didn't break anything 2014-12-14 21:31:55 +00:00
Arona Jones 477a2736cf Texture naming consistency and stuff 2014-12-14 21:21:28 +00:00
Arona Jones 2ff8a058d7 Import Optimization again 2014-12-14 20:05:39 +00:00
Arona Jones 8f5a0cee6a Capitlisation consistency is nice 2014-12-14 20:05:23 +00:00
Arona Jones 8eb774d3a0 Create British English localisation 2014-12-14 20:00:05 +00:00
Arona Jones e217def877 Tidy up en_US lang 2014-12-14 19:59:45 +00:00
Arona Jones a79f7c1599 Ignore workspace files 2014-12-14 19:59:36 +00:00
TheCricket 07502c6d60 Added Grimstone and Fantasy Block 2 2014-12-14 14:22:17 -05:00
TheCricket cbc16fa1e0 Fixed #53 2014-12-14 12:46:16 -05:00
Cricket d3631c7367 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 c63457bb22 Merge pull request #54 from warlordjones/patch-2
Fix spelling of a fantasy block.
2014-12-14 05:47:28 -08:00
Arona Jones a6bf02bb5d Fix spelling! 2014-12-14 12:23:21 +00:00
Arona Jones 040324393c Fix Voidstone recipe conflict with CC wireless modems 2014-12-14 10:48:30 +00:00
TheCricket d703d5bae1 Optimize imports 2014-12-11 20:09:54 -05:00
TheCricket 7525123aad Merge branch 'master' of https://github.com/TheCricket/Chisel-2 2014-12-11 07:54:10 -08:00
TheCricket 9ff5d8a588 Textures are back 2014-12-11 07:53:41 -08:00
Cricket 6f4027bee7 Changed it so it doesn't crash 2014-12-11 07:42:55 -08:00
Cricket 9a36beb3b4 Added back a voidstone 2014-12-11 07:41:02 -08:00
TheCricket 75bb82a84e Auto chisel prep, done with #44 2014-12-10 20:13:52 -05:00
TheCricket 3fbf5a8ae2 Recipes, lang, and ore dict 2014-12-08 16:42:43 -05:00
TheCricket d7636cdc56 No more broken recipes, Fixes #46 2014-12-08 16:26:02 -05:00
TheCricket a0b304d18a Hex Plating added, I know no lang stuff 2014-12-07 20:45:17 -05:00
TheCricket 3719e0a217 How to get people to stop shouting in one easy commit! You cannot miss this! 2014-12-06 11:37:02 -05:00
TheCricket 4b1596719c forgot a couple textures 2014-12-03 21:00:11 -05:00
TheCricket 420f94c6bf Trying to add multiblock but it aint working 2014-12-03 20:59:03 -05:00
Drullkus 7db6e7efa8 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 2c8bce3087 FMP support added 2014-12-02 21:00:52 -05:00
TheCricket 2142626402 Fixes the Access Transformers in NEI not loading 2014-12-02 20:19:44 -05:00
Cricket 5685c09443 Removed NEI until I can get this fixed 2014-12-02 19:15:47 -05:00
Cricket 7d128bcc65 Update build.gradle 2014-12-02 19:02:46 -05:00
Cricket 797f18c71c Update build.gradle 2014-12-02 16:57:08 -05:00
Cricket d902267e98 Update changelog 2014-12-02 16:40:15 -05:00
TheCricket 08a61caf13 New Voidstone textures, The skulls one was removed and another put in its place 2014-12-01 19:54:35 -05:00
Cricket e0cfb22f83 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 ef6b85807d Fixed NPE in CTM 2014-12-02 10:13:12 +10:30
TheCricket e435e51797 I guess something changed in this? it really wants to commit 2014-12-01 15:32:16 -05:00
TheCricket 2936abd215 Merge remote-tracking branch 'origin/master' 2014-12-01 09:12:55 -05:00
TheCricket 4abfec1928 Version bump 2014-12-01 09:10:57 -05:00
TheCricket 0f3c31f97c Oopsy 2014-12-01 09:08:33 -05:00
Cricket a416f902eb 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 f6f35dde35 Merge pull request #34 from ViKaleidoscope/patch-2
Update zh_CN.lang
2014-12-01 07:44:14 -05:00
ViKaleidoscope 1cb8469562 Update zh_CN.lang 2014-12-01 13:39:00 +08:00
Cobra1117 fbcd1f1e47 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 9c76b1a1ed Fixes #27 2014-11-30 18:17:37 -05:00
TheCricket 0f263f84f8 Fixes #30 2014-11-30 18:10:51 -05:00
TheCricket cdbe10b7d9 Added Waterstone 2014-11-30 18:02:58 -05:00