tterrag1098
|
bef24abe19
|
Fix chisel using its own render pass variable
|
2015-07-02 00:01:26 -04:00 |
|
tterrag1098
|
279a5a69ab
|
Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev
|
2015-07-01 23:42:08 -04:00 |
|
tterrag1098
|
32b6929b76
|
Fix bad GL in layered item render, fix water/lavastone textures
|
2015-07-01 23:41:52 -04:00 |
|
Cricket
|
fe49e0bc02
|
How to controller was meant to be textured
|
2015-06-30 10:27:38 -04:00 |
|
Drullkus
|
29a5d6db68
|
Tweaked the Fake Controller submap manager to be a bit more friendly if other blocks use it.
|
2015-06-30 02:14:36 -07:00 |
|
Drullkus
|
09e38a4675
|
Remove controller hack textures; added new UberWavy block and improved AE Controller textures
|
2015-06-30 01:53:28 -07:00 |
|
Cricket
|
598237bde4
|
proof of concept
|
2015-06-27 21:31:39 -04:00 |
|
Cricket
|
7a519e2a5a
|
fixed the textures to please drullkus
|
2015-06-25 19:36:31 -04:00 |
|
Cricket
|
c5a322c37a
|
update gitignore
|
2015-06-25 19:13:13 -04:00 |
|
tterrag1098
|
f09628ff30
|
Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev
|
2015-06-25 15:06:27 -04:00 |
|
tterrag1098
|
492fece4e1
|
Fix beacon rendering. Not sure why this works but it does.
|
2015-06-25 15:06:12 -04:00 |
|
Cricket
|
b2406f6887
|
im tired ok...
|
2015-06-25 14:38:40 -04:00 |
|
Cricket
|
77c5e36305
|
no spam
|
2015-06-25 14:37:37 -04:00 |
|
Cricket
|
aa34ddf11e
|
added console stuffz
|
2015-06-25 14:25:06 -04:00 |
|
Cricket
|
f66f37ba46
|
added some console stuffz
|
2015-06-25 14:23:17 -04:00 |
|
Cricket
|
09d6824cf0
|
Can everyone check this for me?
|
2015-06-25 13:38:04 -04:00 |
|
Cricket
|
da1593a04d
|
spell fix
|
2015-06-23 15:34:06 -04:00 |
|
Cricket
|
95234a1dce
|
Merge remote-tracking branch 'origin/dev' into dev
|
2015-06-23 14:42:46 -04:00 |
|
Cricket
|
edf1d33966
|
Done with #339
|
2015-06-23 14:42:37 -04:00 |
|
Cricket
|
c777e3d4e7
|
Merge pull request #342 from Adaptivity/dev
Update en_GB.lang
|
2015-06-23 14:05:52 -04:00 |
|
Anton
|
4f45cf4fab
|
Update en_GB.lang
|
2015-06-23 19:41:39 +03:00 |
|
Cricket
|
bd14ff9c3c
|
Fixes #341
|
2015-06-23 10:54:15 -04:00 |
|
Cricket
|
209444c99b
|
Merge pull request #340 from Adaptivity/dev
Update ru_RU.lang
|
2015-06-23 10:20:38 -04:00 |
|
Anton
|
15584c97db
|
Update ru_RU.lang
|
2015-06-23 11:38:12 +03:00 |
|
Cricket
|
5dbaae90d3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2015-06-22 17:47:12 -04:00 |
|
Cricket
|
ddf4ebd714
|
Still better than 1.8 (You can localize all the things! #103)
|
2015-06-22 17:47:01 -04:00 |
|
tterrag1098
|
043e37da90
|
Update ctmlib to 1.0.0.3, this should fix the cirular reference issues
|
2015-06-22 16:28:12 -04:00 |
|
tterrag1098
|
8ef057e0f1
|
Fix maven publishing
test
|
2015-06-22 16:20:24 -04:00 |
|
tterrag1098
|
931fb09e0d
|
Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev
|
2015-06-22 16:07:00 -04:00 |
|
tterrag1098
|
659d58aca1
|
Add ctmlib version
|
2015-06-22 16:06:22 -04:00 |
|
Cricket
|
85ec5c9c45
|
Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev
|
2015-06-22 16:03:19 -04:00 |
|
Cricket
|
763160baa3
|
Beacons are done but they render oddly
|
2015-06-22 16:00:35 -04:00 |
|
tterrag1098
|
395b0a7762
|
Fix import
|
2015-06-22 15:42:46 -04:00 |
|
tterrag1098
|
78ffa78b48
|
Merge branch 'dev' into ctmlib
|
2015-06-22 15:42:01 -04:00 |
|
tterrag1098
|
19f3ca733b
|
Fix this AE2 mess. This code is tested with stable9 and works fine.
|
2015-06-22 15:39:56 -04:00 |
|
Cricket
|
0f0b91ec96
|
fixed controllers and removed AE2 support
|
2015-06-22 14:21:22 -04:00 |
|
tterrag1098
|
5869259396
|
Update buildscript to shade CTMLib (once it is on maven)
|
2015-06-22 13:58:38 -04:00 |
|
Cricket
|
ca0dec38ce
|
Spelling error
|
2015-06-22 13:13:47 -04:00 |
|
Cricket
|
97e094ecfe
|
Merge pull request #338 from nark31/KR_Translate
Update ko_KR.lang
|
2015-06-22 13:12:09 -04:00 |
|
Nark
|
3136336ef5
|
Update ko_KR.lang
|
2015-06-23 01:25:30 +09:00 |
|
Cricket
|
11f8d54180
|
👯
|
2015-06-21 22:34:17 -04:00 |
|
Cricket
|
0a0800fae8
|
Controllers are done
|
2015-06-21 22:28:46 -04:00 |
|
Cricket
|
5e614b5983
|
Allows the changing the config in game
|
2015-06-20 22:18:13 -04:00 |
|
Cricket
|
e582719d9e
|
Fixes #334 #333 and #330
|
2015-06-20 22:16:00 -04:00 |
|
Cricket
|
57901aec23
|
Cleanup smbarbour's code
|
2015-06-20 21:54:17 -04:00 |
|
Cricket
|
eaacc7b95e
|
Merge branch 'Repair' of https://github.com/smbarbour/Chisel-2 into dev
|
2015-06-20 21:49:34 -04:00 |
|
Scott Barbour
|
0c041357ca
|
Implement repairs
|
2015-06-19 18:10:44 -05:00 |
|
tterrag1098
|
8ac8e4f27f
|
This should work, not tested
|
2015-06-13 01:27:10 -04:00 |
|
tterrag1098
|
9291d30dca
|
Unfinished don't touch
|
2015-06-13 00:20:18 -04:00 |
|
Cricket
|
988fc949c3
|
added minecreatr and a missing texture
|
2015-06-06 20:32:25 -04:00 |
|