upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-12 00:07:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
354 Commits 5 Branches 98 Tags
eb4b0a429ae8fffbe00a39263c55eb55b8cb4598
Commit Graph
354 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Drullkus eb4b0a429a Fix stuff 2014-12-24 11:56:24 -08:00
Drullkus c3aaba6629 Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/main/java/com/cricketcraft/chisel/init/ModBlocks.java
 2014-12-24 11:54:32 -08:00
Drullkus 11d130d93d Replace placeholder stuff 2014-12-24 11:54:00 -08:00
Drullkus 5da726e9e5 Merge pull request #66 from CptSpaceToaster/master 
CptSpaceToaster's fix for issues #62 #63 #65
 2014-12-24 11:51:34 -08:00
CptSpaceToaster dabaeb879a chiseled torches were missing their light values 2014-12-24 14:09:19 -05:00
CptSpaceToaster ebc4f7cb6d Merge remote-tracking branch 'upstream/master' 2014-12-24 13:48:50 -05:00
CptSpaceToaster ff69bbd23c Pumpkins have a hardness value now 2014-12-24 13:48:45 -05:00
Cricket 474fd7b966 Fixed Hardness and recipe bugs 2014-12-24 12:31:21 -05:00
Cricket 679095a711 Forgot a crafting recipe 2014-12-24 12:27:16 -05:00
Cricket 35bc74811e 200th Commit and made it better for loading 2014-12-24 12:16:19 -05:00
Drullkus 07f2aecb48 Merge branch 'master' of https://github.com/TheCricket/Chisel-2 2014-12-24 09:08:33 -08:00
Drullkus 291043567b Add other Arcane Stone block 2014-12-24 09:03:14 -08:00
Cricket 4fa1139afa Fixed the auto chisel name 2014-12-24 12:02:07 -05:00
Cricket 8431ef1e50 Done for this update 2014-12-24 11:53:11 -05:00
Cricket c4c2abfe3b Merge remote-tracking branch 'origin/master' 2014-12-24 11:12:45 -05:00
Cricket 29293b01e6 Just needs the transaction redone 2014-12-24 11:12:30 -05:00
Drullkus 6ff12a0f72 Commit a whack of textures 2014-12-24 07:01:39 -08:00
Arona Jones 8bbb91e32d Begin work on Chiselable Thaumcraft Arcane Stone :D 2014-12-24 15:50:31 +01:00
Cricket 3eb7d90c89 Just pushing my work so far 2014-12-23 20:16:31 -05:00
Cricket 8620d975ee API Note addded 2014-12-23 08:12:47 -08:00
Cricket f91db4a149 Cleaned up harvest level 2014-12-23 08:08:07 -08:00
Cricket 428e1ca4c1 Delete ChiselLeftClick.java 2014-12-23 08:06:41 -08:00
Cricket ee5428a585 Cleaned up config 2014-12-23 08:05:53 -08:00
Cricket d666dd71b2 Removed Chisel left click 2014-12-23 08:04:31 -08:00
Cricket 9c7c5c6d67 Adds the upgrade slots to the container 2014-12-23 08:02:18 -08:00
Cricket 6cbae14573 Updated package naming, I guess we forgot 2014-12-23 07:57:32 -08:00
Drullkus 02937068fe Move more files ;Fix Todo Typo (Really, Drullkus?) 2014-12-22 16:17:48 -08:00
Drullkus 6a841e5f26 Pushing some files around for Diamond series 2014-12-22 16:07:48 -08:00
Drullkus ebe08fc822 Condensed eight x64 dirt CTM files into four smaller files 2014-12-22 15:39:35 -08:00
Drullkus cb3efbd25b Did some texture work 2014-12-22 15:02:13 -08:00
Cricket 6c7fcd9384 More stream work 2014-12-22 17:52:31 -05:00
Cricket 4370b7634c Merge remote-tracking branch 'origin/master' 2014-12-22 16:46:12 -05:00
Cricket 0a9f604231 Auto Chisel work 2014-12-22 16:45:46 -05:00
TheCricket a908950351 added more christmas presents 2014-12-22 06:25:30 -08:00
Drullkus 89fd684b60 Technical blocks now ready for release! 2014-12-21 12:51:32 -08:00
Cricket 31c2e526de Updated the changelog 2014-12-20 15:42:42 -05:00
Cricket f243922d55 Forgot a test thing 2014-12-20 15:36:26 -05:00
Cricket 55d258eadb Merge remote-tracking branch 'origin/master' 2014-12-20 15:36:04 -05:00
Cricket 9ea871a568 Fixes scaffold 2014-12-20 15:35:53 -05:00
Drullkus d240bdb951 Stupid IntelliJ didn't commit the ModBlocks.java 2014-12-20 12:31:39 -08:00
Drullkus a4761cf608 Dulling the colors on insulation 2014-12-20 12:28:49 -08:00
Drullkus 48c936bee2 Added 3 new blocks 2014-12-20 12:03:20 -08:00
Arona Jones ea5e62f021 Some voidstone ctm 2014-12-19 16:30:42 +00:00
Arona Jones 57537f5ef5 Turn down the brightness a bit on the signs 2014-12-19 15:38:25 +00:00
Arona Jones 728343045e Bump version. We did agree on 2.2.0, right? 2014-12-19 14:30:25 +00:00
Arona Jones 772eadbcdb Implement the warning sign blocks 2014-12-19 10:37:03 +00:00
Arona Jones 33be12cded Chiselable Torches :D 2014-12-19 10:21:52 +00:00
Arona Jones cc842dee1e Merge pull request #58 from CptSpaceToaster/master 
fixed the CTM renderer to properly average values if the colored light core is installed
 2014-12-19 09:17:22 +00:00
CptSpaceToaster c8ebc63fef fixed the CTM renderer to properly average values if the colored light core is installed 2014-12-19 00:44:15 -05:00
Drullkus fb1d74944a Adding Cables; Slowing the animations down a little on Gears 2014-12-17 23:23:02 -08:00