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

114 commits

Author SHA1 Message Date
yueh a62e157e7c Merge pull request #2091 from Adaptivity/master 
Ore Dictionary support for recipes
 2016-01-08 21:00:34 +01:00
JJN 22f05428be fixed #2090 
fixed #2090
 2016-01-07 09:29:49 +08:00
Adaptivity bd0bf26f30 Ore Dictionary support for recipes 
Added missing changes to oredict.recipe
 2016-01-06 20:29:33 +03:00
thatsIch 6e61627d7c Merge pull request #2006 from Mazdallier/patch-1 
Update fr_FR.lang
 2016-01-03 14:42:59 +01:00
Tier 6aa91c3f65 Japanese translation files 
Hello!!
As we have created a Japanese translation files , and you sure you want to got to add when it is good?
 2015-12-29 17:46:20 +09:00
Wilhelm Schuster 276480519e Update and extend German translation 
Add translated achievements.
 2015-12-20 14:23:42 +01:00
XFRGod df6070ecbd Update hu_HU.lang 
This is a language "correction"(?) and typo fixing update for the lang file and now it's 110% localized:D
 2015-12-11 16:04:16 +01:00
XFRGod 88f9c8ba40 Update hu_HU.lang 
Okay now it's absolutely 100% done and I'm officially dead.
Onto EnderIO and Botania then!
 2015-12-06 21:36:53 +01:00
XFRGod 11f92f6888 Update hu_HU.lang 2015-12-06 16:49:45 +01:00
Mazdallier 5bb0ac7833 Update fr_FR.lang 
thanks Pyeroh
 2015-11-17 10:27:12 +01:00
Mazdallier 55c0e6aa56 Update fr_FR.lang 2015-11-16 09:47:36 +01:00
bakaxyf 1ea48fb389 Update zh_CN.lang 
1728f683c3 d893e52eb0 24224a450b
 2015-10-18 00:37:39 +08:00
yueh 24224a450b Added an option to toggle oredict subsitutions for patterns. 
It adds a backward compatibility to convert current patterns to use
oredict by default, which should be removed with rv4 stable.

Closes #1156
 2015-10-06 11:33:27 +02:00
thatsIch 37ae2131fe 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-09-26 23:15:25 +02:00
asd0210a 20c1c4529a zh_tw.lang Updated 2015-09-21 10:15:20 +08:00
yueh 0df445c6a8 Merge pull request #1862 from yueh/feature-interface-9-slots 
Changed the interface to 9 slots to be consistent with every other machine
 2015-09-11 20:04:29 +02:00
thatsIch 8c817b2f85 Merge pull request #1851 from thatsIch/b-1850-add-second-optional-to-grindstone 
Fixes #1850: Fixed support for second optional output of the AE2 Grindstone
 2015-09-10 19:15:29 +02:00
yueh 7bd8cf3f59 Changed the interface to 9 slots to be consistent with every other machine 2015-09-08 00:19:05 +02:00
yueh 3dd948e4a4 Merge pull request #1854 from yueh/feature-recipes-refactoring 
Added a missing whitespace and removed duplicate ones.
 2015-09-05 18:00:22 +02:00
thatsIch 3bb9e4df97 Merge pull request #1634 from thatsIch/b-1588-wrong-oredict-name 
Fixes #1588: Charged Certus Quartz Ore was given a wrong name
 2015-09-03 23:50:53 +02:00
yueh 5817cde56b Added a missing whitespace and removed duplicate ones. 2015-09-02 16:51:37 +02:00
Mazdallier 45d94d4c2c Update fr_FR.lang 2015-09-02 10:00:16 +02:00
thatsIch d893e52eb0 Fixes #1850: Fixed support for second optional output of the AE2 Grindstone 2015-09-01 23:58:40 +02:00
thatsIch 464a56ffc5 Fixes #1588: Charged Certus Quartz Ore was given a wrong name 2015-08-31 16:54:29 +02:00
yueh c2022a7208 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-08-21 12:23:20 +02:00
yueh 1728f683c3 Closes #1726: Added Pressure P2P tunnel (PneumaticCraft) 2015-08-06 19:37:19 +02:00
bakaxyf 5b6b14cde7 Update zh_CN.lang 2015-08-06 15:32:15 +08:00
yueh c3ce9d9542 Adds a round robin and random mode to export buses. 
Resolves #85
 2015-07-25 17:27:56 +02:00
yueh 15993eb3c7 Merge pull request #1695 from yueh/b-prevents-crafting-of-disabled-parts 
Prevents crafting of disabled parts
 2015-07-24 22:27:21 +02:00
yueh e9e9535f2a Merge pull request #1635 from thatsIch/e-export-oredicts 
Exports the ore-dicts out of the recipe files
 2015-07-14 21:29:18 +02:00
yueh c823e1464b Ensure that disabled parts are actually disabled and removed. 2015-07-10 18:35:22 +02:00
thatsIch cd0aec123d Exports the ore-dicts out of the recipe files 
This will not alter the handler, because rewriting the parser for it being too static is not feasible at this point
 2015-06-21 23:57:36 +02:00
bakaxyf 77597973e7 Update zh_CN.lang 2015-06-20 17:55:24 +08:00
thatsIch 349ac7e0a0 Merge pull request #1590 from thatsIch/b-1588-same-oredict-name-for-certus-ore-and-charged 
Fixes #1588: Charged Certus Quartz Ore has its own oredictionary entry
 2015-06-13 17:17:54 +02:00
thatsIch b5d0db493b Fixes #1588: Charged Certus Quartz Ore has its own oredictionary entry 2015-06-13 17:06:24 +02:00
yueh 256c0258bb Merge pull request #1522 from yueh/feature-12 
Closes #12 Added visual lock state to monitors
 2015-06-13 16:55:03 +02:00
yueh cb013cf55b Moved ETA to the title and also no longer display for empty jobs 
Fixes #1567
 2015-06-11 20:00:47 +02:00
yueh 5aaaeb6d42 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.
 2015-06-06 17:00:52 +02: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