fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,941 Commits 45 Branches 194 Tags
621ddc5535cb0303e7cbf2000b60ba587ffa94f4
Commit Graph

44 Commits

Author SHA1 Message Date
bakaxyf 621ddc5535 Update zh_CN.lang 2015-03-15 11:05:24 +08:00
bakaxyf 99e4928542 Update zh_CN.lang 2015-03-12 00:09:12 +08:00
thatsIch dd1ca1e286 Fixes #861 Wireless Terminal notifies player, if it is unlinked 2015-03-11 09:00:40 +01:00
Yves 5e5be0e192 Update fr_FR.lang 2015-03-09 13:46:12 +01:00
thatsIch dddfd6dbaf Fixes #972 Tooltip now corresponds to the actual behaviour 2015-03-09 10:07:13 +01:00
bakaxyf 27e5eac6aa Update zh_CN.lang 2015-02-25 13:47:40 +08:00
Chris 8eb5ad01cf Merge pull request #776 from al-myr/patch-1 
Update pt_BR.lang
 2015-01-19 12:22:42 -08:00
yueh c35e057d96 Merge pull request #742 from LeerSpace/patch-1 
fixed two grammatical errors
 2015-01-19 19:53:35 +01:00
yueh c10c809c9e Merge pull request #734 from yueh/feature-formation-plane-drop-blocks 
Formation plane can now drop blocks as items
 2015-01-19 19:45:04 +01:00
Al afbce77d0b Update pt_BR.lang 2015-01-19 07:51:22 -03:00
John Reed e2798aaaf4 fixed two grammatical errors 
replaced "a" with "an" where appropriate
 2015-01-17 12:23:19 -06:00
yueh a8c920932e Formation plane can now drop blocks as items 2015-01-16 19:58:11 +01:00
thatsIch c6f232ab63 Fixes #304 WAILA Integration updated and fixed 
WAILA offers a new interface to sync the server data to the client.
 2015-01-04 00:06:09 +01:00
Anton e37d9099c7 Update ru_RU.lang 2014-12-28 22:24:53 +03:00
Mitchell 0cf33c4ea3 Fix grammatical error 
Than = Comparison
 2014-12-25 09:16:22 -04:00
yueh 98098ba86e Merged api and lang READMEs 2014-12-13 01:28:32 +01:00
thatsIch ede5fb938b Remove gitmodules 
Integrate api and lang into core
 2014-12-04 13:09:13 +01:00
thatsIch 00278971b1 Updated korean localization 2014-12-01 22:26:00 +01:00
thatsIch 0ee3482dfd Updated chinese localization 2014-11-25 18:09:32 +01:00
thatsIch 17e996bdb8 Updated localization for stairs 2014-11-24 07:47:37 +01:00
cjo9900 cf9f36f3e5 #466 Change Crafting card recipe to shapeless 
Change crafting card to be shapeless, to be consistent with recipe of other cards.
 2014-11-19 22:46:57 +00:00
thatsIch 925e5065bc Updated brazilian, french, korean localization 2014-11-19 21:12:41 +01:00
thatsIch 537465563c Add oredict entry for pure fluix crystals as crystalPureFluix 2014-11-05 21:53:59 +01:00
thatsIch c82de5db8f Fixed typos in localizations 2014-10-17 12:30:57 +02:00
thatsIch 7230485039 Updated localizations 2014-10-16 17:31:17 +02:00
thatsIch 116213d197 Added typesafe method to obtain the inventory slots 2014-10-04 10:50:53 +02:00
Andrew 7f225a5ec1 Deleted useless things 2014-10-03 23:08:28 -07:00
yueh 185500c017 Adds filter by machine name to interface terminals 2014-09-30 23:03:45 +02:00
thatsIch 7c2d3c3711 Merge branch 'rv2' of https://github.com/AppliedEnergistics/Applied-Energistics-2 into rv2 2014-09-30 17:28:55 +02:00
thatsIch 94199154a6 Update Localization 2014-09-30 17:28:08 +02:00
Chris f9b9729fb5 Merge pull request #157 from thatsIch/Spelling 
Spelling
 2014-09-28 10:09:39 -07:00
Chris fd0ea8b903 Merge pull request #156 from thatsIch/Semicolon 
Semicolon
 2014-09-28 10:09:21 -07:00
thatsIch 29a7ed4a62 Merge pull request #4 from Kolatra/master 
Fixed #1138 replaces itemWheat with cropWheat, the oredictionaried name of MinecraftForge
 2014-09-28 14:43:08 +02:00
thatsIch 8c9c5bae42 Updated Submodules 2014-09-28 13:48:19 +02:00
thatsIch 4ed7173f5c Updated submodules 2014-09-28 13:46:38 +02:00
thatsIch 76b147fd5b Improved readability of variables 
Hopefully improved semantics of variables

Fixed typos

Added hyphenations
 2014-09-28 12:21:34 +02:00
yueh cdcae974e2 Changed Inscriber to be upgradable with Cards 
Supports up to 3 cards
Currently max 3 Acceleration Cards, each reducing the crafting time by 25%
 2014-09-28 00:36:43 +02:00
algorithmx2 181b0b0a6a Fixed Typo-s in recipes. 2014-09-26 15:15:40 -05:00
thatsIch 54802be11f Moved API 
Added temporary(!) API dependencies, will resolved via Maven later on
Added mcmod.info
Added pack.mcmeta template
Added hacked BC jar to use facades indev
Split build logic into several pieces
Update gitignore
Modify build.gradle to match changes
 2014-09-26 16:14:45 +02:00
Kolatra 1016510bd9 Fixed #1138 
Update process.recipe

Changed to oredictionary.

Update process.recipe

Fixed issue 1138 with oredictionary wheat.
 2014-09-25 23:17:34 -06:00
algorithmx2 86134f8fb5 Renamed Assets for typo fixes. 2014-09-25 11:46:05 -05:00
AlgorithmX2 943afb01b8 Added Gradle and Readme 2014-09-23 19:30:22 -05:00
AlgorithmX2 9fdd92bec7 Added Textures. 2014-09-23 19:27:50 -05:00
AlgorithmX2 e57a5f0ad1 Added Recipes. 2014-09-23 19:27:19 -05:00