Alexander
|
46fe013ccc
|
Merge remote-tracking branch 'upstream/master'
|
2014-02-20 15:05:15 -05:00 |
|
Progwml6
|
5d8f03ce0d
|
manually handle lava bucket b/c of forge issue
|
2014-02-20 15:03:12 -05:00 |
|
Progwml6
|
38dee74ac8
|
change API logger to log4j2
|
2014-02-20 14:20:02 -05:00 |
|
Progwml6
|
5c4d01f5d0
|
remove remnants of drawbridge registries.. have been moved to TMech
|
2014-02-20 12:40:03 -05:00 |
|
Alexander
|
db764e4fa1
|
Fix Some of the rendering errors/Tree errors.
|
2014-02-19 21:44:45 -05:00 |
|
Progwml6
|
e5882901e1
|
part one of moving books over fully to new mantle interfaces
|
2014-02-17 21:34:34 -05:00 |
|
Zach
|
f7e4fc27a9
|
Merge pull request #487 from alexbegt/master
Fix getIcon for servers
|
2014-02-17 15:30:53 -05:00 |
|
Alexander
|
1bc13bad5b
|
Fix getIcon for servers
|
2014-02-17 15:30:13 -05:00 |
|
Zach
|
4ec688e859
|
Merge pull request #486 from alexbegt/master
Fix some NBT errors
|
2014-02-17 15:11:59 -05:00 |
|
Alexander
|
69c8fd81e1
|
Fix some NBT errors
|
2014-02-17 15:09:49 -05:00 |
|
Zach
|
fa49ead3b6
|
Merge pull request #485 from alexbegt/master
Fix some bugs with the way Gui's work.
|
2014-02-17 01:28:15 -05:00 |
|
Alexander
|
544536401b
|
Fix some bugs with the way Gui's work.
|
2014-02-17 01:27:15 -05:00 |
|
Progwml6
|
e539d5bf99
|
bump mantle
|
2014-02-17 01:16:45 -05:00 |
|
Zach
|
af6c319bbe
|
Merge pull request #484 from alexbegt/master
Doing code cleanup.
|
2014-02-17 00:37:32 -05:00 |
|
Alexander
|
18a440b3c0
|
Remove non used items
|
2014-02-17 00:36:50 -05:00 |
|
Alexander
|
3d866316a7
|
Doing some code cleanup.
|
2014-02-17 00:31:43 -05:00 |
|
Zach
|
583756bc5f
|
Merge pull request #482 from alexbegt/master
Fix the Smeltery WorldGen Again :D
|
2014-02-16 16:22:27 -05:00 |
|
Alexander
|
038be9da2a
|
Fix the Smeltery Again :D
|
2014-02-16 16:20:53 -05:00 |
|
Alexander
|
9afbf80a69
|
Fix Smeltery
|
2014-02-16 16:05:39 -05:00 |
|
Zach
|
ad63656c4a
|
Merge pull request #481 from alexbegt/master
Upload my Code Changes/Format/imports
|
2014-02-16 14:28:50 -05:00 |
|
Alexander
|
5d4e38c0cb
|
Upload my Code Changes/Format/imports
|
2014-02-16 14:23:50 -05:00 |
|
fuj1n
|
5bcdb7ca46
|
Merge pull request #480 from Vexatos/patch-2
Update de_DE.lang
|
2014-02-16 20:36:05 +11:00 |
|
Vexatos
|
3fdf45340a
|
Update de_DE.lang
|
2014-02-16 09:58:39 +01:00 |
|
Arthur Uzulin
|
ac5dcee2db
|
Fixed landmine behaviors
- TODO: Fix sync issues in landmines
|
2014-02-16 18:58:37 +11:00 |
|
Progwml6
|
20eafc2cd6
|
merge/ comment out some armor ticking code for now to prevent NPE's
|
2014-02-16 00:04:38 -05:00 |
|
mDiyo
|
b66a21d955
|
Update nugget cast
|
2014-02-15 19:09:59 -08:00 |
|
Progwml6
|
76e700d4f9
|
Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct
|
2014-02-15 13:38:18 -05:00 |
|
Zach
|
f6b6564895
|
Merge pull request #477 from Glassmaker/patch-3
Patch 3
|
2014-02-15 13:08:26 -05:00 |
|
Glassmaker
|
da752a356c
|
Made the hammer respect mining levels of the adjacent blocks
|
2014-02-15 21:03:19 +03:00 |
|
Progwml6
|
040d0515f6
|
restore facade support
|
2014-02-15 12:56:25 -05:00 |
|
Glassmaker
|
b261bc4278
|
Fixed Harvest tools not breaking blocks not in effective list
|
2014-02-15 20:34:40 +03:00 |
|
Progwml6
|
c57abab274
|
remove debug prntlines
|
2014-02-15 11:02:30 -05:00 |
|
Arthur Uzulin
|
e24b53a26e
|
Fixed NPE when breaking blocks with undefined HarvestTool
|
2014-02-15 23:56:44 +11:00 |
|
Progwml6
|
87e687d4ad
|
swap in some of the logic from the hammer to solve tool issue
|
2014-02-15 06:50:36 -05:00 |
|
Progwml6
|
5cf4dad45f
|
use logger instead of sysout for skinloader errors
|
2014-02-15 06:19:33 -05:00 |
|
Arthur Uzulin
|
1f8d7693ef
|
Nothing significant
|
2014-02-15 22:12:54 +11:00 |
|
Progwml6
|
9bb62789bc
|
make hammer check tool type
|
2014-02-15 01:39:33 -05:00 |
|
Zach
|
4ec44d13df
|
Merge pull request #476 from alexbegt/master
Fix Syncs
|
2014-02-15 00:33:50 -05:00 |
|
Alexander
|
6574e331fc
|
Fix Syncs
|
2014-02-15 00:29:24 -05:00 |
|
Progwml6
|
3ea1d589d3
|
bump mantle
|
2014-02-14 23:15:12 -05:00 |
|
Zach
|
ffd3234c5c
|
Merge pull request #475 from alexbegt/master
Push everything i did.
|
2014-02-14 23:06:22 -05:00 |
|
Alexander
|
06ec60d1ee
|
Push everything i did.
|
2014-02-14 23:05:41 -05:00 |
|
Progwml6
|
a8d8a568fa
|
fix tools not checking harvest type on block breaking
|
2014-02-14 22:50:51 -05:00 |
|
Zach
|
e707916612
|
Merge pull request #473 from alexbegt/master
It would need to be tested prog :P
|
2014-02-13 23:04:58 -05:00 |
|
Alexander
|
e0a254fd3f
|
All this needs to be tested, but here :P
|
2014-02-13 23:03:13 -05:00 |
|
Alexander
|
0f9cca02f1
|
Merge remote-tracking branch 'upstream/master'
|
2014-02-13 23:02:32 -05:00 |
|
Zach
|
176f3056e4
|
Merge pull request #470 from alexbegt/master
Enable Capes/Format Code
|
2014-02-13 13:30:11 -05:00 |
|
Alexander
|
ac1dc2b08a
|
Merge remote-tracking branch 'upstream/master'
|
2014-02-12 09:22:44 -05:00 |
|
Progwml6
|
d0c1ba6f2e
|
compile against jars from dvs1 for now
|
2014-02-11 23:45:25 -05:00 |
|
Progwml6
|
ba921c708f
|
fix cape images being gone
|
2014-02-11 21:40:59 -05:00 |
|