upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-12 08:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
991 Commits 5 Branches 98 Tags
46bea5a0a36cf10df5c526518eff49e451dc4ece
Commit Graph
991 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
tterrag1098 74bb2b700d Better fix for #312, null checking for the chisel item in the GUI 2015-05-28 13:42:07 -04:00
warlordjones daf95276af 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 c92b1f567c Improve README file, move some stuff to the new CONTRIBUTING file 2015-05-27 22:51:56 -04:00
tterrag1098 5b20e0728a Implement new voidstone animation, expose some more API methods 2015-05-27 04:25:56 -04:00
Drullkus da64d4a803 Hades animations seem a tad bit fast 2015-05-27 01:15:47 -07:00
Drullkus 926283fe62 Added Downsized Hades animation 2015-05-27 01:14:15 -07:00
Drullkus b4024c33b1 Voidstone animation! \o/ 2015-05-27 01:10:05 -07:00
Drullkus f4ce9a1cfe These appear not to be on remote Repo. Committing. 2015-05-27 01:09:02 -07:00
Cricket 95e554952b Merge pull request #322 from EXTER7/dev 
Fix EE3 compatibility.
 2015-05-24 08:32:22 -07:00
EXTER 6c204c891b Fix EE3 compatibility. 2015-05-23 23:34:24 -04:00
tterrag1098 994e336c04 Fix ice/packed ice rendering and slipperiness 2015-05-23 22:39:33 -04:00
tterrag1098 8a4f926eac Imperial blocks should be registered to nation to keep backwards compat 2015-05-23 22:21:07 -04:00
tterrag1098 a452279a38 Remove all special pillar blocks, they were unneeded 2015-05-23 22:20:09 -04:00
tterrag1098 09065b25d6 Fix CTMV crash 2015-05-23 21:16:23 -04:00
tterrag1098 20e217a5d0 Whoops, that wasn't meant to be deleted... 2015-05-23 20:52:06 -04:00
tterrag1098 9683773dd0 Fix backwards CTMH logic. Closes #320 2015-05-21 01:52:40 -04:00
tterrag1098 7985cbb61b Improve r* algorithm, and fix r16 2015-05-21 01:38:05 -04:00
tterrag1098 db21d14d26 Clean up v* and r*, fix v4 rendering 2015-05-21 01:19:45 -04:00
tterrag1098 cea216e5b9 Remove unused fancy config 2015-05-20 22:15:43 -04:00
tterrag1098 738bf785fa Fix rebel/imperial/whatever blocks, fix leaves fix registerVariations 2015-05-20 22:15:19 -04:00
tterrag1098 4c4bb91dc7 Fix rebel/imperial/whatever blocks 2015-05-20 22:03:51 -04:00
tterrag1098 1adc91c852 Delete unused autoutils classes 2015-05-20 21:41:48 -04:00
Cricket b9e5b946c5 Added EE3 EMC values 
Conflicts:
	src/main/java/com/cricketcraft/chisel/Features.java
 2015-05-15 18:02:52 -04:00
Drullkus c41b45ebea Curating the Chisel P5: Added some unused textures; added variation order to some blocks. 
For reasons.
 2015-05-15 18:00:49 -04:00
Drullkus 304dac277b Curating the Chisel P4.1: Removed overloading 2015-05-15 18:00:26 -04:00
Drullkus 3c934327de Hopefully this bandaid helps 2015-05-15 14:35:33 -07:00
Drullkus f15b883dfd I reject your changes to the nation blocks and substitute my own! 2015-05-15 10:20:22 -07:00
Drullkus 7e2f6ebb4c Curating the Chisel P5: Added some unused textures; added variation order to some blocks. 
For reasons.
 2015-05-15 09:46:50 -07:00
Drullkus 303ea3ff8b Curating the Chisel P4.1: Removed overloading 2015-05-15 09:44:49 -07:00
Cricket 31f5451a60 Added EE3 EMC values 2015-05-14 20:50:46 -04:00
Drullkus 135fd68c4b Curating the Chisel P3: Added variation ordering 2015-05-14 14:10:02 -07:00
Drullkus d2f49b70e6 Curating the Chisel P2.3.1: Removed commented-out code. 2015-05-14 13:17:45 -07:00
Drullkus 3d08b320c1 Curating the Chisel P2.3: Merged sandstone_scribbles into sandstone 2015-05-14 13:15:22 -07:00
Drullkus 1f27230d59 Curating the Chisel P2.2: Picked and moved 3 sandstone variants into use. 2015-05-14 13:02:03 -07:00
Drullkus 0158956106 Curating the Chisel P2.1: Oops, forgot a part for the sandstone 2015-05-14 12:09:40 -07:00