Commit Graph
55 Commits
Author SHA1 Message Date
Drullkus 0431b9e119 Commit new Masonry Textures, will implement them later 2015-02-04 22:02:59 -08:00
Drullkus ef88c6e85c Merge remote-tracking branch 'origin/dev' into dev 2015-02-04 21:02:49 -08:00
Drullkus ed3e85f1a5 Commit new malfunctioning fan tex 2015-02-04 21:02:18 -08:00
Cricket c279200fc7 Added config option to chisel across colors 2015-02-04 20:20:01 -05:00
tterrag1098 b110eab3c3 Clean up @Drullkus' mess 2015-01-31 01:23:27 -05:00
Drullkus 0afed73114 Commit more textures for metals. Untested;stuffs may get broken 2015-01-30 22:06:41 -08:00
tterrag1098 f61de467f7 Fix some issues with ice/icestairs/icepillars/packedice (#189) 2015-01-29 16:58:45 -05:00
tterrag1098 7f88e05741 Fix auto chisel unloc name 2015-01-27 19:59:41 -05:00
tterrag1098 9a05bc03a9 Implement metal blocks and clean up some unloc names 2015-01-27 01:45:37 -05:00
Drullkus d67fa838de Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev 2015-01-26 21:01:19 -08:00
Drullkus 2ffdafe5a6 Stuff 2015-01-26 20:12:10 -08:00
tterrag1098 adbb7dc73c 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 dd300f70aa Rewrite presents. Still a bit WIP, needs sounds and lid animation 2015-01-26 22:41:48 -05:00
Cricket 512c6d092d Recipe fix for #180 2015-01-26 16:58:51 -05:00
tterrag1098 fe77d20450 Fix copper feature 2015-01-25 20:11:43 -05:00
warlordjones 2f811c3c1c Allow chiseling between oredictionaried copper blocks.
In prep for adding blocktypes for copper.
2015-01-25 20:40:46 +00:00
warlordjones 7b33ffc721 Implement new Yellow bricktype 2015-01-25 20:40:46 +00:00
tterrag1098 31b3421a7d Add config to prevent chiseling between vanilla leaf types.
Closes #171
2015-01-24 23:32:51 -05:00
tterrag1098 06d0ae5e6c Fix typo in granite descriptions 2015-01-24 22:04:47 -05:00
tterrag1098 d4523481d4 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 74451548fb Fix antiblock recipes, and all dye-using recipes now support oredict 2015-01-20 20:39:14 -05:00
tterrag1098 fe9a745891 Merge branch 'master' into dev
Conflicts:
	changelog
2015-01-20 20:05:29 -05:00
tterrag1098 e04ccae081 Update preparing for 2.3.2, fix antiblocks being chiselable 2015-01-20 20:04:46 -05:00
Cricket 28bba3b568 oopsy 2015-01-20 19:20:07 -05:00
Cricket 8aa4df831e Recipes added 2015-01-20 18:43:51 -05:00
tterrag1098 fa651b6e21 Fix jackolanterns not emitting light 2015-01-19 21:18:48 -05:00
tterrag1098 7aede5f992 Add some lifecycle logging to Features 2015-01-19 18:59:25 -05:00
warlordjones d494f66ce7 Oops 2015-01-17 14:53:24 +00:00
warlordjones 52fcf4f9a7 Add requested O2 warning sign 2015-01-17 14:51:29 +00:00
warlordjones a4a8b443ca Full Block Paperwall Recipe 2015-01-17 14:21:47 +00:00
warlordjones 1af2224ad4 Full Block Version of Paperwall, as requested 2015-01-17 14:07:18 +00:00
tterrag1098 462edc2f7e Fix formatting issues in last commit 2015-01-16 22:45:57 -05:00
warlordjones 5d9079e798 Solution for #141. Smashing Rock had the same entity ID as Ball O' Moss 2015-01-16 13:48:12 +00:00
Tyler 9485ddc028 Added forgotten abyssal stone for railcraft 2015-01-15 18:10:02 -05:00
tterrag1098 62970671f9 Remove colored sand. Cleanup CarvableHelper to add merged group support 2015-01-15 15:21:34 -05:00
tterrag1098 4a8af575fb Fix material and harvest level of bookshelves 2015-01-15 13:50:37 -05:00
tterrag1098 a084f26c86 Fix some blocks being unchiselable (ex. stone) 2015-01-15 13:36:53 -05:00
tterrag1098 1292a68d8d Refactor ICarvable to receive world and pos references. Closes #147. 2015-01-15 13:09:34 -05:00
tterrag1098 68cedc26c5 Merge remote-tracking branch 'origin/registry_refactor' into dev 2015-01-15 03:18:44 -05:00
tterrag1098 447e472c04 Rewrite how Carving stores variants and groups 2015-01-15 03:16:02 -05:00
Drullkus f7ff55c62a Add another two thaumium block variants 2015-01-14 21:22:59 -08:00
tterrag1098 155bc00f0e Begin refactor, make CarvingVariation and CarvingGroup interfaces 2015-01-15 00:03:43 -05:00
Drullkus b268ebeca0 Add two new Thaumium blocks 2015-01-14 20:59:20 -08:00
tterrag1098 bbcec193be Fix up how stairs are registered 2015-01-14 19:15:26 -05:00
tterrag1098 297a09c24b Fix some corner cases in slab placement 2015-01-14 06:23:52 -05:00
tterrag1098 b1d815c399 Merge remote-tracking branch 'origin/nei' into dev 2015-01-14 05:43:18 -05:00
tterrag1098 4d384500d8 Fix warning sign recipe and bad naming on top slabs 2015-01-14 05:38:17 -05:00
Tonius 7413b72cc5 Merge remote-tracking branch 'github/dev' into nei 2015-01-14 11:36:22 +01:00
Tonius 0b1090f71f Un-hardcoded smooth stone chiseling and made it configurable 2015-01-14 11:10:29 +01:00
tterrag1098 df78946af7 Fix #140 sand has incorrect sound 2015-01-13 20:51:54 -05:00