Commit Graph
763 Commits
Author SHA1 Message Date
tterrag1098 c2fa40d57e Move ISubmapManager to its own API file 2015-04-23 16:45:28 -04:00
tterrag1098 70af7b4d67 #301 crash invalid with marble pillar metadatas 2015-04-23 16:40:44 -04:00
tterrag1098 093fb5263c Merge branch 'ctm_refactor2' into dev 2015-04-23 00:35:02 -04:00
tterrag1098 2138aed80c CTM refactor is complete, officially dubbing next version 2.4 2015-04-23 00:34:37 -04:00
tterrag1098 6105a6104c Fix accidental reversion of CarvableHelper code during merge 2015-04-23 00:27:42 -04:00
tterrag1098 ee4eb3c357 Javadoc typo 2015-04-22 22:04:27 -04:00
tterrag1098 00647ece1a Add missing Dir file 2015-04-22 21:57:39 -04:00
tterrag1098 d0d01fbb68 Merge branch 'dev' into ctm_refactor2
Conflicts:
	src/main/java/com/cricketcraft/chisel/Features.java
	src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java
	src/main/java/com/cricketcraft/chisel/config/Configurations.java
2015-04-22 21:56:10 -04:00
tterrag1098 7f77a7de98 Merge branch 'master' into ctm_refactor2 2015-04-22 21:47:55 -04:00
tterrag1098 07f53ae6fb Clean up CTM documentation and move to API 2015-04-22 21:47:44 -04:00
tterrag1098 4f70831d35 Implement Fake AE Controller with the new ISubmapManager system 2015-04-22 21:04:40 -04:00
tterrag1098 0139a894f0 Implement ISubmapManager for custom IIcon handling 2015-04-22 18:00:56 -04:00
tterrag1098 85711e377e Massively clean up CTM code, much more readable now 2015-04-22 17:52:03 -04:00
warlordjones c2ad2bc5fa Fix #289 2015-04-12 17:41:35 +01:00
warlordjones 77e95fb934 Fix #288 2015-04-10 01:01:36 +01:00
CptSpaceToaster 430b852822 Merge pull request #275 from nark31/KR_Translate
Update ko_KR.lang
2015-04-09 08:22:07 -04:00
Nark 1fd23908e9 Update ko_KR.lang
add Fake Controller
2015-04-09 18:57:39 +09:00
Drullkus 0c66282e57 Rename some things... 2015-04-08 13:38:41 -07:00
Drullkus fd90784d03 Change the cracked stone anim 2015-04-08 13:31:44 -07:00
Drullkus c36cf92671 Finalize hacky AE Falsetto Controller 2015-04-08 10:45:00 -07:00
Drullkus d9081e576c Thanks, outdated code. @tterrag 2015-04-08 10:36:15 -07:00
Drullkus 4f318afb57 AE Falsetto Controller hack 2015-04-08 10:26:50 -07:00
Nark 414378000b Update ko_KR.lang
Update mistranslate
2015-04-08 22:25:57 +09:00
Nark 6e02463c2e Update ko_KR.lang 2015-04-08 22:23:02 +09:00
Drullkus 6c51b8e437 Circuit variations for all of your Futurama needs! 2015-04-07 22:35:59 -07:00
Drullkus ec1dc93a7d Fix strobe animation 2015-04-07 21:31:46 -07:00
Drullkus b9d11126b9 Add generic animations folder... Just organization. 2015-04-07 21:22:51 -07:00
CptSpaceToaster 686e081471 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev 2015-04-06 21:51:18 -04:00
CptSpaceToaster 9984abc245 final edits to changelog 2015-04-06 21:50:32 -04:00
tterrag1098 506cb04a60 Fix issues with present clientside desync 2015-04-06 21:44:37 -04:00
tterrag1098 705d1414f5 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-04-06 21:39:35 -04:00
tterrag1098 49f2b52200 Fix issues with presents and chunk boundaries / orphan chunks 2015-04-06 21:39:20 -04:00
CptSpaceToaster 916b5ebf7f Updated changelog to reflect our pirate roots 2015-04-06 19:56:09 -04:00
Drullkus b6c04a92e8 Add last ARcane stone variant 2015-04-06 16:52:21 -07:00
CptSpaceToaster 42116851aa updated changelog and version number for release 2015-04-06 19:48:55 -04:00
Drullkus f0e25b2804 New arcane stone types 2015-04-06 14:29:40 -07:00
tterrag1098 acf643c329 Add entries for new blocks in ChiselBlocks 2015-04-06 15:21:08 -04:00
warlordjones 7dc56ea093 Implement some more of the unused textures as factory variants
Only two textures I can't find a home for
2015-04-06 19:24:21 +01:00
warlordjones 4b2bd3af03 Implement the 'chrono' texture as a glass variant 2015-04-06 17:52:15 +01:00
warlordjones 872127952f Delete some useless textures from the unused folder 2015-04-06 17:31:50 +01:00
tterrag1098 75c4fc8850 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-04-06 01:16:25 -04:00
tterrag1098 fd33a66d18 Allow chisel torches to be FMP microparts 2015-04-06 01:16:14 -04:00
warlordjones b775ab77ea Prevent mobspawns on antiblocks as Cpt mentioned he wanted to do in #169 2015-04-05 17:00:03 +01:00
warlordjones 9337d787ef Workaround to prevent crashes with invalid pillar meta. Fixes #277 2015-04-05 16:45:10 +01:00
warlordjones 4deff8a7be 16-colour runic voidstone - closes #218 2015-04-05 16:34:08 +01:00
tterrag1098 aa03baa462 Fix mossy config 2015-04-02 14:52:26 -04:00
tterrag1098 87a83e4ae2 #286 Fix dedicated server crash 2015-04-01 18:34:03 -04:00
tterrag1098 e61105c8dc Add code to prevent GUI staying open if chisel item is not in hand 2015-03-31 17:16:07 -04:00
Nark df49bae3b3 Update ko_KR.lang
Add Iron/Gold blocks and to Oredict
2015-04-01 00:52:56 +09:00
warlordjones 7aca34c229 Fix #283 2015-03-30 22:55:28 +01:00