upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-12 00:07:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
387 Commits 5 Branches 98 Tags
5bd18ca2f88edd5da1cf7804a51fc217624d47fc
Commit Graph
387 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Wohlfarth 5bd18ca2f8 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 31c266c9a5 *facepalm* 2015-01-01 11:44:46 +00:00
Arona Jones 034fd78d4d 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 56e393f2e5 Second commit for chisel 2015! 2015-01-01 03:02:47 -08:00
Drullkus 936f18b24f Oops, almost forgot a bundle of stuff to toss out there 2015-01-01 03:00:02 -08:00
Drullkus c5d327ab13 Fix all mod blocks, AE2 and Railcraft blocks are all confirmed working 2014-12-31 20:15:49 -08:00
Arona Jones 048ebd6367 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 14becf987a Move all mod compatabitlity chiseling into ModBlocks.postLoad for complete/neatness 2015-01-01 00:26:27 +00:00
Arona Jones 6d5bda60b4 Move RC compat into postInit, make sure it happens after RC is loaded... 2015-01-01 00:24:37 +00:00
Drullkus 19fe273827 Comment out WIP stuff, fix a few things 2014-12-30 22:34:07 -08:00
Drullkus 7be3bb49ef Merge branch 'master' of https://github.com/TheCricket/Chisel-2 2014-12-30 20:14:38 -08:00
Drullkus c1432ed4d2 Add Mod Blocks and other things maybe 2014-12-30 20:12:25 -08:00
CptSpaceToaster c3170ffa83 I think these are the big changes... might be missing a couple 2014-12-30 17:53:49 -05:00
CptSpaceToaster 2de4a9ff39 modified gradlew permissions to allow execution 2014-12-30 17:29:31 -05:00
Cricket 9df5bd4603 Merge pull request #79 from CptSpaceToaster/master 
Fixed wonky Chests/Presents.
 2014-12-30 13:36:33 -08:00
CptSpaceToaster 6d57d8bab5 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 3908e1c8c8 Commit unspecific stuff 2014-12-30 09:15:28 -08:00
Drullkus 3eadff13dc More Arcane Blocks (Braaainz!) 2014-12-28 12:54:29 -08:00
Drullkus 9242051bb3 Experimental TFBlock Enchiselment 2014-12-28 11:32:58 -08:00
Cricket 0476b39d3d No more "swastika" and a little surprise for those who commented 2014-12-27 13:31:08 -05:00
Arona Jones c32ef83fab Two more torch textures, for more modern builds 2014-12-27 17:49:56 +00:00
Arona Jones 8e8e0cb245 Randomisation on the Aged Bricks 2014-12-27 17:49:56 +00:00
Arona Jones c47067632b Two new torch/lantern textures 2014-12-27 17:49:56 +00:00
Arona Jones 18f13f48e3 More warning signs. Closes Issue Number #ICan'tRememberTheIssueNumberAndDon'tHaveInternetAccessRightNow 2014-12-27 17:49:55 +00:00
Cricket 1011a4736f Update changelog, forgot to push 2014-12-27 12:19:27 -05:00
Cricket b9faed4139 Merge pull request #76 from Mazdallier/patch-1 
Create fr_FR.lang
 2014-12-27 08:43:47 -08:00
Yves 89a0753ffe Create fr_FR.lang 2014-12-27 17:41:40 +01:00
Arona Jones 95df30b61e 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 ac923c2885 Bump version to 2.2.1 2014-12-27 14:58:08 +01:00
Arona Jones 1da5ae008b Scorching Block Recipe. Closes #63 2014-12-27 14:56:30 +01:00
Cricket b78c2660a6 Merge pull request #68 from CptSpaceToaster/master 
Fixed a couple of the rendering issues
 2014-12-24 17:03:02 -08:00
CptSpaceToaster 8f111c0a35 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 0f7c399be7 Add Runes. v16 does not work :( 2014-12-24 12:25:02 -08:00
Drullkus eb4b0a429a Fix stuff 2014-12-24 11:56:24 -08:00
Drullkus c3aaba6629 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 11d130d93d Replace placeholder stuff 2014-12-24 11:54:00 -08:00
Drullkus 5da726e9e5 Merge pull request #66 from CptSpaceToaster/master 
CptSpaceToaster's fix for issues #62 #63 #65
 2014-12-24 11:51:34 -08:00
CptSpaceToaster dabaeb879a chiseled torches were missing their light values 2014-12-24 14:09:19 -05:00
CptSpaceToaster ebc4f7cb6d Merge remote-tracking branch 'upstream/master' 2014-12-24 13:48:50 -05:00
CptSpaceToaster ff69bbd23c Pumpkins have a hardness value now 2014-12-24 13:48:45 -05:00
Cricket 474fd7b966 Fixed Hardness and recipe bugs 2014-12-24 12:31:21 -05:00
Cricket 679095a711 Forgot a crafting recipe 2014-12-24 12:27:16 -05:00
Cricket 35bc74811e 200th Commit and made it better for loading 2014-12-24 12:16:19 -05:00
Drullkus 07f2aecb48 Merge branch 'master' of https://github.com/TheCricket/Chisel-2 2014-12-24 09:08:33 -08:00
Drullkus 291043567b Add other Arcane Stone block 2014-12-24 09:03:14 -08:00
Cricket 4fa1139afa Fixed the auto chisel name 2014-12-24 12:02:07 -05:00
Cricket 8431ef1e50 Done for this update 2014-12-24 11:53:11 -05:00
Cricket c4c2abfe3b Merge remote-tracking branch 'origin/master' 2014-12-24 11:12:45 -05:00
Cricket 29293b01e6 Just needs the transaction redone 2014-12-24 11:12:30 -05:00
Drullkus 6ff12a0f72 Commit a whack of textures 2014-12-24 07:01:39 -08:00