tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity
2622 commits 7 branches 98 tags 24 MiB
Commit graph

199 commits

Author SHA1 Message Date
thatsIch
888b3e5600 Closes #1899, Fixed #1898: Adds an easy way to export interesting information into CSV format 
Mostly used for the recipe system, but can also be used for debugging purposes. Debug options needs to be ticked to use the full information gain. Recipes only require the normal localization and the specific name plus metadata.

Shifted the recipes into a recipes folder where the CSV will also reside. This will also elevate the copying of the readme to the user directory since it can reside in the recipes folder.

Fixed a bug where the copier would copy the would also copy empty folders
 2015-12-23 14:32:53 +01:00
asd0210a
73f928d57a zh_tw.lang Updated 2015-09-30 13:52:01 +02:00
yueh
ef6bc3e58f Changed the interface to 9 slots to be consistent with every other machine 2015-09-30 13:42:31 +02:00
yueh
0ce551589e Added a missing whitespace and removed duplicate ones. 2015-09-30 13:42:14 +02:00
Mazdallier
f89f79d71c Update fr_FR.lang 2015-09-30 13:41:25 +02:00
thatsIch
0d312f91af Fixes #1850: Fixed support for second optional output of the AE2 Grindstone 2015-09-30 13:41:15 +02:00
thatsIch
468cb4e9df Fixes #1588: Charged Certus Quartz Ore was given a wrong name 2015-09-30 13:40:03 +02:00
yueh
84fa5a38e0 Reorganizes the recipes in a more reasonable way. 
The recipes are now structured into multipe subfolder and split into more
distinct files, so the names are more appropriate and are better at
hinting which items the actually contain.

It also extends the RecipeResourceCopier to now handle the folder
recursively and extract all subdirectories and their files.

"import=" is currently requiring a relative path to the root directory
of the recipes. This would require a larger rewrite/refactoring, thus it
is kept for now until a potentially later changer.

This reverts splitting the oredict entries into their own directory and
moves them back into the recipes folder, as it currently is causing a
couple of issues like not being able to resolve the aliases or is not
working indev. But to keep it seperate it is now its own recipe file.

Fixes #1791
Reverts #1635
 2015-09-30 13:39:09 +02:00
yueh
b0504f4141 Closes #1726: Added Pressure P2P tunnel (PneumaticCraft) 2015-09-30 13:19:57 +02:00
bakaxyf
95b50748d2 Update zh_CN.lang 2015-09-30 13:04:22 +02:00
yueh
67213462db Adds a round robin and random mode to export buses. 
Resolves #85
 2015-09-30 13:04:02 +02:00
yueh
c978bf90f8 Ensure that disabled parts are actually disabled and removed. 2015-09-30 12:30:47 +02:00
thatsIch
59dbfb1452 Fixed stairs 2015-09-30 11:34:16 +02:00
thatsIch
8b921a7b79 Removed registration of layers 2015-06-26 22:50:09 +02:00
thatsIch
e21dab14e5 Fixed stair rendering, still missing textures and itemblock for some reason 2015-06-26 22:44:47 +02:00
thatsIch
4e863e7d90 Removed old renamer 2015-06-26 22:13:04 +02:00
thatsIch
0e378d8ad4 Added all stairs 2015-06-26 01:06:35 +02:00
bakaxyf
cc78153fe4 Update zh_CN.lang 2015-06-22 15:38:43 +02:00
yueh
ed47a23156 Closes #12 Added visual lock state to monitors 
Some general refactoring of every monitor including panels and terminals.
Disabled glPushAttrib and glPopAttrib for StorageMonitor as this can be a
performance issue.

Conflicts:
	src/main/java/appeng/parts/AEBasePart.java
	src/main/java/appeng/parts/reporting/PartConversionMonitor.java
	src/main/java/appeng/parts/reporting/PartDarkMonitor.java
	src/main/java/appeng/parts/reporting/PartMonitor.java
	src/main/java/appeng/parts/reporting/PartPatternTerminal.java
	src/main/java/appeng/parts/reporting/PartSemiDarkMonitor.java
	src/main/java/appeng/parts/reporting/PartStorageMonitor.java
	src/main/java/appeng/parts/reporting/PartTerminal.java
 2015-06-22 15:34:46 +02:00
yueh
3b5b9b68ce Moved ETA to the title and also no longer display for empty jobs 
Fixes #1567
 2015-06-18 01:22:45 +02:00
thatsIch
efafaedf68 Fixes #1588: Charged Certus Quartz Ore has its own oredictionary entry 
Conflicts:
	src/main/java/appeng/block/solids/OreQuartz.java
 2015-06-18 00:45:55 +02:00
