Commit Graph
788 Commits
Author SHA1 Message Date
tterrag1098 0b0ef5846f #301 crash invalid with marble pillar metadatas 2015-04-23 16:40:44 -04:00
tterrag1098 59dcf10846 Merge branch 'ctm_refactor2' into dev 2015-04-23 00:35:02 -04:00
tterrag1098 c0f342f094 Fix accidental reversion of CarvableHelper code during merge 2015-04-23 00:27:42 -04:00
tterrag1098 31ea512b48 Javadoc typo 2015-04-22 22:04:27 -04:00
tterrag1098 87ce7b34c3 Add missing Dir file 2015-04-22 21:57:39 -04:00
tterrag1098 9b0b5fc592 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 be707a89fe Clean up CTM documentation and move to API 2015-04-22 21:47:44 -04:00
tterrag1098 3b62791a0f Implement Fake AE Controller with the new ISubmapManager system 2015-04-22 21:04:40 -04:00
tterrag1098 c647044006 Implement ISubmapManager for custom IIcon handling 2015-04-22 18:00:56 -04:00
tterrag1098 2c8d88a639 Massively clean up CTM code, much more readable now 2015-04-22 17:52:03 -04:00
warlordjones 12efb9ff76 Fix #289 2015-04-12 17:41:35 +01:00
warlordjones bb7d6b9693 Fix #288 2015-04-10 01:01:36 +01:00
CptSpaceToaster 18e96bbf8e Merge pull request #275 from nark31/KR_Translate
Update ko_KR.lang
2015-04-09 08:22:07 -04:00
Nark 7b195124da Update ko_KR.lang
add Fake Controller
2015-04-09 18:57:39 +09:00
Drullkus a58e8bee86 Rename some things... 2015-04-08 13:38:41 -07:00
Drullkus eb3f8f6d1d Change the cracked stone anim 2015-04-08 13:31:44 -07:00
Drullkus b85bebd972 Finalize hacky AE Falsetto Controller 2015-04-08 10:45:00 -07:00
Drullkus 90a700b73b Thanks, outdated code. @tterrag 2015-04-08 10:36:15 -07:00
Drullkus c402af9430 AE Falsetto Controller hack 2015-04-08 10:26:50 -07:00
Nark dff25bb536 Update ko_KR.lang
Update mistranslate
2015-04-08 22:25:57 +09:00
Nark 39c3861f50 Update ko_KR.lang 2015-04-08 22:23:02 +09:00
Drullkus 22e86710e3 Circuit variations for all of your Futurama needs! 2015-04-07 22:35:59 -07:00
Drullkus cf6313960d Fix strobe animation 2015-04-07 21:31:46 -07:00
Drullkus c1ccba9f70 Add generic animations folder... Just organization. 2015-04-07 21:22:51 -07:00
tterrag1098 4bcfeb1889 Fix issues with present clientside desync 2015-04-06 21:44:37 -04:00
tterrag1098 7c9f8eca2d Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-04-06 21:39:35 -04:00
tterrag1098 a71ec55104 Fix issues with presents and chunk boundaries / orphan chunks 2015-04-06 21:39:20 -04:00
Drullkus fa3dad02a6 Add last ARcane stone variant 2015-04-06 16:52:21 -07:00
Drullkus e8b4ae928a New arcane stone types 2015-04-06 14:29:40 -07:00
tterrag1098 97fdd64f93 Add entries for new blocks in ChiselBlocks 2015-04-06 15:21:08 -04:00
warlordjones 0e9af0a72b 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 e73d4df314 Implement the 'chrono' texture as a glass variant 2015-04-06 17:52:15 +01:00
warlordjones a18b938429 Delete some useless textures from the unused folder 2015-04-06 17:31:50 +01:00
tterrag1098 ac59109af3 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-04-06 01:16:25 -04:00
tterrag1098 6699005c14 Allow chisel torches to be FMP microparts 2015-04-06 01:16:14 -04:00
warlordjones d483727a09 Prevent mobspawns on antiblocks as Cpt mentioned he wanted to do in #169 2015-04-05 17:00:03 +01:00
warlordjones a5e71b4c71 Workaround to prevent crashes with invalid pillar meta. Fixes #277 2015-04-05 16:45:10 +01:00
warlordjones be7ba84d09 16-colour runic voidstone - closes #218 2015-04-05 16:34:08 +01:00
tterrag1098 9b6e30937c Fix mossy config 2015-04-02 14:52:26 -04:00
tterrag1098 2e5d57cb4e #286 Fix dedicated server crash 2015-04-01 18:34:03 -04:00
tterrag1098 608c7d787f Add code to prevent GUI staying open if chisel item is not in hand 2015-03-31 17:16:07 -04:00
Nark 2940607690 Update ko_KR.lang
Add Iron/Gold blocks and to Oredict
2015-04-01 00:52:56 +09:00
warlordjones 9d8429be2e Fix #283 2015-03-30 22:55:28 +01:00
tterrag1098 9518eeedf7 Vastly improve block loading speed by removing getResource calls 2015-03-28 14:27:54 -04:00
tterrag1098 3f61447481 Fix broken IMC handling 2015-03-27 15:49:28 -04:00
Nark 7dbfe2f14a Update ko_KR.lang 2015-03-25 14:48:55 +09:00
CptSpaceToaster 9c0f20180d Merge pull request #267 from emustee15/ReverseTextureFix
Backwards Connected Texture Fix (Issue #190)

Sorry for the delay... Thank you so much for being patient
2015-03-23 00:41:39 -04:00
tterrag1098 e974dd7fbe Fix Tcon/Botania compat crashing on load 2015-03-19 20:37:20 -04:00
Cricket b81db2197d Dont touch tterrag :P 2015-03-19 16:16:21 -04:00
emustee15 b4d2aa7c07 Backwards Connected Texture Fix (Issue #190)
The wrong directions are used for reversing textures. As a result, some
textures for the laboratory blocks appeared incorrect. This will fix
issue 190. A single digit change fixes both directions, as direction 4
did not need to be reversed, but was, and direction 5 needed to be
reversed, but wasn't.
2015-03-18 21:04:00 -04:00