Commit Graph
846 Commits
Author SHA1 Message Date
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
tterrag1098 abc4ba6aac Implement new voidstone animation, expose some more API methods 2015-05-27 04:25:56 -04:00
Drullkus ce0b06248a Hades animations seem a tad bit fast 2015-05-27 01:15:47 -07:00
Drullkus 09a1dc5d8b Added Downsized Hades animation 2015-05-27 01:14:15 -07:00
Drullkus 5d3639a2df Voidstone animation! \o/ 2015-05-27 01:10:05 -07:00
Drullkus 4b209271fc These appear not to be on remote Repo. Committing. 2015-05-27 01:09:02 -07:00
Cricket 3a72909bb0 Merge pull request #322 from EXTER7/dev
Fix EE3 compatibility.
2015-05-24 08:32:22 -07:00
EXTER f4283f4f38 Fix EE3 compatibility. 2015-05-23 23:34:24 -04:00
tterrag1098 dec49418ec Fix ice/packed ice rendering and slipperiness 2015-05-23 22:39:33 -04:00
tterrag1098 ec0319646c Imperial blocks should be registered to nation to keep backwards compat 2015-05-23 22:21:07 -04:00
tterrag1098 c7ee8ee9c5 Remove all special pillar blocks, they were unneeded 2015-05-23 22:20:09 -04:00
tterrag1098 3daee11d65 Fix CTMV crash 2015-05-23 21:16:23 -04:00
tterrag1098 a74d695b31 Whoops, that wasn't meant to be deleted... 2015-05-23 20:52:06 -04:00
tterrag1098 877eb06c61 Fix backwards CTMH logic. Closes #320 2015-05-21 01:52:40 -04:00
tterrag1098 f1da755187 Improve r* algorithm, and fix r16 2015-05-21 01:38:05 -04:00
tterrag1098 647db3f3ea Clean up v* and r*, fix v4 rendering 2015-05-21 01:19:45 -04:00
tterrag1098 788d2ceb61 Remove unused fancy config 2015-05-20 22:15:43 -04:00
tterrag1098 fc932d547e Fix rebel/imperial/whatever blocks, fix leaves fix registerVariations 2015-05-20 22:15:19 -04:00
tterrag1098 5691db0afc Fix rebel/imperial/whatever blocks 2015-05-20 22:03:51 -04:00
tterrag1098 8395354116 Delete unused autoutils classes 2015-05-20 21:41:48 -04:00
Cricket 11f45e59cd Added EE3 EMC values
Conflicts:
	src/main/java/com/cricketcraft/chisel/Features.java
2015-05-15 18:02:52 -04:00
Drullkus 7bfdd40404 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 36faad79ad Curating the Chisel P4.1: Removed overloading 2015-05-15 18:00:26 -04:00
Drullkus 1a47c78556 Hopefully this bandaid helps 2015-05-15 14:35:33 -07:00
Drullkus 7aa6d1e64a I reject your changes to the nation blocks and substitute my own! 2015-05-15 10:20:22 -07:00
Drullkus aab5199279 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 a1af389878 Curating the Chisel P4.1: Removed overloading 2015-05-15 09:44:49 -07:00
Cricket 01d517e4eb Added EE3 EMC values 2015-05-14 20:50:46 -04:00
Drullkus b3e4a180ba Curating the Chisel P3: Added variation ordering 2015-05-14 14:10:02 -07:00
Drullkus 0ae4eb9255 Curating the Chisel P2.3.1: Removed commented-out code. 2015-05-14 13:17:45 -07:00
Drullkus 83efb17652 Curating the Chisel P2.3: Merged sandstone_scribbles into sandstone 2015-05-14 13:15:22 -07:00
Drullkus c10ee6775c Curating the Chisel P2.2: Picked and moved 3 sandstone variants into use. 2015-05-14 13:02:03 -07:00
Drullkus e0803c23bf Curating the Chisel P2.1: Oops, forgot a part for the sandstone 2015-05-14 12:09:40 -07:00