AlgorithmX2
38afde724b Most of the 1.8 Port. 2015-06-15 19:44:59 -05:00
thatsIch
17465e68e8 Merge pull request #1453 from thatsIch/f-1452-auto-gen-custom-recipes 
Closes #1452: Implements auto-generation of custom recipes
 2015-06-03 23:18:35 +02:00
yueh
776d68bb03 Merge pull request #1486 from yueh/feature-1259 
Closes #1259 ETA for crafting jobs
 2015-06-01 19:51:47 +02:00
yueh
4befdecd25 Closes #1344 Added a silk touch annihilation plane 2015-06-01 19:50:38 +02:00
thatsIch
0076f2ea51 Closes #1452: Implements auto-generation of custom recipes 2015-06-01 17:37:25 +02:00
Lemmmy
58bdeb134c Proper English localisation 2015-06-01 01:54:44 +01:00
PetaByteBoy
c00962b044 add slabs 2015-05-23 15:02:29 +02:00
yueh
61dfc05ae0 Added a simple ETA to crafting jobs 2015-05-21 21:31:13 +02:00
bakaxyf
ed1f327c57 Update zh_CN.lang 2015-05-20 16:10:04 +08:00
TheJulianJES
77873e135f Changed things in de_DE.lang 
Fixed a derp

Changed it, again!

Fixed it (all)

Added line 450
 2015-05-09 23:20:53 +02:00
Florian Nücke
18503ac526 Added P2P tunnel part for OpenComputers. 
Includes cleanup provided by thatsIch.
 2015-05-09 14:53:54 +02:00
thatsIch
3d5fd2c5e8 Merge pull request #1408 from thatsIch/e-logo 
Closes #1404: Added logo to AE2
 2015-05-08 19:44:02 +02:00
thatsIch
81464d7de1 Closes #1404: Added logo to AE2 2015-05-08 18:47:18 +02:00
thatsIch
00248f574a Fixes #1411: Adds recipes for stairs 2015-05-08 18:32:44 +02:00
Lorenzo Dalla Costa Cervelin
34665d94df Update pt_BR.lang 2015-05-06 14:38:21 -03:00
yueh
f364359905 Removed MJ as icon 
Fixes #1348
 2015-04-28 18:28:54 +02:00
Yves
43a47f8971 Update fr_FR.lang 
Minor correction and group organisation
 2015-04-27 13:23:28 +02:00
TheVikingWarrior
ee977720ca Update it_IT.lang 2015-04-26 15:48:53 +02:00
Anton
9451106c81 Update ru_RU.lang 2015-04-24 07:51:44 +03:00
thatsIch
eca598516e Fixes #1277: Removed config option for MJ-P2P Tunnel 2015-04-23 23:45:32 +02:00
thatsIch
f582c8081b Merge pull request #1275 from thatsIch/e-1270-nei-grinder-localization 
Closes #1270: Improves NEI grinder overlay localization
 2015-04-23 23:42:26 +02:00
theelixzammuto
f878a7598d Update it_IT.lang 2015-04-14 18:07:07 +02:00
thatsIch
b282e5d968 Closes #1270: Improves NEI grinder overlay localization 2015-04-13 12:53:55 +02:00
bakaxyf
4f9b8db6fc Update zh_CN.lang 2015-04-08 12:16:13 +08:00
bakaxyf
a7d55ee520 Update zh_CN.lang 2015-04-07 04:39:19 +08:00
thatsIch
aac2b598ea Merge pull request #1221 from Adaptivity/rv2 
Update ru_RU.lang
 2015-04-06 20:30:44 +02:00
thatsIch
04a6a683bc Merge pull request #1220 from thatsIch/e-1219-hardcoded-localizations 
Fixes #1219: Improved localization options
 2015-04-06 15:44:36 +02:00
Anton
fbc44f47c8 Update ru_RU.lang 2015-04-06 16:32:05 +03:00
thatsIch
8321a5fe1c Fixes #1219: Improved localization options 2015-04-06 13:37:40 +02:00
thatsIch
a30ef4679c Fixes #1207 → Enables resource packs more fine tuned information in WAILA channel display 2015-04-05 23:06:31 +02:00
thatsIch
33c1535bfa Fixes #1061 Most recipes are properly registered with new Mekanism. 2015-03-25 12:24:21 +01:00
bakaxyf
a870393edb Update zh_CN.lang 2015-03-25 16:37:46 +08:00
Kamran Mackey
b5582688a3 Fixed a couple typos in en_US.lang. 2015-03-21 03:57:41 -06:00
TheVikingWarrior
f132ae3678 Update it_IT.lang 2015-03-16 20:59:01 +01:00
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