Drullkus
e58a83dbed
These were sitting in my local content, I should commit them
2015-04-28 19:30:40 -07:00
tterrag1098
367a604496
Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev
2015-04-26 22:04:14 -04:00
tterrag1098
48aa74714e
Hopefully last try at #309...
2015-04-26 22:04:05 -04:00
Erlkönig
fe2f2b976a
Update zh_CN.lang
2015-04-27 10:00:40 +08:00
tterrag1098
ab72d05134
More SideOnly safety, should fix #309 again
2015-04-26 21:46:18 -04:00
tterrag1098
9e0b56afe1
Fix #308 #309 Crashes on startup
2015-04-26 20:33:39 -04:00
tterrag1098
aac68bd58e
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
f62f9c6a47
Move RenderBlocksCTM to API, add ClientUtils
2015-04-26 02:35:16 -04:00
tterrag1098
2f6b455514
Get rid of the ugly RenderBlocksCTMFullbright, some other refactors
2015-04-26 02:30:39 -04:00
tterrag1098
3ae753ebc3
Fix some typos and unused code
2015-04-24 17:07:00 -04:00
tterrag1098
66d79e9d99
Move CarvableHelper to API
2015-04-24 17:05:12 -04:00
tterrag1098
8abc50634b
RenderBlocksCTM will now respect the render bounds (read below)
...
This behavior allows for certain renderers to no longer be needed
(carpet floor) and for some rendering to be possible (CTM slabs).
A single version of marble slab has been implemented with CTM as an
example, we will move over the rest of the textures once this is
finalized.
2015-04-24 16:43:30 -04:00
tterrag1098
42cc14f7b2
Fix IMC referencing Chisel.class for the mod ID
2015-04-24 13:23:58 -04:00
tterrag1098
9b4fc25600
The nuke has landed! (Remove CarvableVariation)
2015-04-24 03:51:38 -04:00
tterrag1098
65693b868c
Completely modularize submap and RenderBlocks managing
...
- Fix RenderBlocksCTM ignoring the renderMin/Max values
- Add custom handler for carpet to avoid hardcoding
- TODO blocks that use existing blocks as icons, e.g. ice stairs
2015-04-24 03:38:37 -04:00
tterrag1098
bc607a3104
Begin CarvableVariation nuke, have hit some roadblocks in CTM rendering
2015-04-23 20:33:29 -04:00
tterrag1098
d50f2c9da5
Some class renaming, move TextureSubmap to API and improve its methods
2015-04-23 17:31:25 -04:00
tterrag1098
c2fa40d57e
Move ISubmapManager to its own API file
2015-04-23 16:45:28 -04:00
tterrag1098
70af7b4d67
#301 crash invalid with marble pillar metadatas
2015-04-23 16:40:44 -04:00
tterrag1098
093fb5263c
Merge branch 'ctm_refactor2' into dev
2015-04-23 00:35:02 -04:00
tterrag1098
6105a6104c
Fix accidental reversion of CarvableHelper code during merge
2015-04-23 00:27:42 -04:00
tterrag1098
ee4eb3c357
Javadoc typo
2015-04-22 22:04:27 -04:00
tterrag1098
00647ece1a
Add missing Dir file
2015-04-22 21:57:39 -04:00
tterrag1098
d0d01fbb68
Merge branch 'dev' into ctm_refactor2
...
Conflicts:
src/main/java/com/cricketcraft/chisel/Features.java
src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java
src/main/java/com/cricketcraft/chisel/config/Configurations.java
2015-04-22 21:56:10 -04:00
tterrag1098
07f53ae6fb
Clean up CTM documentation and move to API
2015-04-22 21:47:44 -04:00
tterrag1098
4f70831d35
Implement Fake AE Controller with the new ISubmapManager system
2015-04-22 21:04:40 -04:00
tterrag1098
0139a894f0
Implement ISubmapManager for custom IIcon handling
2015-04-22 18:00:56 -04:00
tterrag1098
85711e377e
Massively clean up CTM code, much more readable now
2015-04-22 17:52:03 -04:00
warlordjones
c2ad2bc5fa
Fix #289
2015-04-12 17:41:35 +01:00
warlordjones
77e95fb934
Fix #288
2015-04-10 01:01:36 +01:00
CptSpaceToaster
430b852822
Merge pull request #275 from nark31/KR_Translate
...
Update ko_KR.lang
2015-04-09 08:22:07 -04:00
Nark
1fd23908e9
Update ko_KR.lang
...
add Fake Controller
2015-04-09 18:57:39 +09:00
Drullkus
0c66282e57
Rename some things...
2015-04-08 13:38:41 -07:00
Drullkus
fd90784d03
Change the cracked stone anim
2015-04-08 13:31:44 -07:00
Drullkus
c36cf92671
Finalize hacky AE Falsetto Controller
2015-04-08 10:45:00 -07:00
Drullkus
d9081e576c
Thanks, outdated code. @tterrag
2015-04-08 10:36:15 -07:00
Drullkus
4f318afb57
AE Falsetto Controller hack
2015-04-08 10:26:50 -07:00
Nark
414378000b
Update ko_KR.lang
...
Update mistranslate
2015-04-08 22:25:57 +09:00
Nark
6e02463c2e
Update ko_KR.lang
2015-04-08 22:23:02 +09:00
Drullkus
6c51b8e437
Circuit variations for all of your Futurama needs!
2015-04-07 22:35:59 -07:00
Drullkus
ec1dc93a7d
Fix strobe animation
2015-04-07 21:31:46 -07:00
Drullkus
b9d11126b9
Add generic animations folder... Just organization.
2015-04-07 21:22:51 -07:00
tterrag1098
506cb04a60
Fix issues with present clientside desync
2015-04-06 21:44:37 -04:00
tterrag1098
705d1414f5
Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev
2015-04-06 21:39:35 -04:00
tterrag1098
49f2b52200
Fix issues with presents and chunk boundaries / orphan chunks
2015-04-06 21:39:20 -04:00
Drullkus
b6c04a92e8
Add last ARcane stone variant
2015-04-06 16:52:21 -07:00
Drullkus
f0e25b2804
New arcane stone types
2015-04-06 14:29:40 -07:00
tterrag1098
acf643c329
Add entries for new blocks in ChiselBlocks
2015-04-06 15:21:08 -04:00
warlordjones
7dc56ea093
Implement some more of the unused textures as factory variants
...
Only two textures I can't find a home for
2015-04-06 19:24:21 +01:00
warlordjones
4b2bd3af03
Implement the 'chrono' texture as a glass variant
2015-04-06 17:52:15 +01:00
Drullkus