Commit Graph
78 Commits
Author SHA1 Message Date
Fenn c4557bab11 Fix for ProRed marble & chisel crafting config 2014-08-11 13:35:49 +01:00
Fenn 08e41f1c84 Moved to post init to be safe. 2014-08-10 12:15:32 +01:00
Fenn d844b446e4 That -should- be a fix for PR marble stuff.
Since it's now in scala i had to do a work around.
2014-08-10 12:12:39 +01:00
Fenn 0701588032 1.5.6a updated :p 2014-08-08 17:21:41 +01:00
Fenn 4152cbfd43 Fixed the stained glass carving issues. 2014-08-08 17:18:09 +01:00
Fenn 6489e7eb25 Merge pull request #32 from Parker8283/waila
Added Waila Integration
2014-08-08 15:44:55 +01:00
Parker 88edbebedc Added Waila Integration 2014-08-08 09:09:26 -04:00
Fenn f944e1dc8b Forced normal render of Lavastone. 2014-08-07 20:58:26 +01:00
Fenn af58f026d6 Fixed configuration and other stuff. 2014-07-26 09:17:49 +01:00
Fenn a8152e626f Seperated configurations into a new class. 2014-07-17 22:05:29 +01:00
Pokefenn 0eccfcda10 Merge pull request #28 from xbony2/patch-1
Goodbye .DS_Store
2014-07-17 16:10:46 +01:00
xbony2 fca815d17c Goodbye .DS_Store
This is so mac users like me can send pull requests without the .DS_Store file that are auto-generatored by OS-X, since most people don't those. See: http://en.wikipedia.org/wiki/.DS_Store
2014-07-17 09:34:01 -04:00
Fenn 32dbd9a4aa 1.5.6 and also recipes 2014-07-12 11:54:00 +01:00
Fenn 3d19ced0d9 Woolen Clay ;) 2014-07-12 11:11:34 +01:00
Fenn 9143e19089 Config for mossy blocks being made from stone 2014-07-12 10:54:47 +01:00
Fenn 6a39b1f230 Paperwalls? Paperwalls! 2014-07-11 17:39:36 +01:00
Fenn 25f9f1400d Things to 1.5.5a... 2014-07-05 19:36:32 +01:00
Fenn e5d3a873d8 *shakes fist at @zombiepig333 * fixes #24 2014-07-05 19:35:10 +01:00
Pokefenn 1ae9faae93 Merge pull request #23 from al3xthegre4/master
Capitialised the names of stuff
2014-07-05 13:33:02 +01:00
al3xthegre4 55bf10f4f5 This always bugged me about Chisel. 2014-07-05 13:23:24 +01:00
Fenn 69e83e80c0 Why is this file here... :< 2014-07-05 09:24:55 +01:00
Fenn 386c98a24a Gonna do 1.5.5 now
It's not gonna have the descriptions localized... since that would take
a stupidly long time :<
Would rather get a working build out and fix it later!
2014-07-05 09:18:21 +01:00
Fenn 4280147ece Locale for blocks (no descriptions) 2014-07-05 09:16:05 +01:00
Fenn 5113b1b6fb Changed the bracing style to under line on a few classes 2014-06-30 20:43:30 +01:00
Fenn c25919d012 Obsidian blocks 2014-06-30 15:39:36 +01:00
Fenn 247f323724 Ice stairs 2014-06-30 15:16:55 +01:00
Fenn 19d183879e Ice pillars 2014-06-30 14:56:42 +01:00
Fenn 7e43e56837 Removed derp. 2014-06-28 18:30:36 +01:00
Fenn 2fa7d38f05 Merge remote-tracking branch 'origin/master'
Conflicts:
	src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java
2014-06-28 18:28:51 +01:00
Fenn 88dd4333d1 I hate git at times 2014-06-28 18:26:04 +01:00
Pokefenn 131d12de21 Merge pull request #21 from zombiepig333/master
1.7.10 port, Finished Localizations(almost!), Config GUI's, Typo Fixes
2014-06-28 17:12:05 +01:00
zombiepig333 0da37ebff2 Way too busy today to finish the entire PR, should finish tomorrow. 2014-06-27 18:35:01 -07:00
zombiepig333 a6fbd50231 Fixed a few derps, localization coming along. 2014-06-27 18:07:23 -07:00
zombiepig333 9cce5018c5 Trying out the config gui to see if it would be a good idea. 2014-06-26 13:43:52 -07:00
zombiepig333 ea95d10666 More localizations!! 2014-06-26 12:51:47 -07:00
zombiepig333 02c6f40e2f Bumped to Forge 1149 2014-06-26 12:16:54 -07:00
zombiepig333 7437932cdd Merge pull request #1 from Pokefenn/master
Updating fork
2014-06-26 11:59:10 -07:00
Fenn 2c1e6ce7fe Cobblestone 2014-06-26 15:51:01 +01:00
Fenn 3700724133 Diamond block locale and also fixed bracing 2014-06-26 15:45:31 +01:00
Pokefenn 8d5568509a Merge pull request #19 from zombiepig333/master
1.7.10pre4 Port, Block Localization, Sound Fixes, Slab Fixes
2014-06-26 15:15:13 +01:00
zombiepig333 5977d977a5 Took time to port to 1.7.10pre4, more localization work.
-The stair descriptions hate me!!!
2014-06-24 16:22:06 -07:00
zombiepig333 dfaf4ed0f9 Localization disaster pt1 2014-06-23 21:42:23 -07:00
zombiepig333 1157c3cf4a Beginning of the localization ablockalypse. 2014-06-23 20:19:11 -07:00
Fenn 06b76ff06e Ready for build g 2014-06-21 10:42:12 +01:00
Fenn fe2c7e8c87 Fixed the crash with chisels <,< 2014-06-21 10:41:26 +01:00
Fenn 3ef784b494 Updated the forge version, ready for later builds 2014-06-17 17:30:17 +01:00
Fenn dda524ceb9 Using GameRegistry instead of CraftingManager 2014-06-16 19:11:29 +01:00
Fenn 56d6ec1ed9 Fixed dirt stuff.
This will shift the metadata in the world, though :/
2014-06-16 18:25:53 +01:00
Fenn b3c74bf57f Im a idiot. 2014-06-14 10:56:04 +01:00
Fenn 0780f7169a Fixed the crash bug in the latest forge, i think. 2014-06-14 10:49:32 +01:00