Zach
|
8fdef45de4
|
Merge pull request #460 from TheVikingWarrior/patch-1
Tooltips for 1.7
|
2014-02-08 13:08:42 -05:00 |
|
TheVikingWarrior
|
49be115db0
|
Update ToolStationGui.java
|
2014-02-08 18:48:09 +01:00 |
|
TheVikingWarrior
|
9abf220dba
|
Update StencilTableGui.java
|
2014-02-08 18:43:31 +01:00 |
|
TheVikingWarrior
|
1dd90b3417
|
Update GuiLandmine.java
|
2014-02-08 18:40:23 +01:00 |
|
TheVikingWarrior
|
6ecadc55b7
|
Update en_US.lang
|
2014-02-08 18:32:05 +01:00 |
|
TheVikingWarrior
|
cab85a88a2
|
Update it_IT.lang
|
2014-02-08 18:13:59 +01:00 |
|
Zach
|
02e844d6ea
|
Merge pull request #457 from alexbegt/master
Fix Some More Format.
|
2014-02-07 17:14:14 -05:00 |
|
Alexander
|
380e105d5c
|
Fix Some More Format.
|
2014-02-07 17:11:03 -05:00 |
|
Zach
|
a49ea73278
|
Merge pull request #456 from alexbegt/master
Pushed wrong class.
|
2014-02-07 17:08:38 -05:00 |
|
Alexander
|
0d2a8689cb
|
Pushed wrong class.
|
2014-02-07 16:56:44 -05:00 |
|
Zach
|
73c397fc62
|
Merge pull request #455 from alexbegt/master
Push my latest fixes to creative.
|
2014-02-07 16:52:45 -05:00 |
|
Alexander
|
f2871763ed
|
Push my latest fixes to creative.
|
2014-02-07 16:50:54 -05:00 |
|
Zach
|
2b8c5e7610
|
Merge pull request #453 from Flenix/patch-2
Add FlenixCities Food support to Jerky
|
2014-02-07 14:59:50 -05:00 |
|
Flenix
|
a166dafc7f
|
Add FlenixCities Food support to Jerky
Very minor tweak. Simply changed it so that if FlenixCitiesFood is found, it'll do exactly the same thing it does if Hunger Overhaul is found.
|
2014-02-07 19:27:00 +00:00 |
|
Zach
|
6b62b76082
|
Merge pull request #451 from alexbegt/master
Fix ASM and name problems.
|
2014-02-06 20:25:25 -05:00 |
|
Alexander
|
8898ddeb89
|
Fix ASM and name problems.
|
2014-02-06 20:17:52 -05:00 |
|
Progwml6
|
4b2fda2dfc
|
dont reference mantle's copies of this
|
2014-02-06 19:23:40 -05:00 |
|
Progwml6
|
bde810c56b
|
don't reference mantle's copy of the names
|
2014-02-06 19:21:34 -05:00 |
|
Zach
|
4a59b2fcf9
|
Merge pull request #450 from alexbegt/master
Make Smeltery Update, Just no recipes yet.
|
2014-02-06 18:27:24 -05:00 |
|
Alexander
|
7462ebd85b
|
Make Smeltery Update, Just no recipes yet.
|
2014-02-06 18:15:36 -05:00 |
|
Progwml6
|
cb11b6586a
|
update mantle
|
2014-02-06 17:59:01 -05:00 |
|
Progwml6
|
1d5fb722d5
|
bump mantle
|
2014-02-05 10:40:33 -05:00 |
|
Zach
|
c0b069fe3c
|
Merge pull request #448 from alexbegt/master
Fix all errors + format code and Organize Imports.
|
2014-02-05 10:30:06 -05:00 |
|
Alexander
|
2a2f84ee88
|
Format code again + organize imports
|
2014-02-05 10:28:54 -05:00 |
|
Alexander
|
467e8e4ed5
|
Merge remote-tracking branch 'upstream/master'
|
2014-02-05 10:27:33 -05:00 |
|
Progwml6
|
c900a47103
|
push up eclipse formatter
|
2014-02-05 10:26:36 -05:00 |
|
Alexander
|
a83e9a3b53
|
Fix all errors.
|
2014-02-05 10:22:35 -05:00 |
|
Progwml6
|
ffaea7d4b7
|
run repo through formatter
|
2014-02-05 09:11:06 -05:00 |
|
Progwml6
|
5585d680a3
|
some fixes
|
2014-02-05 08:59:16 -05:00 |
|
Progwml6
|
b8cf7cdc5e
|
run through remap script
|
2014-02-05 08:28:53 -05:00 |
|
Progwml6
|
689aeba09b
|
some more fixes from 1.6.x
|
2014-02-04 21:21:50 -05:00 |
|
Progwml6
|
9fce66a827
|
port in some fixes from 1.6.x
|
2014-02-04 20:40:58 -05:00 |
|
Zach
|
cd9e0f6452
|
Merge pull request #446 from alexbegt/master
Add my changes, Client runs, I broke Smeltery ATM, Needs to be fixed :)
|
2014-02-04 15:02:33 -08:00 |
|
Alexander
|
c1a92807cd
|
Add my changes, Client runs, I broke Smeltery ATM, Needs to be fixed :)
|
2014-02-04 18:00:13 -05:00 |
|
Progwml6
|
57b6f72c2b
|
starting to port in 1.6.x fixes
|
2014-02-04 17:47:30 -05:00 |
|
Progwml6
|
ad0a7e67fd
|
assets got lost somehow
|
2014-02-03 16:42:07 -05:00 |
|
Progwml6
|
166bc22935
|
clean up formatting in readme
|
2014-02-03 15:42:10 -05:00 |
|
Progwml6
|
85e342f8ae
|
update readme and mcmod.info for current info
|
2014-02-03 15:38:03 -05:00 |
|
Progwml6
|
5284e4b860
|
dont want eclipse project files in the repo
|
2014-02-03 15:14:28 -05:00 |
|
Zach
|
358d7cc9b8
|
Merge pull request #444 from alexbegt/master
Work on fixing Landmine, needs to be tested
|
2014-02-03 11:44:17 -08:00 |
|
Alexander
|
67faf8aa79
|
Work on fixing Landmine, needs to be tested
|
2014-02-03 14:42:37 -05:00 |
|
Progwml6
|
e40f37f2f3
|
restore 1.7.x to master
|
2014-02-03 10:13:56 -05:00 |
|
Progwml6
|
88126116fb
|
wipe repo for a moment to swap branches w/o conflicts
|
2014-02-03 10:11:27 -05:00 |
|
Zach
|
3d7c89225b
|
Merge pull request #443 from alexbegt/1.7
Fix the errors that were left, I commeneted our some code in SmelteryLog...
|
2014-02-03 07:04:11 -08:00 |
|
Alexander
|
fffe2800bd
|
Fix the errors that were left, I commeneted our some code in SmelteryLogic for right now, Also changed the way ArrowEntity Sends the ChangeGameState
|
2014-02-03 10:02:49 -05:00 |
|
Progwml6
|
840e0cee04
|
17 errors left
|
2014-02-03 04:28:45 -05:00 |
|
Progwml6
|
0fe91c2d7a
|
35 errors left
|
2014-02-02 23:18:57 -05:00 |
|
Zach
|
570eb9c176
|
Merge pull request #441 from alexbegt/1.7
Fixing some bugs, I'll work on more tomorrow :)
|
2014-02-02 19:38:14 -08:00 |
|
Alexander
|
b70ed14631
|
Fix some bugs :).
|
2014-02-02 22:36:22 -05:00 |
|
Progwml6
|
02059d7325
|
update some AT entries
|
2014-02-02 21:36:06 -05:00 |
|