Commit Graph
256 Commits
Author SHA1 Message Date
Cricket fc5e46d144 Merge pull request #87 from Voidi/master
support Chisel Input with registered ores and oreDictonary
2015-01-03 17:51:34 -08:00
CptSpaceToaster fd908283f0 merged in changes from OCD blocks 2015-01-03 17:32:33 -05:00
Cricket c59af3601e Forgot crafting recipes 2015-01-03 16:50:54 -05:00
Cricket 7a2e3fc094 Pumpkin is brighter now, found it a little dim 2015-01-03 16:44:37 -05:00
Meadowcottage 0a10e8391f Added OCD Blocks 2015-01-03 14:24:51 +00:00
Cricket 6c7f569d4d Added AlchemicalWizardry support 2015-01-02 21:22:46 -05:00
Cricket b06bdc936b oops 2015-01-02 18:53:43 -05:00
Cricket c25879ddbc Tab organization 2015-01-02 18:52:53 -05:00
Cricket 64349f88a4 EnderIO compat hopefully fixes #9 2015-01-02 17:26:12 -05:00
Cricket 1e5397ac17 Merge remote-tracking branch 'origin/master' 2015-01-02 16:47:08 -05:00
Cricket 996be4b4e0 Diamond chisel is working 2015-01-02 16:46:57 -05:00
Arona Jones 4cb1d4c50e Fix Hex plating only giving 1 block, instead of 8 2015-01-02 19:18:15 +00:00
Cricket b2a8807efd Merge branch 'Meadowcottage-master' 2015-01-02 11:45:25 -05:00
Cricket 7c9c7b1794 Initial diamond chisel update 2015-01-02 11:45:04 -05:00
Tobias Wohlfarth 84d7eb4852 support Chisel Input with registered ores and oreDictonary
modified:   src/main/java/com/cricketcraft/chisel/carving/Carving.java
2015-01-02 15:28:40 +01:00
Arona Jones 18164a6530 *facepalm* 2015-01-01 11:44:46 +00:00
Arona Jones 69c6578d5e Subsplit the creative tab into 4, by material.
May sort it a different way, this is still under consideration.
2015-01-01 11:44:25 +00:00
Drullkus c6ddc5373a Second commit for chisel 2015! 2015-01-01 03:02:47 -08:00
Drullkus 2793fea3bb Oops, almost forgot a bundle of stuff to toss out there 2015-01-01 03:00:02 -08:00
Drullkus 0779d98b8d Fix all mod blocks, AE2 and Railcraft blocks are all confirmed working 2014-12-31 20:15:49 -08:00
Arona Jones 6a42bf42e1 As requested quite a few times, Chiselable Packed Ice (Basically unmelting normal ice :P) is a thing 2015-01-01 00:58:55 +00:00
Arona Jones 017175d40e Move all mod compatabitlity chiseling into ModBlocks.postLoad for complete/neatness 2015-01-01 00:26:27 +00:00
Arona Jones 4ae5b962d7 Move RC compat into postInit, make sure it happens after RC is loaded... 2015-01-01 00:24:37 +00:00
Drullkus 9df4cb2045 Comment out WIP stuff, fix a few things 2014-12-30 22:34:07 -08:00
Drullkus 2d1d9de076 Merge branch 'master' of https://github.com/TheCricket/Chisel-2 2014-12-30 20:14:38 -08:00
Drullkus 42eaf7ea8d Add Mod Blocks and other things maybe 2014-12-30 20:12:25 -08:00
CptSpaceToaster 0cdf736dca I think these are the big changes... might be missing a couple 2014-12-30 17:53:49 -05:00
CptSpaceToaster 49dd8ced7f modified gradlew permissions to allow execution 2014-12-30 17:29:31 -05:00
Cricket d8ff31c4a1 Merge pull request #79 from CptSpaceToaster/master
Fixed wonky Chests/Presents.
2014-12-30 13:36:33 -08:00
CptSpaceToaster 341822b74e Fixed wonky Chests/Presents. We still need textures for later, when it won't be christmas 2014-12-30 16:34:07 -05:00
Drullkus 510c3a7bbf Commit unspecific stuff 2014-12-30 09:15:28 -08:00
Drullkus 74066909a3 More Arcane Blocks (Braaainz!) 2014-12-28 12:54:29 -08:00
Drullkus 60d7137aad Experimental TFBlock Enchiselment 2014-12-28 11:32:58 -08:00
Cricket 81789ea01d No more "swastika" and a little surprise for those who commented 2014-12-27 13:31:08 -05:00
Arona Jones 787734e117 Two more torch textures, for more modern builds 2014-12-27 17:49:56 +00:00
Arona Jones 7699f8604b Randomisation on the Aged Bricks 2014-12-27 17:49:56 +00:00
Arona Jones 26e57df428 Two new torch/lantern textures 2014-12-27 17:49:56 +00:00
Arona Jones e5e4ff1aba More warning signs. Closes Issue Number #ICan'tRememberTheIssueNumberAndDon'tHaveInternetAccessRightNow 2014-12-27 17:49:55 +00:00
Cricket af4592f336 Update changelog, forgot to push 2014-12-27 12:19:27 -05:00
Cricket 9c95adb33f Merge pull request #76 from Mazdallier/patch-1
Create fr_FR.lang
2014-12-27 08:43:47 -08:00
Yves c39189bc30 Create fr_FR.lang 2014-12-27 17:41:40 +01:00
Arona Jones a7718d6dff Reorder Smashing Rock's smashing order. Closes #64
Can't work out why it looks like a Ball of Moss when thrown though, Chisel is doing something wierdly.
2014-12-27 15:06:36 +01:00
Arona Jones 5571282dac Bump version to 2.2.1 2014-12-27 14:58:08 +01:00
Arona Jones e546385f6b Scorching Block Recipe. Closes #63 2014-12-27 14:56:30 +01:00
Cricket 6fa656add0 Merge pull request #68 from CptSpaceToaster/master
Fixed a couple of the rendering issues
2014-12-24 17:03:02 -08:00
CptSpaceToaster 335f7e4377 fixed a couple of the rendering issues, now to find out why each chest still has it's unique inventory, and why they rotate whichever way they want to. 2014-12-24 15:44:02 -05:00
Drullkus 2c7f84398b Add Runes. v16 does not work :( 2014-12-24 12:25:02 -08:00
Drullkus f00af98652 Fix stuff 2014-12-24 11:56:24 -08:00
Drullkus ce8924fc54 Merge remote-tracking branch 'origin/master'
Conflicts:
	src/main/java/com/cricketcraft/chisel/init/ModBlocks.java
2014-12-24 11:54:32 -08:00
Drullkus 9bb3575620 Replace placeholder stuff 2014-12-24 11:54:00 -08:00