Commit Graph
464 Commits
Author SHA1 Message Date
tterrag1098 f2cdd40c78 Merge branch 'master' of https://github.com/TheCricket/Chisel-2.git 2015-01-08 19:44:09 -05:00
tterrag1098 45673eb832 Fix light gray hex block localization 2015-01-08 19:44:00 -05:00
Cricket fcbc050640 Fixed formatting... 2015-01-08 19:42:57 -05:00
Cricket 42745c0575 sarcasm and added something for a friend 2015-01-08 19:32:20 -05:00
Drullkus e3e21258c4 Update Autochisel tex 2015-01-08 16:26:55 -08:00
tterrag1098 25677d63ec Remove obsolete hex block textures 2015-01-08 19:05:37 -05:00
tterrag1098 d394a9a6e7 Add missing files 2015-01-08 18:36:23 -05:00
tterrag1098 89ed8e94ac Finish Hex Blocks (Fixes #98). Change block class names (warlordjones).
Fix items not loading
2015-01-08 18:34:47 -05:00
tterrag1098 fbbe24152c Move all recipes to features. Clean up recipes. Fix worldgen registering 2015-01-08 16:31:13 -05:00
tterrag1098 0429a40d6a Fix creative tabs to work with new system 2015-01-08 15:27:15 -05:00
tterrag1098 6f3ba938e1 Add the new file...oops 2015-01-08 06:23:21 -05:00
tterrag1098 4c84cc3a04 Fix some mistakes so the game loads 2015-01-08 06:22:19 -05:00
tterrag1098 85e58f4f57 Begin major feature structor overhaul. Just recipes left to do. 2015-01-08 05:46:10 -05:00
tterrag1098 71016458bd Allow all sides to be used for autochisel automation 2015-01-08 02:22:51 -05:00
tterrag1098 b87d80dbf1 Fix autochisel item rendering 2015-01-08 02:20:23 -05:00
tterrag1098 4e949d1a3b Fix autochisel shift clicking never going to first slot 2015-01-08 02:09:56 -05:00
tterrag1098 151f2bfb85 This one actually fixes #107 strange item lighting in autochisel GUI 2015-01-08 02:06:12 -05:00
tterrag1098 7511fa4c8d Temp fix for #107 2015-01-08 02:01:20 -05:00
tterrag1098 2853040cb2 Merge branch 'master' of https://github.com/TheCricket/Chisel-2.git 2015-01-08 02:00:03 -05:00
tterrag1098 a4e72bfa12 Add basic auto chisel model. Still needs texture and animated stuff. 2015-01-08 01:59:50 -05:00
Drullkus fc09e8f894 Merge remote-tracking branch 'origin/master' 2015-01-07 22:33:52 -08:00
Drullkus 7750d836ae Add fix for 106. Fixes #106 2015-01-07 22:33:27 -08:00
tterrag1098 51a5c4817f Fix AutoChisel shift clicking and add tooltips 2015-01-07 23:36:27 -05:00
tterrag1098 7d801f69b5 Fix auto chisel functionality. Massively clean up and comment TE code. 2015-01-07 22:45:20 -05:00
tterrag1098 ca46d3c653 Actually fix #9. Some other cleanup in CTM. 2015-01-07 21:47:45 -05:00
tterrag1098 29683fb763 Add shift clicking to chisel GUI 2015-01-07 21:39:51 -05:00
tterrag1098 a878c9d77e Clean up CarvableHelper to use defined constants 2015-01-07 20:54:50 -05:00
tterrag1098 82792ed22e The great format and clean up. IMPORTANT: Read below.
All devs and contributors should use the provided formatter settings. 
If your IDE does not support the format, the rules are simple, it is the
default java formatting rules, with 200char line lengths and 1 extra
line after class definitions.
2015-01-07 19:50:18 -05:00
tterrag1098 06c5f5930f Add formatting rules 2015-01-07 19:47:07 -05:00
tterrag1098 9afc889345 No more diamond chisel class 2015-01-07 19:45:41 -05:00
tterrag1098 364eecdb12 Fix left-click chiseling.
Remove chisel harvest levels. 
Both chisels in 1 ID
2015-01-07 19:43:45 -05:00
Cricket 7a869bd522 Removed un-needed blocks 2015-01-07 19:00:12 -05:00
Cricket 026d46f6ce Merge pull request #105 from Adaptivity/UpdateruRUlang
Update ru_RU.lang
2015-01-07 04:15:10 -08:00
Adaptivity c6e49dcece Update ru_RU.lang 2015-01-07 15:07:55 +03:00
CptSpaceToaster 1f86ad1801 partial CTM lighting fix 2015-01-07 00:46:35 -05:00
Cricket 77f3e7b4dd renamed 2015-01-06 21:11:57 -05:00
Cricket 9112eafb41 Crafing and removed debug block 2015-01-06 20:47:11 -05:00
Cricket 29ff810e88 Projected changelog and version bump 2015-01-06 20:38:54 -05:00
Cricket 335dd553de Fixed durability, and removed my stuff 2015-01-06 20:34:41 -05:00
Cricket 0d364386cb Chisel left click redone, Thanks tterrag 2015-01-06 20:29:22 -05:00
Drullkus dc4e3601f0 No, BRAAAINZ.
Keep it >:(
2015-01-06 10:36:04 -08:00
Arona Jones 0727233853 Even more lang changes 2015-01-06 18:11:13 +00:00
Arona Jones a09e53ffe7 Another mispelling 2015-01-06 18:08:33 +00:00
Arona Jones 35057d1de0 Someone can't spell 2015-01-06 18:06:45 +00:00
Arona Jones a5f54ca5f3 Merge pull request #102 from Adaptivity/Localization
Update ru_RU.lang
2015-01-06 18:01:34 +00:00
Adaptivity e32cc4392e Update ru_RU.lang 2015-01-06 20:18:27 +03:00
Drullkus a3a58fd3f0 Adding three fixed CTM files.
They're close enough I guess. I'll tweak them later.
2015-01-05 21:00:37 -08:00
Cricket c25209da79 Fixed it and my horrible derp 👯 2015-01-05 20:57:32 -05:00
Cricket c587f259f1 Merge remote-tracking branch 'origin/master' 2015-01-05 20:25:30 -05:00
Cricket e6a973f545 add textures, I can't get this to work for the life of me 2015-01-05 20:25:16 -05:00