Commit Graph
419 Commits
Author SHA1 Message Date
Adaptivity e32cc4392e Update ru_RU.lang 2015-01-06 20:18:27 +03:00
Drullkus a3a58fd3f0 Adding three fixed CTM files.
They're close enough I guess. I'll tweak them later.
2015-01-05 21:00:37 -08:00
Cricket c25209da79 Fixed it and my horrible derp 👯 2015-01-05 20:57:32 -05:00
Cricket c587f259f1 Merge remote-tracking branch 'origin/master' 2015-01-05 20:25:30 -05:00
Cricket e6a973f545 add textures, I can't get this to work for the life of me 2015-01-05 20:25:16 -05:00
Drullkus f36277e2f5 Fix it up a little 2015-01-05 17:07:36 -08:00
Drullkus b27c1cb160 Commit stuff for MCBugtracker. 2015-01-05 16:44:55 -08:00
Cricket 74d2071e3d and... imports 2015-01-05 19:15:35 -05:00
Cricket 6e082bcae2 Create GeneratorChisel.java 2015-01-05 19:14:54 -05:00
Cricket f4f1cf32fb textures 2015-01-05 19:14:13 -05:00
Cricket 19b88a34c6 Merge remote-tracking branch 'origin/master' 2015-01-05 18:18:07 -05:00
Cricket 0786bf0025 1.8 generation added, fixed #91 and #84 2015-01-05 18:17:57 -05:00
Drullkus 28dfe26270 Setup Textures for AntiBlocks and retextured Hex Plating 2015-01-04 18:39:27 -08:00
Arona Jones dd178d0169 Coloured Sand, as requested. Closes #83 2015-01-04 18:19:38 +00:00
Arona Jones b07ecc3ab7 .gitignore server stuff and update forge version 2015-01-04 18:14:38 +00:00
Cricket ef3f91c24e I think this will fix it? 2015-01-04 10:03:44 -05:00
Cricket 74b3e4a150 Merge remote-tracking branch 'origin/master' 2015-01-03 21:26:04 -05:00
Cricket a44b11cc16 Cryogenic sign, eh its ok 2015-01-03 21:25:52 -05:00
Cricket 35b6db49ed Merge pull request #87 from Voidi/master
support Chisel Input with registered ores and oreDictonary
2015-01-03 17:51:34 -08:00
CptSpaceToaster d4ea601140 merged in changes from OCD blocks 2015-01-03 17:32:33 -05:00
Cricket 67c3731e28 Forgot crafting recipes 2015-01-03 16:50:54 -05:00
Cricket 462931de59 Pumpkin is brighter now, found it a little dim 2015-01-03 16:44:37 -05:00
Meadowcottage f6048ec8db Added OCD Blocks 2015-01-03 14:24:51 +00:00
Cricket ac4f7fdc29 Added AlchemicalWizardry support 2015-01-02 21:22:46 -05:00
Cricket 7830150aba oops 2015-01-02 18:53:43 -05:00
Cricket 5d72539204 Tab organization 2015-01-02 18:52:53 -05:00
Cricket 19669b587b EnderIO compat hopefully fixes #9 2015-01-02 17:26:12 -05:00
Cricket 6b0005df79 Merge remote-tracking branch 'origin/master' 2015-01-02 16:47:08 -05:00
Cricket 33c9521a78 Diamond chisel is working 2015-01-02 16:46:57 -05:00
Arona Jones 425121edb6 Fix Hex plating only giving 1 block, instead of 8 2015-01-02 19:18:15 +00:00
Cricket d73732b838 Merge branch 'Meadowcottage-master' 2015-01-02 11:45:25 -05:00
Cricket 10b0a18b28 Initial diamond chisel update 2015-01-02 11:45:04 -05:00
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