Commit graph

1013 commits

Author SHA1 Message Date
Ellpeck
8a5dd83e0b Merge remote-tracking branch 'origin/master' 2016-01-11 22:18:03 +01:00
Ellpeck
8410d1ec14 fml 2016-01-11 22:17:49 +01:00
Ellpeck
69fe485941 Update changelog.md 2016-01-11 22:02:47 +01:00
Ellpeck
28fd6eb809 Update updateVersions.properties 2016-01-11 22:01:44 +01:00
Ellpeck
9ba8bedc2d Merge pull request #45 from Kristian295/patch-3
[de_DE] GUI, Container Names, Update Information
2016-01-11 20:18:12 +01:00
Kristian295
636128cc0f [de_DE] GUI, Container Names, Update Information
Translated up to line 477.

Side note: ll. 423, 424, 429 - 431 could not be translated for grammatical reasons.
2016-01-11 20:07:30 +01:00
Ellpeck
93a28a7b76 Update changelog.md 2016-01-11 19:02:45 +01:00
Ellpeck
e3c35c2102 Made the 1.7 update checker also think about betas.
Just in case.
2016-01-11 18:57:09 +01:00
Ellpeck
8a6af1713f r21? Whaaat? 2016-01-10 21:12:06 +01:00
Ellpeck
b0558681d1 Added new update checker that can be version-specific or not 2016-01-10 20:51:29 +01:00
Ellpeck
f575b4f8c1 no r 2016-01-10 20:46:35 +01:00
Ellpeck
dbda43b9fb Testing new update checker~ 2016-01-10 20:45:55 +01:00
Ellpeck
b67e2fe95b Merge pull request #42 from Kristian295/patch-2
Translated Items and Tooltips
2016-01-10 01:16:46 +01:00
Kristian295
1d56db7ae4 Translated Items and Tooltips
- Completed translation for Items
- Completed Translation for Tooltipps

Side note: Some translations may cause grammatical issues (ll. 281-282) as there is more than one gender of words in German.
2016-01-10 01:01:37 +01:00
Ellpeck
e94ff3b44a Update specialPeopleStuff.properties 2016-01-09 18:25:50 +01:00
Ellpeck
3dda46d044 Update specialPeopleStuff.properties 2016-01-09 18:25:22 +01:00
Ellpeck
837e446c94 Update specialPeopleStuff.properties 2016-01-09 18:18:20 +01:00
Ellpeck
7ec5bb9952 Update specialPeopleStuff.properties 2016-01-09 17:24:30 +01:00
Ellpeck
875ddc1a0c Dog damn it Kristian. 2016-01-09 11:51:30 +01:00
Ellpeck
827bd0f76b Merge pull request #39 from Kristian295/patch-1
Correction and further translation
2016-01-09 11:40:51 +01:00
Kristian295
287fba25a8 Update de_DE.lang
- Correcting up to ll. 157
- Translating up to ll. 234
2016-01-09 05:09:56 +01:00
Kristian295
3552564764 Create de_DE.lang
Translating ll. 1 - 157
2016-01-09 03:22:49 +01:00
Ellpeck
4f6a6ed566 Update specialPeopleStuff.properties 2016-01-08 23:47:07 +01:00
Ellpeck
1b176008a5 Made the solar thingy cheaper. 2016-01-07 16:07:23 +01:00
Ellpeck
dae0a9a0b4 Balanced the magnet ring a bit °~° 2016-01-07 16:04:25 +01:00
Ellpeck
57e77e8453 Made the growth ring a little more expensive. 2016-01-07 16:03:07 +01:00
Ellpeck
fbba25d5ad The growth ring now only uses RF when growing stuff 2016-01-07 15:56:57 +01:00
Ellpeck
493be37ede The magnet ring now only uses RF when actually sucking items.
Makes more sense, does it not?
2016-01-07 15:54:41 +01:00
Ellpeck
fa79e57cb6 Made looking up the double furnace in the booklet possible 2016-01-06 19:58:59 +01:00
Ellpeck
227bfeadec r20.
I'm sorry.
2016-01-06 18:12:16 +01:00
Ellpeck
5ef8626a40 Fix another stupid obfuscation bug :x 2016-01-06 18:10:01 +01:00
Ellpeck
a135ecf32c r19! Sorry for this update >_> 2016-01-06 05:28:31 +01:00
Ellpeck
f16f1e0496 Fixed a nasty bug with obfuscation causing some booklet pages to break horribly 2016-01-06 05:17:54 +01:00
Ellpeck
18bb252dcf do all the things 2016-01-06 05:10:34 +01:00
Ellpeck
fecc2e3d3a Merge pull request #37 from XDjackieXD/master
fixed that the deobf & api jar had everything duplicated...
2016-01-06 05:08:46 +01:00
XDjackieXD
8ec46efe28 fixed that the deobf & api jar had everything duplicated... 2016-01-06 05:07:32 +01:00
Ellpeck
5e5b4e6cc0 Merge pull request #36 from XDjackieXD/master
now with ActuallyDeobfuscated jar files!
2016-01-06 03:53:25 +01:00
XDjackieXD
c43f52b777 now with ActuallyDeobfuscated jar files! 2016-01-06 03:50:15 +01:00
Ellpeck
046e01de40 r18! \o/ API Support! 2016-01-05 20:02:13 +01:00
Ellpeck
4e4d6fda65 Update the License to include info about the API 2016-01-05 16:31:36 +01:00
Ellpeck
1fae94f578 Added the Booklet stuff to the API 2016-01-05 14:57:50 +01:00
Ellpeck
11c4f90080 Actually do the API declaration right 2016-01-05 04:56:34 +01:00
Ellpeck
f372e5b77f Fixed the lens of detonation not being able to activate because the power buffer was too low.
/shrugs
2016-01-05 04:52:53 +01:00
Ellpeck
77ba946306 Added an API. 2016-01-05 04:47:37 +01:00
Ellpeck
c0a6ee8f85 Bacon recipe & doc.
Why am I doing this to myself.
2016-01-04 17:34:06 +01:00
Ellpeck
2f0a4d79e7 Fix server 2016-01-04 17:26:24 +01:00
Ellpeck
5bd1926453 Added bacon 2016-01-04 17:25:03 +01:00
Ellpeck
d4ed31c85f Not that much attention 2016-01-04 02:39:20 +01:00
Ellpeck
1933e10c0f r17! \o/ 2016-01-03 23:39:22 +01:00
Ellpeck
c548f73503 Removed old update checker files - No one plays on the old versions anymore anyways 2016-01-03 23:26:14 +01:00