Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity
3220 commits 14 branches 4 tags 33 MiB
Commit graph

3220 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ellpeck
e03ea350bb Update README.md 2015-04-06 15:24:18 +02:00
Ellpeck
0bdc4f0097 ESD Updates, Item Description Sorting, OreDictionary Crafting! 2015-04-04 05:20:19 +02:00
Ellpeck
e4be5defe7 Merge pull request #5 from Paktosan/master 
Updated german language
 2015-04-02 19:24:44 +02:00
Paktosan
7d5363253e Deutsche Sprache geupdated 2015-04-02 19:19:20 +02:00
Paktosan
0a224885e6 Merge pull request #5 from Ellpeck/master 
Get current source
 2015-04-02 19:05:11 +02:00
Ellpeck
9eb6f3a88c Item Repairer & Bug Fixes 2015-04-02 12:06:42 +02:00
Ellpeck
0d090f1d2c Rings of Awesome & Heat Collector! 2015-03-31 20:37:55 +02:00
Ellpeck
09d67f95a4 Update done! 2015-03-30 18:42:14 +02:00
Ellpeck
3587e366ff Merge pull request #4 from Paktosan/master 
Translation stuff
 2015-03-30 18:17:28 +02:00
Paktosan
6cf0b03c4f Added german translation for the solar plate and the fishing net 2015-03-30 15:21:00 +02:00
Paktosan
c2bcc936b4 Merge pull request #4 from Ellpeck/master 
Furnace Solar & Fishing Net
 2015-03-30 15:18:10 +02:00
Paktosan
ca2b797b6e Added german translation for the leaf blower 2015-03-30 15:12:12 +02:00
Ellpeck
d46801a0f1 Furnace Solar & Fishing Net 2015-03-30 15:08:19 +02:00
Paktosan
f7fcf816c4 Merge pull request #3 from Ellpeck/master 
Merging stuff...
 2015-03-29 16:23:52 +02:00
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