Commit Graph
878 Commits
Author SHA1 Message Date
tterrag1098 659d58aca1 Add ctmlib version 2015-06-22 16:06:22 -04:00
tterrag1098 395b0a7762 Fix import 2015-06-22 15:42:46 -04:00
tterrag1098 78ffa78b48 Merge branch 'dev' into ctmlib 2015-06-22 15:42:01 -04:00
tterrag1098 19f3ca733b Fix this AE2 mess. This code is tested with stable9 and works fine. 2015-06-22 15:39:56 -04:00
Cricket 0f0b91ec96 fixed controllers and removed AE2 support 2015-06-22 14:21:22 -04:00
tterrag1098 5869259396 Update buildscript to shade CTMLib (once it is on maven) 2015-06-22 13:58:38 -04:00
Cricket ca0dec38ce Spelling error 2015-06-22 13:13:47 -04:00
Cricket 97e094ecfe Merge pull request #338 from nark31/KR_Translate
Update ko_KR.lang
2015-06-22 13:12:09 -04:00
Nark 3136336ef5 Update ko_KR.lang 2015-06-23 01:25:30 +09:00
Cricket 11f8d54180 👯 2015-06-21 22:34:17 -04:00
Cricket 0a0800fae8 Controllers are done 2015-06-21 22:28:46 -04:00
Cricket 5e614b5983 Allows the changing the config in game 2015-06-20 22:18:13 -04:00
Cricket e582719d9e Fixes #334 #333 and #330 2015-06-20 22:16:00 -04:00
Cricket 57901aec23 Cleanup smbarbour's code 2015-06-20 21:54:17 -04:00
Cricket eaacc7b95e Merge branch 'Repair' of https://github.com/smbarbour/Chisel-2 into dev 2015-06-20 21:49:34 -04:00
Scott Barbour 0c041357ca Implement repairs 2015-06-19 18:10:44 -05:00
tterrag1098 8ac8e4f27f This should work, not tested 2015-06-13 01:27:10 -04:00
tterrag1098 9291d30dca Unfinished don't touch 2015-06-13 00:20:18 -04:00
Cricket 988fc949c3 added minecreatr and a missing texture 2015-06-06 20:32:25 -04:00
Cricket d22cce273a That should fix ee3 2015-06-04 13:49:58 -04:00
Cricket e0f01ef0d3 Update PlayerSpecials.java 2015-06-03 19:49:53 -04:00
tterrag1098 45526e5dd9 Move over rendering stuff to ctmlib 2015-06-03 17:43:03 -04:00
Cricket 15b462cb1b Merge remote-tracking branch 'origin/dev' into dev 2015-06-02 11:33:54 -04:00
Cricket f62b444509 its was missing a SideOnly 2015-06-02 11:33:44 -04:00
tterrag1098 8826bbde4b Fix reversion upgrade implementation 2015-06-02 00:46:23 -04:00
Cricket 783b75f704 I have no idea why this gets NPE's all the time 2015-06-01 18:24:52 -04:00
Cricket 20146e5a47 Revert "pushing broken code, its fun to look at though"
This reverts commit 49c9a7a1a5.
2015-06-01 17:06:53 -04:00
Cricket 49c9a7a1a5 pushing broken code, its fun to look at though 2015-06-01 14:15:05 -04:00
Cricket 47fcd33c65 fix the boo boo 2015-05-30 17:54:51 -04:00
Cricket 28b7b4b296 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev 2015-05-30 17:36:29 -04:00
Cricket 5744ed64f6 Those are the textures for it, I can't figure out the CTM logic. Plus I made it so carvable glow can be colored by the dye or regular 2015-05-30 17:34:02 -04:00
Drullkus 9a6d990203 Merge pull request #325 from Kodos-Atoz/patch-1
Made Hex Plating Blastproof
2015-05-29 19:45:36 -07:00
Kodos Atoz aa63e2fd63 Made Hex Plating Blastproof
Assuming I did this correctly.
2015-05-29 21:39:03 -05:00
tterrag1098 58f12b442a Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-05-29 15:52:27 -04:00
tterrag1098 c0f182d7f7 Fix stat additions 2015-05-29 15:52:03 -04:00
Cricket fc5cfa80e9 Merge remote-tracking branch 'origin/dev' into dev 2015-05-29 15:27:52 -04:00
Cricket 6bbdbaa1fa it was oreDicted wrong but #317 is fixed from it I guess 2015-05-29 15:27:43 -04:00
tterrag1098 8207002465 Do not register oredict before registering the block 2015-05-29 15:13:44 -04:00
tterrag1098 388afeac49 @Drullkus this texture is not unused 2015-05-29 15:08:03 -04:00
Cricket aa2ecb9be0 Ever wondered how many blocks you have chiseled? 2015-05-29 14:17:50 -04:00
Cricket f3dafcb5ae Fix the gitignore 2015-05-29 13:40:02 -04:00
Cricket 0cf67725d7 Actually registers the 1.8 oreDicts properly 2015-05-29 13:35:22 -04:00
Cricket eb0955587c Merge remote-tracking branch 'origin/dev' into dev
commit 1a47c78556.

Conflicts:
	src/main/java/com/cricketcraft/chisel/Features.java
2015-05-29 13:29:54 -04:00
warlordjones ee86d65311 Register 1.8 oredicts properly. 2015-05-28 20:57:22 +01:00
warlordjones 0839ba76f9 Register 1.8 stones in oredict. (Closes #305) 2015-05-28 20:46:26 +01:00
tterrag1098 109840a291 Fix item rendering textures being incorrect 2015-05-28 15:08:49 -04:00
tterrag1098 83ec95fac0 Fix column rendering crashing 2015-05-28 14:19:43 -04:00
tterrag1098 cff54cda62 Better fix for #312, null checking for the chisel item in the GUI 2015-05-28 13:42:07 -04:00
warlordjones 47754dd9e0 Dirty workaround to fix #312
Don't open chisel GUI if the block clicked on has a tile entity. Most TE's have GUIs anyway, so this shouldn't be noticable.

Also ignore /world and /config from workspace
2015-05-28 18:04:36 +01:00
tterrag1098 a7f7f5a6ae Improve README file, move some stuff to the new CONTRIBUTING file 2015-05-27 22:51:56 -04:00