Commit Graph
163 Commits
Author SHA1 Message Date
Drullkus 1374ca5d1f Add Imperial+Rebel Blocks... :P 2015-03-07 08:03:26 -08:00
tterrag1098 44c23f555e Move TC API into correct folder and switch to using the entire API 2015-02-28 10:33:55 -05:00
tterrag1098 b23ce4ded0 Fix imports 2015-02-25 04:24:11 -05:00
Cricket 21d4b523d5 Merge pull request #245 from yesimwearingpants/dev
Added Search to CreativeTabs
2015-02-24 20:58:13 -05:00
yesimwearingpants b63bb69fff Fixed Derp 2015-02-24 20:20:31 -05:00
yesimwearingpants 760deb9abf Added Search To CreativeTabs 2015-02-24 20:03:04 -05:00
tterrag1098 7f3fabcb96 Remove extra PlayerSpecials registration that crashes servers 2015-02-23 00:26:42 -05:00
tterrag1098 bf4ce506e5 Merge remote-tracking branch 'origin/Cricket' into dev
Conflicts:
	src/main/java/com/cricketcraft/chisel/Chisel.java
	src/main/java/com/cricketcraft/chisel/Features.java
	src/main/java/com/cricketcraft/chisel/config/Configurations.java
	src/main/resources/assets/chisel/textures/items/chisel_obsidian.png
2015-02-19 19:11:16 -05:00
Cricket e3e7529018 Dev stuff is complete 2015-02-19 17:13:16 -05:00
Cricket 005a8c5b9e I have 2 done, I am not that creative 2015-02-12 21:33:58 -05:00
warlordjones 4f514bea5e Add fallback icons for all tabs. Fixes #202 2015-02-07 16:13:19 +00:00
tterrag1098 f61de467f7 Fix some issues with ice/icestairs/icepillars/packedice (#189) 2015-01-29 16:58:45 -05:00
tterrag1098 9a05bc03a9 Implement metal blocks and clean up some unloc names 2015-01-27 01:45:37 -05:00
tterrag1098 dd300f70aa Rewrite presents. Still a bit WIP, needs sounds and lid animation 2015-01-26 22:41:48 -05:00
warlordjones d494f66ce7 Oops 2015-01-17 14:53:24 +00:00
tterrag1098 62970671f9 Remove colored sand. Cleanup CarvableHelper to add merged group support 2015-01-15 15:21:34 -05:00
tterrag1098 bbcec193be Fix up how stairs are registered 2015-01-14 19:15:26 -05:00
tterrag1098 4d384500d8 Fix warning sign recipe and bad naming on top slabs 2015-01-14 05:38:17 -05:00
tterrag1098 735b0f9d37 Clean up warnings and packages 2015-01-13 01:45:52 -05:00
tterrag1098 e8a0dc008f Clean up description localization (Fixes #104). Fix cloud rendering. 2015-01-13 00:50:10 -05:00
tterrag1098 1920feeb1d Fix FMP integration. All normal blocks are now auto registered.
Fixes #89
Fixes #93
2015-01-12 23:52:53 -05:00
warlordjones ebd6dedca9 I don't code gud. 2015-01-12 22:35:40 +00:00
warlordjones 9c540b0b9c Convert Ice pillars to CTM method
Also make Packed Ice use textures from the ice folder, no sense in duping the folder and adding packed to the front

TODO: Convert the old pillars to new on world load?
2015-01-12 22:25:54 +00:00
warlordjones 9610f3bd25 Foundation for Chiselable Blood Brick 2015-01-12 20:29:46 +00:00
warlordjones 3d79cef938 Some tallow varieties 2015-01-12 19:07:56 +00:00
warlordjones 4cf99bdc8d Convert Voidstone Pillar to the CTM Pillar type 2015-01-12 19:01:06 +00:00
tterrag1098 e34cacce0c Fix road line typo 2015-01-12 03:38:59 -05:00
tterrag1098 e5000e2123 Fix warning sign rendering 2015-01-12 00:26:08 -05:00
CptSpaceToaster dc4495e0b7 Finalizing AntiBlock prototype 2015-01-11 22:37:51 -05:00
CptSpaceToaster bbc33601f8 Merge branch 'dev' into antiblocks 2015-01-11 22:30:31 -05:00
CptSpaceToaster 7e1e437bbf Prototyped Antiblocks 2015-01-11 20:53:24 -05:00
warlordjones 6dde438e97 Update the Autochisel recipe 2015-01-11 21:56:20 +00:00
warlordjones fb225ee244 Switch Road Lines to meta 2015-01-11 21:54:36 +00:00
warlordjones 18adbe8bc6 #Warderp returns 2015-01-11 21:23:09 +00:00
Drullkus 1ec6bfddbe Merge remote-tracking branch 'origin/dev' into dev 2015-01-11 13:21:40 -08:00
warlordjones cac6fa70c1 Implement more road lines - Double White, Yellow and Double Yellow 2015-01-11 21:19:33 +00:00
Drullkus a75a5d8be8 Merge remote-tracking branch 'origin/dev' into dev 2015-01-11 13:19:30 -08:00
Drullkus 133b3262b2 Add Poptart Rainbow, push files around 2015-01-11 13:18:53 -08:00
warlordjones 9d868864f9 Import Organisation 2015-01-11 20:59:16 +00:00
Arona Jones 83d3f7e0a9 Merge branch 'revert' into dev 2015-01-11 20:54:24 +00:00
warlordjones 61b0135715 Fix the Blood Magic Blank Rune compat blocks 2015-01-11 20:25:34 +00:00
warlordjones 2e357881cf Fix more derping... 2015-01-11 19:48:43 +00:00
warlordjones fac1042c02 I r a stupid. #Blame Derpjones 2015-01-11 19:41:41 +00:00
warlordjones e9fb9409ac Fix #133
Also refactor BlockLightstoneCarvable to BlockCarvableGlowstone (Consistency)
2015-01-11 19:40:35 +00:00
warlordjones 75203c3c3d Some Thaumium Block concepts 2015-01-11 19:26:21 +00:00
warlordjones ae830fc1f5 Setup basic infrastructure for Chiselable Thaumium, Tallow and Amber 2015-01-11 19:03:34 +00:00
warlordjones a0acbef0d5 Rework the warning sign background texture.
Also prevent lightbulbs smoking (it was bad for their health)
2015-01-11 13:36:13 +00:00
warlordjones 940b98bed8 Reimplementing Warning Signs & Torches 2015-01-11 12:03:19 +00:00
tterrag1098 2259ecfba4 Move all block registration to preinit to prevent creative tab issues 2015-01-10 17:21:16 -05:00
warlordjones 46ddb61b72 Stop the mod tab crashing 2015-01-10 21:09:20 +00:00