Commit Graph
1077 Commits
Author SHA1 Message Date
tterrag1098 34f8a5e65c Fix botania compat #379 2015-07-25 22:31:55 -04:00
Cricket 70c8fd1131 y u hate me so much 2015-07-17 10:44:44 -04:00
tterrag1098 8c79bd31b7 Bump CTMLib version 2015-07-15 00:47:29 -04:00
tterrag1098 e4f5733777 Add IConnectable for determining if other blocks can connect.
Version 2.5
2015-07-15 00:46:29 -04:00
tterrag1098 7517c25efe Remove copied code from ItemCarvablePumpkin 2015-07-15 00:37:16 -04:00
tterrag1098 9d9172fc75 Update to conform to new CTMLib layout. Bit hacky, unsure if final 2015-07-15 00:35:00 -04:00
tterrag1098 8ab3c7159b Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-07-10 18:19:55 -04:00
tterrag1098 73d32b9fba Add back in RendererCTM 2015-07-10 18:19:32 -04:00
Cricket 46a15db2e7 Merge pull request #364 from minecreatr/dev
Removed Other mod support (moved to ChiselCompat)
2015-07-08 14:26:09 -04:00
minecreatr 082884dc7c Readded preinit call 2015-07-07 10:03:56 -07:00
minecreatr 4c2cc898f2 Readded preinit 2015-07-07 10:02:44 -07:00
minecreatr 8c74bcee70 Removed Other mod support (moved to ChiselCompat) 2015-07-07 09:39:27 -07:00
tterrag1098 7aed1f925a Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev 2015-07-03 17:15:40 -04:00
tterrag1098 cfc43dad71 Some more voidstone fixes 2015-07-03 17:14:58 -04:00
Cricket 36eabcb682 I blame @Drullkus 2015-07-03 12:53:30 -04:00
tterrag1098 27287a7887 One more thing for the changelog 2015-07-02 18:56:17 -04:00
tterrag1098 7e7b527044 Update ctmlib version, mod version, and changelog 2015-07-02 18:55:29 -04:00
tterrag1098 742cb07783 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-07-02 18:05:51 -04:00
tterrag1098 a1647800fb Remove unneeded code 2015-07-02 18:05:19 -04:00
tterrag1098 1decde4a83 Working now! Proper ctm on all applicable voidstone variants.
@Drullkus you might want to take a look at the metalborder-ctm file, I
tried my best but it's not perfect
2015-07-02 18:04:59 -04:00
Drullkus 8650812df8 Upgraded Forge version, just to stay on top of things. 2015-07-02 14:14:19 -07:00
tterrag1098 b4e5f2cf76 Not working, looking for help 2015-07-02 15:07:22 -04:00
tterrag1098 be2a44e938 Trying the still textures for lavastone/waterstone 2015-07-02 00:08:29 -04:00
tterrag1098 fdc0171abe Fix chisel using its own render pass variable 2015-07-02 00:01:26 -04:00
tterrag1098 2bdb6ef9c0 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-07-01 23:42:08 -04:00
tterrag1098 77ee13d15c Fix bad GL in layered item render, fix water/lavastone textures 2015-07-01 23:41:52 -04:00
Cricket 5dc28005e9 How to controller was meant to be textured 2015-06-30 10:27:38 -04:00
Drullkus 2f42fe0839 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 7397c87ea7 Remove controller hack textures; added new UberWavy block and improved AE Controller textures 2015-06-30 01:53:28 -07:00
Cricket 10a7804324 proof of concept 2015-06-27 21:31:39 -04:00
Cricket 0b32e670c4 fixed the textures to please drullkus 2015-06-25 19:36:31 -04:00
Cricket 4e3ec7dd8b update gitignore 2015-06-25 19:13:13 -04:00
tterrag1098 62f5873a3a Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev 2015-06-25 15:06:27 -04:00
tterrag1098 ef2b440d92 Fix beacon rendering. Not sure why this works but it does. 2015-06-25 15:06:12 -04:00
Cricket 1275723db0 im tired ok... 2015-06-25 14:38:40 -04:00
Cricket 7b26ac24e6 no spam 2015-06-25 14:37:37 -04:00
Cricket feb458a674 added console stuffz 2015-06-25 14:25:06 -04:00
Cricket c2851b53fe added some console stuffz 2015-06-25 14:23:17 -04:00
Cricket f3154d839d Can everyone check this for me? 2015-06-25 13:38:04 -04:00
Cricket 9989a5e76d spell fix 2015-06-23 15:34:06 -04:00
Cricket 15c4780af3 Merge remote-tracking branch 'origin/dev' into dev 2015-06-23 14:42:46 -04:00
Cricket 68e7042bd8 Done with #339 2015-06-23 14:42:37 -04:00
Cricket 009eebca01 Merge pull request #342 from Adaptivity/dev
Update en_GB.lang
2015-06-23 14:05:52 -04:00
Anton 40f9465443 Update en_GB.lang 2015-06-23 19:41:39 +03:00
Cricket 1b328f1348 Fixes #341 2015-06-23 10:54:15 -04:00
Cricket 60efdfe29a Merge pull request #340 from Adaptivity/dev
Update ru_RU.lang
2015-06-23 10:20:38 -04:00
Anton ce95feaed2 Update ru_RU.lang 2015-06-23 11:38:12 +03:00
Cricket 202f697185 Merge remote-tracking branch 'origin/dev' into dev 2015-06-22 17:47:12 -04:00
Cricket c21a105bbc Still better than 1.8 (You can localize all the things! #103) 2015-06-22 17:47:01 -04:00
tterrag1098 24c15c870e Update ctmlib to 1.0.0.3, this should fix the cirular reference issues 2015-06-22 16:28:12 -04:00