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
a49c139db7
Actually registers the 1.8 oreDicts properly
2015-05-29 13:35:22 -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
5b20e0728a
Implement new voidstone animation, expose some more API methods
2015-05-27 04:25:56 -04: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
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
8789421b5e
Curating the Chisel P1: Spicing up both Hexplating blocks
2015-05-14 10:44:30 -07:00
Drullkus
df0963e138
Fix stupid mistake on commenting out AE Snakestone
2015-05-13 18:26:08 -07:00
Drullkus
f2e086712a
Killing the fake AE Snakestone for favor of new one.
2015-05-13 13:02:58 -07:00
tterrag1098
31328b0ac1
Remove generics from ISubmapManager to prevent serverside errors
2015-05-13 13:19:24 -04:00
tterrag1098
62a38e9816
Fix same error in CTMV...
2015-05-12 13:30:23 -04:00
tterrag1098
f1a1b27971
Fix CTMH crash
2015-05-12 13:08:27 -04:00
tterrag1098
f6b67163b0
Make CTM extendable and make ctm field of RenderBlocksCTM nonstatic
2015-05-09 21:07:33 -04:00
tterrag1098
8a5645760b
Add block param to createRenderContext. Set render bounds from blocks.
...
Closes #311
2015-05-09 20:07:28 -04:00
tterrag1098
b2a394741f
Move RenderBlocksColumn to API (for now), bump API version. Closes #314
2015-05-01 19:44:51 -04:00
tterrag1098
49e4329646
Chiseled netherrack will now sustain fire on top of it
2015-05-01 17:37:10 -04:00
tterrag1098
37e77f00f8
Hopefully last try at #309...
2015-04-26 22:04:05 -04:00
tterrag1098
f0cb6555a8
More SideOnly safety, should fix #309 again
2015-04-26 21:46:18 -04:00
tterrag1098
fbab0eb9d8
Fix #308 #309 Crashes on startup
2015-04-26 20:33:39 -04:00
tterrag1098
ad13b2a39e
Merge branch 'remove_carvablevariation' into dev
...
Conflicts:
src/main/java/com/cricketcraft/chisel/api/IMC.java
2015-04-26 02:43:43 -04:00
tterrag1098
b3555e52f9
Move RenderBlocksCTM to API, add ClientUtils
2015-04-26 02:35:16 -04:00
tterrag1098