tterrag1098
cd22a6fb4e
Make sure to call canChisel from autochisel
2015-02-21 02:54:59 -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
72a74f1ff6
Forgot the texture...
2015-02-19 17:14:38 -05:00
Cricket
e3e7529018
Dev stuff is complete
2015-02-19 17:13:16 -05:00
tterrag1098
312a323f96
Update version to 2.3.7
2015-02-16 12:45:30 -05:00
tterrag1098
3dad2f55a0
Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev
2015-02-16 12:40:26 -05:00
tterrag1098
25a54b71e1
Fix left clicking a metal block incorrectly changing the type
2015-02-16 12:40:08 -05:00
tterrag1098
9c8364caf5
Merge pull request #229 from Adaptivity/patch-1
...
Update ru_RU.lang
2015-02-15 01:55:25 -05:00
Anton
86dbd54b16
Update ru_RU.lang
2015-02-15 09:49:40 +03:00
tterrag1098
55807a5f0b
Fix present shift clicking
2015-02-14 22:15:45 -05:00
tterrag1098
f130011539
Update changelog
2015-02-14 21:27:46 -05:00
tterrag1098
71a9003b79
Fix present localizations
2015-02-14 21:22:11 -05:00
Cricket
2b4b350d35
Version Bump
2015-02-14 21:07:20 -05:00
Cricket
ea0b64f7e7
Heh
2015-02-14 21:01:53 -05:00
Drullkus
31f4d6e05f
Merge remote-tracking branch 'origin/dev' into dev
2015-02-13 18:44:36 -08:00
Drullkus
312f5e735c
Add Metal block names to Lang file.
...
THIS IS GUESSWORK AND NOT TESTED
2015-02-13 18:44:07 -08:00
Cricket
005a8c5b9e
I have 2 done, I am not that creative
2015-02-12 21:33:58 -05:00
tterrag1098
a7609cff3c
Whoops left a sysout
2015-02-11 22:53:05 -05:00
tterrag1098
c3ee02b3f2
Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev
2015-02-11 22:04:11 -05:00
tterrag1098
3ed961c526
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
41fd650c9a
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
bc8e2a5c67
Added 16 configuration options to control the color overlay of HexBlocks
2015-02-08 23:37:56 -05:00
Steven Blom
bad1ef296f
Favour for Drullkus, change V4 and V9 textures to tiling instead of stair-casing
2015-02-09 10:10:04 +10:30
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
b0d968e529
Thing
2015-02-07 14:44:05 -08:00
Drullkus
4afdb1a5b1
Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev
2015-02-07 14:43:08 -08:00
Drullkus
fa34b7fd22
Fix the patterning on variation. It will now properly please your eyes!
2015-02-07 14:36:53 -08:00
warlordjones
5adad569df
Fix packed ice pillars being transparent ( #189 )
2015-02-07 16:19:43 +00:00
warlordjones
4f514bea5e
Add fallback icons for all tabs. Fixes #202
2015-02-07 16:13:19 +00: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
tterrag1098
968782ba0e
Add IMC for adding/removing variations and registering oredict
2015-02-06 21:47:17 -05:00
Cricket
c527d5d7c5
Fixes #187 Everything else is harvestable by fists
2015-02-06 21:20:23 -05:00
Cricket
54f65fab25
Fixes #200
2015-02-06 21:13:36 -05:00
Cricket
912fbb6946
Fixes #199
2015-02-06 21:03:17 -05:00
Cricket
f9814209ca
Fixes the drullkus derp
2015-02-06 20:50:26 -05:00
Drullkus
0431b9e119
Commit new Masonry Textures, will implement them later
2015-02-04 22:02:59 -08:00
Drullkus
ef88c6e85c
Merge remote-tracking branch 'origin/dev' into dev
2015-02-04 21:02:49 -08:00
Drullkus
ed3e85f1a5
Commit new malfunctioning fan tex
2015-02-04 21:02:18 -08:00
Cricket
394fb35b1b
Merge remote-tracking branch 'origin/dev' into dev
2015-02-04 20:20:10 -05:00
Cricket
c279200fc7
Added config option to chisel across colors
2015-02-04 20:20:01 -05:00
Cricket
71061caefe
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
57f58c35da
Allow some blocks to be colored via the forge recolourBlock method
2015-02-02 22:23:38 +01:00
tterrag1098
0064ec320d
Fix crash with null facade next to columns
2015-01-31 14:38:50 -05:00
tterrag1098
b110eab3c3
Clean up @Drullkus' mess
2015-01-31 01:23:27 -05:00
Drullkus
0afed73114
Commit more textures for metals. Untested;stuffs may get broken
2015-01-30 22:06:41 -08:00
tterrag1098