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
1,026 Commits 5 Branches 98 Tags
5cc3f2a3e0964df8d5f7f498a80646eda89eae38
Commit Graph
1026 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
tterrag1098 5cc3f2a3e0 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-06-22 16:07:00 -04:00
tterrag1098 114327445b Add ctmlib version 2015-06-22 16:06:22 -04:00
Cricket e0fea80ac9 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev 2015-06-22 16:03:19 -04:00
Cricket d9447cbfba Beacons are done but they render oddly 2015-06-22 16:00:35 -04:00
tterrag1098 f724d6ff7b Fix import 2015-06-22 15:42:46 -04:00
tterrag1098 7e2157ebad Merge branch 'dev' into ctmlib 2015-06-22 15:42:01 -04:00
tterrag1098 12381c3a76 Fix this AE2 mess. This code is tested with stable9 and works fine. 2015-06-22 15:39:56 -04:00
Cricket 0d434ff9b3 fixed controllers and removed AE2 support 2015-06-22 14:21:22 -04:00
tterrag1098 444e5cfd8e Update buildscript to shade CTMLib (once it is on maven) 2015-06-22 13:58:38 -04:00
Cricket 69c5f5d07e Spelling error 2015-06-22 13:13:47 -04:00
Cricket 119afb8d7e Merge pull request #338 from nark31/KR_Translate 
Update ko_KR.lang
 2015-06-22 13:12:09 -04:00
Nark bda36c3e28 Update ko_KR.lang 2015-06-23 01:25:30 +09:00
Cricket c513924af7 👯 2015-06-21 22:34:17 -04:00
Cricket 09f12d5194 Controllers are done 2015-06-21 22:28:46 -04:00
Cricket 9b6e1495d4 Allows the changing the config in game 2015-06-20 22:18:13 -04:00
Cricket afce955cd1 Fixes #334 #333 and #330 2015-06-20 22:16:00 -04:00
Cricket a92b236ae8 Cleanup smbarbour's code 2015-06-20 21:54:17 -04:00
Cricket 3d03f41985 Merge branch 'Repair' of https://github.com/smbarbour/Chisel-2 into dev 2015-06-20 21:49:34 -04:00
Scott Barbour a3f7f217ac Implement repairs 2015-06-19 18:10:44 -05:00
tterrag1098 c014e93d8d This should work, not tested 2015-06-13 01:27:10 -04:00
tterrag1098 f5101a279b Unfinished don't touch 2015-06-13 00:20:18 -04:00
Cricket 37ad501b2a added minecreatr and a missing texture 2015-06-06 20:32:25 -04:00
Cricket 4951fd31ad That should fix ee3 2015-06-04 13:49:58 -04:00
Cricket 7bdc0487f0 Update PlayerSpecials.java 2015-06-03 19:49:53 -04:00
tterrag1098 fcec71a52d Move over rendering stuff to ctmlib 2015-06-03 17:43:03 -04:00
Cricket af59d14bc5 Merge remote-tracking branch 'origin/dev' into dev 2015-06-02 11:33:54 -04:00
Cricket 4a2eced4aa its was missing a SideOnly 2015-06-02 11:33:44 -04:00
tterrag1098 ed5162104e Fix reversion upgrade implementation 2015-06-02 00:46:23 -04:00
Cricket d64a379b41 I have no idea why this gets NPE's all the time 2015-06-01 18:24:52 -04:00
Cricket 55aac1030b Revert "pushing broken code, its fun to look at though" 
This reverts commit 49c9a7a1a5.
 2015-06-01 17:06:53 -04:00
Cricket 4ba78dd9b7 pushing broken code, its fun to look at though 2015-06-01 14:15:05 -04:00
Cricket 86ef50c2fc fix the boo boo 2015-05-30 17:54:51 -04:00
Cricket 4d7c3424d4 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev 2015-05-30 17:36:29 -04:00
Cricket 46bea5a0a3 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 c688c0fe37 Merge pull request #325 from Kodos-Atoz/patch-1 
Made Hex Plating Blastproof
 2015-05-29 19:45:36 -07:00
Kodos Atoz a48de38fdb Made Hex Plating Blastproof 
Assuming I did this correctly.
 2015-05-29 21:39:03 -05:00
tterrag1098 cb1c69d850 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-05-29 15:52:27 -04:00
tterrag1098 841ad0b9aa Fix stat additions 2015-05-29 15:52:03 -04:00
Cricket 11e9b23c50 Merge remote-tracking branch 'origin/dev' into dev 2015-05-29 15:27:52 -04:00
Cricket 39e7715f37 it was oreDicted wrong but #317 is fixed from it I guess 2015-05-29 15:27:43 -04:00
tterrag1098 354ad4fe76 Do not register oredict before registering the block 2015-05-29 15:13:44 -04:00
tterrag1098 5e25640338 @Drullkus this texture is not unused 2015-05-29 15:08:03 -04:00
Cricket ee10932174 Ever wondered how many blocks you have chiseled? 2015-05-29 14:17:50 -04:00
Cricket 7aed838c66 Fix the gitignore 2015-05-29 13:40:02 -04:00
Cricket a49c139db7 Actually registers the 1.8 oreDicts properly 2015-05-29 13:35:22 -04:00
Cricket 7590127641 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 7046590e33 Register 1.8 oredicts properly. 2015-05-28 20:57:22 +01:00
warlordjones 743004abcf Register 1.8 stones in oredict. (Closes #305) 2015-05-28 20:46:26 +01:00
tterrag1098 da1faaac90 Fix item rendering textures being incorrect 2015-05-28 15:08:49 -04:00
tterrag1098 e5efdb7d02 Fix column rendering crashing 2015-05-28 14:19:43 -04:00