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 |
|
Progwml6
|
8a6399e2a4
|
lets stop copying the wrong stuff
|
2014-02-02 21:27:16 -05:00 |
|
Progwml6
|
ef4f19f054
|
bump mantle again
|
2014-02-02 21:19:50 -05:00 |
|
Progwml6
|
ac579888d7
|
bump mantle
|
2014-02-02 20:53:23 -05:00 |
|
Zach
|
9041ad1ff8
|
why do ppl point out things like this to me
|
2014-02-02 16:44:59 -05:00 |
|
Zach
|
7a2abbacfa
|
1.6.x tcon is now supported via PR's only
1.7.2 alpha to come next weekend hopefully
|
2014-02-02 16:42:59 -05:00 |
|
Progwml6
|
84456b62a1
|
bump gradle wrapper
|
2014-02-02 13:50:30 -05:00 |
|
Zach
|
0202dc6d6b
|
Merge pull request #438 from TheVikingWarrior/patch-3
Fixed and added some localizations (mostly gui)
|
2014-02-02 10:40:07 -08:00 |
|
Progwml6
|
f6ba851886
|
fix a few things
|
2014-02-02 12:14:42 -05:00 |
|
Progwml6
|
a8c1f32650
|
less than 100 to go
|
2014-02-02 12:06:48 -05:00 |
|
Progwml6
|
f936434c71
|
getting super close
|
2014-02-02 11:35:00 -05:00 |
|
Progwml6
|
625d319b0c
|
fix moar things
|
2014-02-02 11:02:52 -05:00 |
|
TheVikingWarrior
|
f4ad35f389
|
Update it_IT.lang
|
2014-02-02 14:33:54 +01:00 |
|
TheVikingWarrior
|
1457c52828
|
Update it_IT.lang
|
2014-02-02 12:47:25 +01:00 |
|
TheVikingWarrior
|
9599381a48
|
Update it_IT.lang
|
2014-02-02 00:02:45 +01:00 |
|
TheVikingWarrior
|
6b0b9d76dc
|
Update en_US.lang
|
2014-02-02 00:01:26 +01:00 |
|
TheVikingWarrior
|
a56b660998
|
Localized and fixed some gui
|
2014-02-02 00:00:43 +01:00 |
|
TheVikingWarrior
|
48b67fe07e
|
Update StencilTableGui.java
|
2014-02-01 23:42:14 +01:00 |
|
TheVikingWarrior
|
ec70352fc9
|
Fixed Molten Shiny localization
|
2014-02-01 23:40:45 +01:00 |
|
TheVikingWarrior
|
667b968644
|
Update it_IT.lang
|
2014-02-01 23:35:00 +01:00 |
|
Progwml6
|
e3282b14db
|
time to take a break for a few hours
|
2014-02-01 16:14:23 -05:00 |
|
Progwml6
|
5aec324ece
|
even closer
|
2014-02-01 16:06:02 -05:00 |
|
Progwml6
|
7c0fc5ed4a
|
getting really close
|
2014-02-01 15:43:24 -05:00 |
|
Progwml6
|
8ae89ba70e
|
some moar fixes
|
2014-02-01 15:17:30 -05:00 |
|
Progwml6
|
ee7bc7d7eb
|
around 300 combined errors
|
2014-02-01 14:55:52 -05:00 |
|
Progwml6
|
ffd383dc41
|
more fixes
|
2014-02-01 14:18:17 -05:00 |
|
Progwml6
|
1a5e6e9dfc
|
Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct into 16x
|
2014-02-01 11:54:02 -05:00 |
|
Progwml6
|
cbfb5f2f6a
|
added config options to disable capes, and disable exo armor crafting, partbuilder now scans all 3 axes
UNTESTED
|
2014-02-01 11:53:24 -05:00 |
|
Progwml6
|
48402e1a7e
|
fixed issue where furnace recipe's wouldnt take meta by running them through itemstacks
|
2014-02-01 06:00:54 -05:00 |
|
Arthur Uzulin
|
8cd760ea06
|
Network stuffs -> 1.7
|
2014-02-01 17:28:41 +11:00 |
|
Progwml6
|
bb98f77de4
|
moar fixy thingies
|
2014-01-30 20:34:22 -05:00 |
|
mDiyo
|
f76c6d9840
|
mDiyo does not want a cape
|
2014-01-30 02:23:38 -08:00 |
|
Progwml6
|
4326ff3c64
|
fix moar things
|
2014-01-30 04:47:45 -05:00 |
|
Progwml6
|
5076fc074d
|
fix all the things!
|
2014-01-30 00:16:48 -05:00 |
|
Progwml6
|
2a932bc40a
|
yaay fluids
|
2014-01-29 22:58:29 -05:00 |
|
Progwml6
|
4555947818
|
misc stuff plus AT fixes for arrows
|
2014-01-29 00:58:13 -05:00 |
|
Progwml6
|
f3bcb13815
|
under 1k finally
|
2014-01-29 00:41:17 -05:00 |
|
Progwml6
|
9b78521c73
|
render liquid is error free
|
2014-01-29 00:18:26 -05:00 |
|
Progwml6
|
e57f2ab226
|
moar fixing
|
2014-01-29 00:09:45 -05:00 |
|
Progwml6
|
d8d7f94936
|
lets change the channel name to be the correct one
|
2014-01-28 22:53:12 -05:00 |
|
Progwml6
|
7d462321b5
|
moar fixes
|
2014-01-28 22:43:08 -05:00 |
|
Arthur Uzulin
|
db6677248a
|
PacketToolStation(WIP)
|
2014-01-28 23:06:27 +11:00 |
|