upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-12 16:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
96 Commits 5 Branches 98 Tags
ffcbf444cdfa544290ff3db9355d9a4e8c5fe01b
Commit Graph
96 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
EoD ffcbf444cd Revert "Manually added EoDs PR." 
This reverts commit 752bb63900e67f7242accdef0799ae7bd2a7c9aa due to some
missing changes
 2014-09-09 18:57:43 +02:00
Fenn 376c485f3c Fix for crash with HEE 2014-09-06 18:02:20 +01:00
Fenn 98ae948926 Merge pull request #40 from Adaptivity/patch-2 
Update ru_RU.lang
 2014-09-06 14:37:46 +01:00
Fenn 3f16a666ef Manually added EoDs PR. 2014-09-06 11:46:36 +01:00
Fenn 6b1ec65beb Merge pull request #42 from Lordmau5/master 
Changes to the left-clicking with the Chisel in-hand...
 2014-09-06 11:35:52 +01:00
Fenn be36008786 Merge pull request #45 from GravitasShortfall/master 
Added "Laboratory Block"
 2014-09-06 11:28:53 +01:00
GravitasShortfall 51677db15f Added "Laboratory Block" 
Set of laboratory/hi-tech-themed blocks with corresponding textures
(textures made by myself).
 2014-09-05 17:10:46 +01:00
Konata Izumi cac56fcdb5 Remove unnecessary "ClassNotFound"-stacktrace (mod compat.) 2014-09-02 00:36:59 +02:00
Konata Izumi b17aae93f9 Ye... the block update is needed here ... 
Also version bump
 2014-08-31 13:55:12 +02:00
Konata Izumi 653a1df6c9 Changes to the left-clicking with the Chisel in-hand... 
Basicly, the Chisel as item can't break ANY blocks anymore, it's all handled through Forge-events.
I don't think there are needs to check, if the config-option for this is enabled / disabled, so the item can still break blocks in the world... Seems useless..
 2014-08-31 13:37:01 +02:00
Anton a1cec7aefb Update ru_RU.lang 
With help of MailGik, Russian translation is 100% complete.
 2014-08-28 22:45:13 +04:00
Fenn e6bf5f8dd6 1.5.6b 2014-08-24 10:51:53 +01:00
Fenn 2ec448b9de Fixed some recipe derps. 2014-08-24 10:49:06 +01:00
Fenn 162f458bb3 Merge pull request #35 from ViKaleidoscope/patch-1 
Create zh_CN.lang
 2014-08-19 11:34:50 +01:00
Fenn 6ffb71b831 Sound fix. 2014-08-19 10:53:37 +01:00
Princess 80f8962a8d Create zh_CN.lang 
Localization for 1.7.10. :)
 2014-08-16 02:00:19 +08:00
Fenn dc3639565a Bluepower support added for Marble 2014-08-13 16:58:37 +01:00
Fenn 02a7be514d Derped on that. 2014-08-11 13:46:17 +01:00
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