 tterrag1098
|
093fb5263c
|
Merge branch 'ctm_refactor2' into dev
|
2015-04-23 00:35:02 -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
|
4f70831d35
|
Implement Fake AE Controller with the new ISubmapManager system
|
2015-04-22 21:04:40 -04:00 |
|
|
warlordjones
|
77e95fb934
|
Fix #288
|
2015-04-10 01:01:36 +01: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 |
|
|
Drullkus
|
6c51b8e437
|
Circuit variations for all of your Futurama needs!
|
2015-04-07 22:35:59 -07: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 |
|
|
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 |
|
|
tterrag1098
|
75c4fc8850
|
Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev
|
2015-04-06 01:16:25 -04:00 |
|
|
tterrag1098
|
fd33a66d18
|
Allow chisel torches to be FMP microparts
|
2015-04-06 01:16:14 -04:00 |
|
|
warlordjones
|
4deff8a7be
|
16-colour runic voidstone - closes #218
|
2015-04-05 16:34:08 +01:00 |
|
|
tterrag1098
|
aa03baa462
|
Fix mossy config
|
2015-04-02 14:52:26 -04:00 |
|
|
tterrag1098
|
a65331cbab
|
Fix Tcon/Botania compat crashing on load
|
2015-03-19 20:37:20 -04:00 |
|
|
warlordjones
|
41908489e9
|
Packed ice pillar recipe. Fixes #261. Muh bad.
|
2015-03-13 15:13:41 +00:00 |
|
|
warlordjones
|
e039282c93
|
Fix #262. Test yo commits, Drullkus!
|
2015-03-13 15:11:34 +00:00 |
|
|
Drullkus
|
f9fa6ec129
|
Add Iron/Gold blocks and to Oredict, Recolored Antiblocks a little
|
2015-03-11 13:44:02 -07:00 |
|
|
Drullkus
|
29b0e92164
|
Forgot to comment this out.
|
2015-03-09 15:52:52 -07:00 |
|
|
Drullkus
|
0f3a28bdc3
|
Untested - Added TCon Chisel blocks
|
2015-03-09 15:46:16 -07:00 |
|
|
Drullkus
|
2a3b812b8a
|
Implement new 1.8 textures
|
2015-03-08 18:12:17 -07:00 |
|
|
Drullkus
|
84a29c7a38
|
Merge remote-tracking branch 'origin/dev' into dev
|
2015-03-08 14:06:01 -07:00 |
|
|
Drullkus
|
2dcb2b51b4
|
Added Large Hex Plating
|
2015-03-08 14:05:34 -07:00 |
|
|
Cricket
|
a333164685
|
You can wear pumpkins now
|
2015-03-08 15:23:35 -04:00 |
|
|
Drullkus
|
beb986e7f7
|
Fix up Masonry textures
|
2015-03-08 09:59:38 -07:00 |
|
|
Drullkus
|
102f56a7da
|
Quick fix to Nation
|
2015-03-07 08:46:29 -08:00 |
|
|
Drullkus
|
1374ca5d1f
|
Add Imperial+Rebel Blocks... :P
|
2015-03-07 08:03:26 -08:00 |
|
|
Cricket
|
601573eb81
|
They just need descriptions
|
2015-03-04 16:40:02 -05:00 |
|
|
Drullkus
|
3275ffe8ca
|
Dehackify things
|
2015-02-22 18:34:42 -08:00 |
|
|
Drullkus
|
53ad987158
|
Add Hex Armor Plating
|
2015-02-22 17:25:20 -08:00 |
|
|
Drullkus
|
dad374f985
|
Massive Fan finished and finished unification of all technical blocks
|
2015-02-22 10:21:45 -08:00 |
|
|
Drullkus
|
9fd27ce29c
|
Added Massive Fan; hacky implementation of Techical2 & Tech3 into Tech chisel group
|
2015-02-22 08:25:53 -08:00 |
|
|
tterrag1098
|
113fde136f
|
Add in 1.8 recipes for the 1.8 blocks
|
2015-02-21 18:36:26 -05:00 |
|
|
tterrag1098
|
282d4766d8
|
Undo formatting changes
|
2015-02-19 19:15:11 -05:00 |
|
|
tterrag1098
|
bf4ce506e5
|
Merge remote-tracking branch 'origin/Cricket' into dev
Conflicts:
src/main/java/com/cricketcraft/chisel/Chisel.java
src/main/java/com/cricketcraft/chisel/Features.java
src/main/java/com/cricketcraft/chisel/config/Configurations.java
src/main/resources/assets/chisel/textures/items/chisel_obsidian.png
|
2015-02-19 19:11:16 -05:00 |
|
|
Cricket
|
e3e7529018
|
Dev stuff is complete
|
2015-02-19 17:13:16 -05:00 |
|
|
tterrag1098
|
71a9003b79
|
Fix present localizations
|
2015-02-14 21:22:11 -05:00 |
|
|
Cricket
|
005a8c5b9e
|
I have 2 done, I am not that creative
|
2015-02-12 21:33:58 -05:00 |
|
|
tterrag1098
|
56e2a8fea2
|
Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev
|
2015-02-08 16:18:11 -05:00 |
|
|
tterrag1098
|
31ae34e899
|
Fix antiblocks not being chiselable even with config set to true
Closes #213
|
2015-02-08 16:18:01 -05:00 |
|
|
Drullkus
|
fa34b7fd22
|
Fix the patterning on variation. It will now properly please your eyes!
|
2015-02-07 14:36:53 -08:00 |
|
|
Drullkus
|
1e7d12f597
|
ffs @TheCricket
|
2015-02-06 22:27:15 -08:00 |
|
|
Drullkus
|
d4366617d1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2015-02-06 22:25:29 -08:00 |
|
|
Drullkus
|
e62fe8ef3d
|
Commit working Malfunction fan stuff, and do other stuffs
Also patched the build.gradle to play nicely with IntelliJ 14.
|
2015-02-06 22:25:09 -08:00 |
|
|
tterrag1098
|
92d01d4e5b
|
Add compat for Railcraft 9.5.X. Fixes #203
|
2015-02-06 23:11:51 -05:00 |
|
|
Cricket
|
f9814209ca
|
Fixes the drullkus derp
|
2015-02-06 20:50:26 -05:00 |
|