Commit Graph
55 Commits
Author SHA1 Message Date
Drullkus a504475ed1 Commit new Masonry Textures, will implement them later 2015-02-04 22:02:59 -08:00
Drullkus d49c48f7eb Merge remote-tracking branch 'origin/dev' into dev 2015-02-04 21:02:49 -08:00
Drullkus 89cb42ca39 Commit new malfunctioning fan tex 2015-02-04 21:02:18 -08:00
Cricket 21dffb0b3f Added config option to chisel across colors 2015-02-04 20:20:01 -05:00
tterrag1098 b35a08bd06 Clean up @Drullkus' mess 2015-01-31 01:23:27 -05:00
Drullkus 4b6c85f565 Commit more textures for metals. Untested;stuffs may get broken 2015-01-30 22:06:41 -08:00
tterrag1098 662a9e7326 Fix some issues with ice/icestairs/icepillars/packedice (#189) 2015-01-29 16:58:45 -05:00
tterrag1098 70bc5071a8 Fix auto chisel unloc name 2015-01-27 19:59:41 -05:00
tterrag1098 d27492a555 Implement metal blocks and clean up some unloc names 2015-01-27 01:45:37 -05:00
Drullkus 418996a716 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev 2015-01-26 21:01:19 -08:00
Drullkus c6a96fd21c Stuff 2015-01-26 20:12:10 -08:00
tterrag1098 e1b28f7336 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into
dev

Conflicts:
	src/main/java/com/cricketcraft/chisel/Features.java
2015-01-26 22:42:59 -05:00
tterrag1098 8faa70ba46 Rewrite presents. Still a bit WIP, needs sounds and lid animation 2015-01-26 22:41:48 -05:00
Cricket 049b0fb3bb Recipe fix for #180 2015-01-26 16:58:51 -05:00
tterrag1098 415cf2213a Fix copper feature 2015-01-25 20:11:43 -05:00
warlordjones 70ec42f12c Allow chiseling between oredictionaried copper blocks.
In prep for adding blocktypes for copper.
2015-01-25 20:40:46 +00:00
warlordjones 3bd4a62e72 Implement new Yellow bricktype 2015-01-25 20:40:46 +00:00
tterrag1098 a4f779ef0f Add config to prevent chiseling between vanilla leaf types.
Closes #171
2015-01-24 23:32:51 -05:00
tterrag1098 ef86c3f4ae Fix typo in granite descriptions 2015-01-24 22:04:47 -05:00
tterrag1098 fa2dee3d77 Fix all worldgen issues. Use 1.8 textures. Implement 1.8 block pillars.
Closes #168
Closes #159
Closes #130
2015-01-24 22:03:30 -05:00
tterrag1098 a38b7c4f23 Fix antiblock recipes, and all dye-using recipes now support oredict 2015-01-20 20:39:14 -05:00
tterrag1098 8a539dfeaa Merge branch 'master' into dev
Conflicts:
	changelog
2015-01-20 20:05:29 -05:00
tterrag1098 3f9f2955da Update preparing for 2.3.2, fix antiblocks being chiselable 2015-01-20 20:04:46 -05:00
Cricket 61fc228dd3 oopsy 2015-01-20 19:20:07 -05:00
Cricket 378453692b Recipes added 2015-01-20 18:43:51 -05:00
tterrag1098 09d72a44b8 Fix jackolanterns not emitting light 2015-01-19 21:18:48 -05:00
tterrag1098 d4bd181ef1 Add some lifecycle logging to Features 2015-01-19 18:59:25 -05:00
warlordjones 65bbfafce9 Oops 2015-01-17 14:53:24 +00:00
warlordjones c5578680fe Add requested O2 warning sign 2015-01-17 14:51:29 +00:00
warlordjones eb325e6c9e Full Block Paperwall Recipe 2015-01-17 14:21:47 +00:00
warlordjones 2778bbbbd2 Full Block Version of Paperwall, as requested 2015-01-17 14:07:18 +00:00
tterrag1098 63af23ebff Fix formatting issues in last commit 2015-01-16 22:45:57 -05:00
warlordjones 0b9142f3ea Solution for #141. Smashing Rock had the same entity ID as Ball O' Moss 2015-01-16 13:48:12 +00:00
Tyler 7d0a63aba0 Added forgotten abyssal stone for railcraft 2015-01-15 18:10:02 -05:00
tterrag1098 edfc431305 Remove colored sand. Cleanup CarvableHelper to add merged group support 2015-01-15 15:21:34 -05:00
tterrag1098 1e1e9f75c3 Fix material and harvest level of bookshelves 2015-01-15 13:50:37 -05:00
tterrag1098 14da0862d4 Fix some blocks being unchiselable (ex. stone) 2015-01-15 13:36:53 -05:00
tterrag1098 2b867c86f6 Refactor ICarvable to receive world and pos references. Closes #147. 2015-01-15 13:09:34 -05:00
tterrag1098 12816c2364 Merge remote-tracking branch 'origin/registry_refactor' into dev 2015-01-15 03:18:44 -05:00
tterrag1098 1ea5d821d7 Rewrite how Carving stores variants and groups 2015-01-15 03:16:02 -05:00
Drullkus ed7cd3d39c Add another two thaumium block variants 2015-01-14 21:22:59 -08:00
tterrag1098 36b03d15fc Begin refactor, make CarvingVariation and CarvingGroup interfaces 2015-01-15 00:03:43 -05:00
Drullkus be58acd783 Add two new Thaumium blocks 2015-01-14 20:59:20 -08:00
tterrag1098 6540317cae Fix up how stairs are registered 2015-01-14 19:15:26 -05:00
tterrag1098 83c3d1c85c Fix some corner cases in slab placement 2015-01-14 06:23:52 -05:00
tterrag1098 623fa9fddb Merge remote-tracking branch 'origin/nei' into dev 2015-01-14 05:43:18 -05:00
tterrag1098 416a779fee Fix warning sign recipe and bad naming on top slabs 2015-01-14 05:38:17 -05:00
Tonius 70b29cd506 Merge remote-tracking branch 'github/dev' into nei 2015-01-14 11:36:22 +01:00
Tonius 93465884ab Un-hardcoded smooth stone chiseling and made it configurable 2015-01-14 11:10:29 +01:00
tterrag1098 938b79ae46 Fix #140 sand has incorrect sound 2015-01-13 20:51:54 -05:00