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
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
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
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
Nark