Commit graph

1231 commits

Author SHA1 Message Date
Leon
7247fc7acb Getting ready for final 1.7.10 RC build 2016-12-14 12:43:48 -05:00
Leon
f134baa092 Fix crash with RenderPlayerAPI installed without SmartRenderer 2016-12-07 08:47:41 -05:00
Leon
8343d60aad A little cleanup 2016-12-04 17:54:53 -05:00
Leon
a16de3fc9e Fix Swim Assist module speed boost for jump and strafe keys. 2016-12-04 13:40:26 -05:00
Leon
84d3356c2f Fixed Hoe module and a few other things. 2016-12-03 19:41:38 -05:00
Leon
f3857432fa some code cleanup 2016-12-03 17:41:05 -05:00
Leon
6b2268f618 Remove debugging Mode Changing debugging message 2016-12-03 16:48:27 -05:00
Leon
b99f707743 Fix Sprint Assist Module not working (Scala to Java porting error) 2016-12-03 16:45:19 -05:00
Leon
49ced9fd0d Clean up some leftover porting junk 2016-12-02 18:31:28 -05:00
lehjr
d58ba72801 Fix EnderIO recipe for TinkerTable
Using registry name instead of oredictName since oredict name changed between versions within 1.7.10.
2016-12-02 13:35:47 -05:00
lehjr
60f33ab0a9 Update README.md
Updated the Readme file to elaborate on the purpose of this branch.
2016-11-29 13:08:17 -05:00
lehjr
d1bebed774 Merge pull request #736 from gnif/patch-1
onPlayerLogin should not be static
2016-11-29 08:26:34 -05:00
Geoffrey McRae
f338f4429a onPlayerLogin should not be static
`onPlayerLogin` should not be static, this prevents players joining a dedicated server.
2016-11-29 18:22:11 +11:00
Leon
3c24d9aec2 Fix dedicated server crash. 2016-11-27 22:00:03 -05:00
Leon
79b6a89ce5 Fix tooltips additional info 2016-11-25 10:30:49 -05:00
Leon
eb3f4aa016 Fix crash when SmartRenderer not installed. 2016-11-21 19:12:17 -05:00
Leon
ee386d1158 Delete leftover print statements. 2016-11-20 08:51:14 -05:00
Leon
b4f292c762 Fix extra creative tabs 2016-11-19 13:04:10 -05:00
Leon
c6f0e4a61a Fixes and whatnot 2016-11-18 16:08:31 -05:00
Leon
402234e210 a couple fixes 2016-11-16 14:55:37 -05:00
Leon
bd3a04505d Getting for first maintenance release for 1.7.10 2016-11-15 20:06:29 -05:00
Leon
afcaffc9b9 cleanup from porting 2016-11-15 12:07:21 -05:00
Leon
d387e37a53 Finished porting to pure Java. Cleanup is next 2016-11-15 09:00:23 -05:00
Leon
a177803885 Mostly working. Tinker Table GUI has some bugs 2016-11-14 07:29:15 -05:00
Leon
e7392b29d2 Finished XML reader in Java. Builds and runs again. 2016-11-10 14:21:07 -05:00
Leon
f1ad3f02d8 Almost finished with ModelSpec files. This does not build just yet because ModelSpec Readers and Writers need finishing. 2016-11-08 23:13:50 -05:00
Leon
f5d3ac5219 More fun with Scala to Java. Down to porting ModelSpec files and network code. Numina nearly finished too. 2016-11-08 10:29:22 -05:00
Leon
a1bff1be20 More Scala to Java. Armor rendering simplified to port to Java. 2016-11-06 18:57:57 -05:00
Leon
72355a8882 More Scala to Java porting. Getting close now 2016-11-05 09:36:06 -04:00
Leon
acbf07b09d More Scala to Java porting. Not much left 2016-11-02 19:07:20 -04:00
Leon
f13f528661 still porting project from Scala to Java. 2016-10-26 15:44:18 -04:00
Leon
ffcf71939d more porting. Still haven't broken anything yet. 2016-10-23 15:17:24 -04:00
Leon
bd887f87dd Still porting Scala to Java. This still runs by the way. 2016-10-22 17:22:01 -04:00
Leon
c85f95f6c3 more Java, less Scala. Fixed 1 slider derp. Still need to fix name labels. 2016-10-20 08:24:52 -04:00
Leon
c30e77e3d4 The long road to a pure Java port has begun. Clickable Slider is broken in this commit. 2016-10-19 18:04:49 -04:00
Claire
efa395fcd4 Merge pull request #719 from DeinCraft-Tekkit/experimental
Added Recipes for GregTech 5 (does not work with Gregtech 6) thank you!
2016-05-25 23:47:47 -07:00
lehjr
f1ffd6ebb2 Fix OmniWrench crash without CoFH Lib/Core 2016-05-23 11:23:25 -04:00
florian96
146afeb0ab Added Recipes for GregTech 5 (and Maybe GT 6)
Based on the Old 1.6.4 Recipes. A little bit Modified.
2016-05-17 21:15:26 +02:00
Claire
8df562c8ca Merge pull request #710 from AegisLesha/patch-2
Update fr_FR.lang
2016-03-09 16:33:38 -08:00
Jean-Marie
c680bd8d62 Update fr_FR.lang
Small corrections
2016-03-09 23:59:09 +01:00
Claire
d32199fed9 Merge pull request #695 from lehjr/experimental
Fix wrong check for RF API
2016-01-19 12:01:46 -08:00
lehjr
b57e5f3095 Fix wrong check for RF API 2016-01-18 15:49:28 -05:00
Claire
43c6951714 Merge pull request #694 from lehjr/experimental
Fixes https://github.com/MachineMuse/MachineMusePowersuits/issues/688
2016-01-18 11:34:06 -08:00
lehjr
03de123c80 Revert change to Wireless Fluid Terminal module
This is depreciated and needs to be changed AFTER a newer version is uploaded to the server.
2016-01-18 10:37:50 -05:00
lehjr
68f49306f5 Fix RF API provided by mod other than CoFHCore
Added partial Applied Energistics power API
2016-01-18 10:22:37 -05:00
Claire
5548d72a17 Merge pull request #687 from lehjr/experimental
Fix EnderIO recipes
2016-01-13 16:24:24 -08:00
lehjr
d0b6062176 Update mps-enderio.recipes 2016-01-13 11:17:18 -05:00
lehjr
1608a3b063 fix typo 2016-01-13 10:27:05 -05:00
lehjr
f1d32f9f7b Update mps-enderio.recipes 2016-01-13 10:06:59 -05:00
lehjr
8b19f96c92 Fix EnderIO recipes
fixes https://github.com/MachineMuse/MachineMusePowersuits/issues/685
2016-01-13 09:21:48 -05:00