Commit Graph
465 Commits
Author SHA1 Message Date
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 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
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
Drullkus b6c04a92e8 Add last ARcane stone variant 2015-04-06 16:52:21 -07: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
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
warlordjones 7aca34c229 Fix #283 2015-03-30 22:55:28 +01:00
tterrag1098 6ac0c22d16 Vastly improve block loading speed by removing getResource calls 2015-03-28 14:27:54 -04:00
tterrag1098 af894aa805 Fix broken IMC handling 2015-03-27 15:49:28 -04:00
CptSpaceToaster ecf9357b8d 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 a65331cbab Fix Tcon/Botania compat crashing on load 2015-03-19 20:37:20 -04:00
Cricket baa573272f Dont touch tterrag :P 2015-03-19 16:16:21 -04:00
emustee15 cad131c549 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
warlordjones 41908489e9 Packed ice pillar recipe. Fixes #261. Muh bad. 2015-03-13 15:13:41 +00:00
warlordjones e039282c93 Fix #262. Test yo commits, Drullkus! 2015-03-13 15:11:34 +00:00
Drullkus f9fa6ec129 Add Iron/Gold blocks and to Oredict, Recolored Antiblocks a little 2015-03-11 13:44:02 -07:00
Drullkus 29b0e92164 Forgot to comment this out. 2015-03-09 15:52:52 -07:00
Drullkus 0f3a28bdc3 Untested - Added TCon Chisel blocks 2015-03-09 15:46:16 -07:00
Drullkus 2a3b812b8a Implement new 1.8 textures 2015-03-08 18:12:17 -07:00
Drullkus 84a29c7a38 Merge remote-tracking branch 'origin/dev' into dev 2015-03-08 14:06:01 -07:00
Drullkus 2dcb2b51b4 Added Large Hex Plating 2015-03-08 14:05:34 -07:00
Cricket 3e2a5cb524 You make special snow golems now 2015-03-08 16:48:05 -04:00
Cricket a333164685 You can wear pumpkins now 2015-03-08 15:23:35 -04:00
Drullkus beb986e7f7 Fix up Masonry textures 2015-03-08 09:59:38 -07:00
Cricket 6d62a409e3 Addons can now use CTM 2015-03-08 12:32:45 -04:00
Cricket b3259215ab RoyCurtis: Fixed chiselled bookshelves dropping invalid books 2015-03-08 12:17:55 -04:00
Drullkus 102f56a7da Quick fix to Nation 2015-03-07 08:46:29 -08:00
Drullkus 1374ca5d1f Add Imperial+Rebel Blocks... :P 2015-03-07 08:03:26 -08:00
Cricket 601573eb81 They just need descriptions 2015-03-04 16:40:02 -05:00
tterrag1098 795f98adfe Improve chisel container/slot code to prevent crashes/dupes
Fixes #257 #236
2015-03-04 13:25:33 -05:00
CptSpaceToaster f173222edc This should be all of the changes I made AFTER I ran the bogus merge, clearying out tterag's work 2015-03-04 00:27:19 -05:00
CptSpaceToaster 256911259d prepared CTM-Renderer for upcoming changes' 2015-03-01 12:52:10 -05:00
CptSpaceToaster de9dcdd04e And there it goes 2015-03-01 12:44:09 -05:00