Commit graph

1356 commits

Author SHA1 Message Date
Ellpeck
c33e11ea5a Made some Special Items work 2015-03-29 16:07:43 +02:00
Ellpeck
0bfb102ca9 Leaf Blower! 2015-03-29 15:29:05 +02:00
Ellpeck
36f721ed30 Delete gradle.xml 2015-03-23 16:47:36 +01:00
Ellpeck
68ca6dde79 Merge pull request #3 from Paktosan/master
Fixed german translation
2015-03-23 16:04:33 +01:00
Paktosan
8cacfe01be Removed some derpy "+" 2015-03-23 15:42:22 +01:00
Paktosan
d0e21c296e Done a serious german translation now ;) 2015-03-23 15:37:59 +01:00
Paktosan
612b54ec8a Removed .idea directory and added it to .gitignore 2015-03-23 14:49:26 +01:00
Ellpeck
e382e8b7be Merge pull request #2 from Paktosan/master
Updated german language
2015-03-23 14:04:12 +01:00
Paktosan
9c6e3c2392 Updated german language file 2015-03-23 11:03:50 +01:00
Paktosan
5b6a57b662 Merge pull request #2 from Ellpeck/master
Getting the current source
2015-03-23 10:56:38 +01:00
Ellpeck
d2724f3af6 Updated the way ESD is named in en_US 2015-03-22 20:07:06 +01:00
Ellpeck
e274eb811f Updated License. 2015-03-21 17:07:41 +01:00
Ellpeck
5c50fb2eca Updated License. 2015-03-21 16:18:37 +01:00
Ellpeck
03d6c4081b Updated License. 2015-03-21 16:15:42 +01:00
Ellpeck
d006665e77 Merge remote-tracking branch 'origin/master'
Conflicts:
	LICENSE
	README.md
2015-03-21 16:14:18 +01:00
Ellpeck
7b708addb7 Updated License. 2015-03-21 16:13:14 +01:00
Ellpeck
608d2a4864 Updated License. 2015-03-21 16:11:22 +01:00
Ellpeck
eb038b678a Update README.md 2015-03-21 16:05:31 +01:00
Ellpeck
2b7456cbbe Update README.md 2015-03-21 16:04:58 +01:00
Ellpeck
54eb0eb4c4 Update LICENSE 2015-03-21 15:55:50 +01:00
Ellpeck
2f2ba02832 There we go. 2015-03-20 20:27:31 +01:00
Ellpeck
a40e70bbc7 There we go. 2015-03-20 20:26:21 +01:00
Ellpeck
06059ba059 Getting Ready for Version 0.0.2.0! 2015-03-20 18:58:31 +01:00
Paktosan
8a840c7a10 Merge pull request #1 from Ellpeck/master
Merge current changes to fork.
2015-03-20 11:25:31 +01:00
Ellpeck
7eb08712d1 The ESD! 2015-03-19 21:27:56 +01:00
Ellpeck
9b187ce077 Merge pull request #1 from Paktosan/master
German translation!
2015-03-13 17:10:04 +01:00
Paktosan
4a889c02fa Finished german translation. 2015-03-13 14:20:58 +01:00
Paktosan
2615b273c6 Actually fixed some derpy tying issues and continued translation 2015-03-13 07:10:20 +01:00
Paktosan
effc71ddb4 Startend Herman translation 2015-03-12 22:53:18 +01:00
Ellpeck
9a8cd60c33 Lots of fixes.
Prepared for 0.1.3
2015-03-08 14:58:26 +01:00
Ellpeck
2a2308c0ce Renaaaaaame! \o/ 2015-03-07 12:51:32 +01:00
Ellpeck
3f70981076 Almost ready to release for Beta!
Crafting, Textures, In- and Output etc. done!
2015-03-07 02:23:31 +01:00
Ellpeck
ad1fbe7101 Changed Feeder and added Packet Handling.
Also diesieben07 made me change stuff.
2015-02-20 22:45:33 +01:00
Ellpeck
e188e86d76 Added an automatic feeder and prep for a new block 2015-02-17 16:15:16 +01:00
Ellpeck
c9f5d731ed Sooo much stuff! Compost, Food and all sorts! 2015-02-09 17:25:05 +01:00
Ellpeck
6905c3c8f9 Dat rename tho! 2015-01-30 20:16:33 +01:00
Ellpeck
043ef272d7 Added foods, starting awesome Foody Project! 2015-01-29 20:23:19 +01:00
Ellpeck
4bb53b5510 Changing stuff! 2015-01-05 22:50:20 +01:00
Ellpeck
763ddfb718 Changing stuff! 2015-01-05 22:14:04 +01:00
Ellpeck
46332e7beb Started Booklet, looking good! 2014-12-20 21:34:07 +01:00
Ellpeck
79b2abefca Fireplace and Crucible fully working 2014-12-18 19:24:06 +01:00
Ellpeck
74831f14a4 Create README.md 2014-12-12 15:50:44 +01:00
Ellpeck
2f121b461f fixed untracked files 2014-12-12 15:50:00 +01:00
Ellpeck
9498e4126b Gitignore works! 2014-12-12 15:49:23 +01:00
Ellpeck
24f61d332d Fixed .gitignore 2014-12-12 15:43:04 +01:00
Ellpeck
59fa020b48 fixed untracked files 2014-12-12 15:41:34 +01:00
Ellpeck
d48ae1dd49 Fixing Stuff 2014-12-12 15:40:01 +01:00
Ellpeck
5eb1a30871 Renamed Mod! Wohoo! 2014-12-03 22:33:46 +01:00
Ellpeck
00800f6108 Made lots and lots of awesome Stuff. Mainly: Crucible! 2014-12-03 21:55:53 +01:00
Ellpeck
60ed1cd062 Changed textures and names of gems to make them more amazing 2014-11-19 18:03:25 +01:00