tterrag1098
6a4619ddae
Whoops left a sysout
2015-02-11 22:53:05 -05:00
tterrag1098
364c1a4b44
Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev
2015-02-11 22:04:11 -05:00
tterrag1098
ffc4ca9308
Fix reamining present issues:
...
- Fix dupes
- Fix bounding boxes
- Fix inventory order being swapped in the GUI
- Fix in-world chiseling not working
- Fix losing items when metadata changes
2015-02-11 22:03:53 -05:00
Cricket
f46b42e924
Merge pull request #215 from AtomicBlom/brickTexturing
...
change V4 and V9 textures to tiling instead of staircasing
2015-02-11 05:44:51 -08:00
CptSpaceToaster
63ea14f44e
Added 16 configuration options to control the color overlay of HexBlocks
2015-02-08 23:37:56 -05:00
Steven Blom
0425ac5b4d
Favour for Drullkus, change V4 and V9 textures to tiling instead of stair-casing
2015-02-09 10:10:04 +10:30
tterrag1098
385c692e1b
Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev
2015-02-08 16:18:11 -05:00
tterrag1098
64128a241f
Fix antiblocks not being chiselable even with config set to true
...
Closes #213
2015-02-08 16:18:01 -05:00
Drullkus
6d689a486b
Thing
2015-02-07 14:44:05 -08:00
Drullkus
09c94fff14
Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev
2015-02-07 14:43:08 -08:00
Drullkus
5c99de382e
Fix the patterning on variation. It will now properly please your eyes!
2015-02-07 14:36:53 -08:00
warlordjones
355119b424
Fix packed ice pillars being transparent ( #189 )
2015-02-07 16:19:43 +00:00
warlordjones
6533df5d82
Add fallback icons for all tabs. Fixes #202
2015-02-07 16:13:19 +00:00
Drullkus
213f588d70
ffs @TheCricket
2015-02-06 22:27:15 -08:00
Drullkus
5ecb45f357
Merge remote-tracking branch 'origin/dev' into dev
2015-02-06 22:25:29 -08:00
Drullkus
97ee6bfd74
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
ac41278bfe
Add compat for Railcraft 9.5.X. Fixes #203
2015-02-06 23:11:51 -05:00
tterrag1098
723425a471
Add IMC for adding/removing variations and registering oredict
2015-02-06 21:47:17 -05:00
Cricket
19658240ba
Fixes #187 Everything else is harvestable by fists
2015-02-06 21:20:23 -05:00
Cricket
02e10cf00a
Fixes #200
2015-02-06 21:13:36 -05:00
Cricket
a96df6a782
Fixes #199
2015-02-06 21:03:17 -05:00
Cricket
e11287859d
Fixes the drullkus derp
2015-02-06 20:50:26 -05:00
Drullkus
a504475ed1
Commit new Masonry Textures, will implement them later
2015-02-04 22:02:59 -08:00
Drullkus
d49c48f7eb
Merge remote-tracking branch 'origin/dev' into dev
2015-02-04 21:02:49 -08:00
Drullkus
89cb42ca39
Commit new malfunctioning fan tex
2015-02-04 21:02:18 -08:00
Cricket
43347a0461
Merge remote-tracking branch 'origin/dev' into dev
2015-02-04 20:20:10 -05:00
Cricket
21dffb0b3f
Added config option to chisel across colors
2015-02-04 20:20:01 -05:00
Cricket
8ff62f185c
Merge pull request #198 from BigXplosion/recolor
...
Allow some blocks to be colored via the forge recolourBlock method
2015-02-02 16:14:14 -08:00
big_Xplosion
fd301b569c
Allow some blocks to be colored via the forge recolourBlock method
2015-02-02 22:23:38 +01:00
tterrag1098
c39277bef6
Fix crash with null facade next to columns
2015-01-31 14:38:50 -05:00
tterrag1098
b35a08bd06
Clean up @Drullkus' mess
2015-01-31 01:23:27 -05:00
Drullkus
4b6c85f565
Commit more textures for metals. Untested;stuffs may get broken
2015-01-30 22:06:41 -08:00
tterrag1098
662a9e7326
Fix some issues with ice/icestairs/icepillars/packedice ( #189 )
2015-01-29 16:58:45 -05:00
tterrag1098
70bc5071a8
Fix auto chisel unloc name
2015-01-27 19:59:41 -05:00
tterrag1098
d27492a555
Implement metal blocks and clean up some unloc names
2015-01-27 01:45:37 -05:00
Drullkus
17ebcf525c
Merge remote-tracking branch 'origin/dev' into dev
2015-01-26 21:43:39 -08:00
Drullkus
f62c4ff62b
Add textures for metals :p
2015-01-26 21:43:19 -08:00
tterrag1098
f12c2e5dcf
Add missing file
2015-01-27 00:03:21 -05:00
Drullkus
418996a716
Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev
2015-01-26 21:01:19 -08:00
Drullkus
c6a96fd21c
Stuff
2015-01-26 20:12:10 -08:00
tterrag1098
e1b28f7336
Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into
...
dev
Conflicts:
src/main/java/com/cricketcraft/chisel/Features.java
2015-01-26 22:42:59 -05:00
tterrag1098
8faa70ba46
Rewrite presents. Still a bit WIP, needs sounds and lid animation
2015-01-26 22:41:48 -05:00
Cricket
be06c852e8
Yeah that's a typo
2015-01-26 17:23:34 -05:00
Cricket
049b0fb3bb
Recipe fix for #180
2015-01-26 16:58:51 -05:00
tterrag1098
a7eec93e56
Fix reversed logic for picking maven folder
2015-01-25 20:21:35 -05:00
tterrag1098
a36e0df65b
Update version to 2.3.5 and update changelog
2015-01-25 20:13:29 -05:00
tterrag1098
415cf2213a
Fix copper feature
2015-01-25 20:11:43 -05:00
tterrag1098
59e950c9d7
Not sure what happened here, fix build.gradle again
2015-01-25 19:10:24 -05:00
tterrag1098
9a4e8b1bdf
Fix maven project name
2015-01-25 18:47:15 -05:00
tterrag1098
45aa110095
Fix build.gradle for maven
2015-01-25 18:29:37 -05:00
tterrag1098