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

2153 commits

This branch
This branch
All branches
Author SHA1 Message Date
thatsIch
09ed06e47f Fixes #1588: Charged Certus Quartz Ore has its own oredictionary entry 2015-06-14 10:10:36 +02:00
Uristqwerty
c1c3655db6 Cleaned up CraftGuide Integration 
A NPE caused to open CraftGuide very slowly (several seconds)

Added Grinder recipes
Added Inscriber recipes

Conflicts:
	src/main/java/appeng/integration/modules/CraftGuide.java
 2015-06-09 23:42:03 +02:00
yueh
b05796e62b No longer invalidate the cache of MEMonitorIInventory on simulate. 
Should fix #1036
 2015-06-05 23:06:57 +02:00
thatsIch
200e56a509 Fixes #1536: Checking for all required BC classes 2015-06-01 20:47:04 +02:00
thatsIch
9540bbce49 Merge pull request #1499 from TheJulianJES/patch-5 
Changed version from PartStack provider to rv2 (rv3)
 2015-05-23 13:52:58 +02:00
TheJulianJES
c6d932da04 Changed version from PartStack provider to rv2 (rv3) 
because @thatsIch merged it also to rv2
 2015-05-23 13:49:52 +02:00
yueh
6e7100361c Fixes #1465 faulty item comparison 2015-05-19 21:16:30 +02:00
TheJulianJES
ca50ee0762 Removes default RF tooltip 
Removed tab

Did something
 2015-05-19 21:16:10 +02:00
TheJulianJES
f00d5c297f Parts display correctly in WAILA 
Register an method that can be overidden

Register the same method in the interface

New class that picks the item and displays it to WAILA

Register the new class and call the other class method

Import in PartWailaDataProvider

Fixed errors

Renamed all Display -> Stack

Stuff
 2015-05-19 21:15:50 +02:00
yueh
b13f5ced01 Fixes #1389 Enabled repeatable keyboard events 2015-05-19 21:14:49 +02:00
thatsIch
1c0f1ea243 Merge branch 'rv2' of https://github.com/AppliedEnergistics/Applied-Energistics-2 into rv2 2015-05-19 21:11:26 +02:00
Jeremiah Winsley
b612ff47a3 Test with V6e of RotaryCraft 
Conflicts:
	gradle.properties
 2015-05-19 21:10:08 +02:00
Jeremiah Winsley
e8a68cc531 Fixes #1384 - implement AdvancedShaftPowerReceiver for RotaryCraft powersink 2015-05-19 21:08:37 +02:00
thatsIch
d9f362270b Merge pull request #1454 from TheJulianJES/doublePlayerInvInscriber 
Don't add the player inventory two times (rv2)
 2015-05-14 12:43:21 +02:00
TheJulianJES
37aef15a02 Don't add the player inventory two times (rv2) 2015-05-14 12:38:44 +02:00
thatsIch
2d8728f0e1 Merge pull request #1437 from TheJulianJES/GermanLang 
Changed things in de_DE.lang (rv2)
 2015-05-10 12:12:08 +02:00
thatsIch
3498a0902b Merge pull request #1434 from plumpudding/errorEclipse 
Error eclipse for rv2 branch
 2015-05-10 12:11:58 +02:00
TheJulianJES
bb4b6719fe Changed things in de_DE.lang 2015-05-10 10:34:54 +02:00
TheJulianJES
34f78a7ce4 Fix warnings in eclipse 
Close scanner instead of doing it with a warning

Make the scanner final..
 2015-05-10 00:14:56 +02:00
thatsIch
064acc21ee Fixes #1411: Adds recipes for stairs 2015-05-08 18:36:42 +02:00
Lorenzo Dalla Costa Cervelin
deeb67f07d Update pt_BR.lang 2015-05-08 17:59:55 +02:00
thatsIch
2eeaa80b59 Merge pull request #1380 from thatsIch/e-fix-javadoc 
Fixed missing Javadoc parameter
 2015-05-03 21:48:53 +02:00
thatsIch
1710894edc Use self compiled InvTweaks API 2015-05-03 21:23:54 +02:00
thatsIch
7cb485aa48 Fixed missing Javadoc parameter 
Reworked the instantiation a bit
Added some additional checks due to the new nonnullability.
 2015-05-03 16:45:27 +02:00
thatsIch
65d0ae9290 Merge pull request #1323 from thatsIch/e-installable-mods 
Makes maven dependencies de- and installable
 2015-05-03 16:24:34 +02:00
thatsIch
1baed48b0a Merge pull request #1372 from thatsIch/b-1368-vibration-chamber-comparator 
Fixes #1368: Vibration Chamber notifies neighbors on inventory change and state change
 2015-05-03 16:24:26 +02:00
yueh
da6b31cdb1 Merge pull request #1352 from yueh/fix-1336 
Fixes part interface inventory model
 2015-05-02 20:39:42 +02:00
thatsIch
013c8d882c Makes maven dependencies de- and installable 
Provides a new configuration `mods` which can be used on Maven Artifacts. That way, we can install them without affecting them on runtime (less load time)

Put the optional tasks into `optional.gradle` where a install task is just a copy task and the deinstall task a delete task

Added maven local to the repositories, if for some reason somebody uses a local maven
 2015-05-02 19:35:34 +02:00
thatsIch
503d325021 Merge pull request #1381 from thatsIch/e-overriden-annotions 
Adds annotations by contract of the interface
 2015-05-02 19:22:19 +02:00
thatsIch
875214c166 Adds annotations by contract of the interface 2015-05-02 15:39:59 +02:00
thatsIch
2eec5309ac Merge pull request #1371 from thatsIch/e-latest-bleeding-edge-badge 
Adds several badges
 2015-05-02 07:24:52 +02:00
thatsIch
a9ec31d72f Merge pull request #1332 from thatsIch/b-1331-crash-on-disabled-material 
Fixes #1331: Happened on deactivating features for intermediate crafting components
 2015-05-02 07:24:36 +02:00
thatsIch
e392ecd08d Fixes #1368: Vibration Chamber notifies neighbors on inventory change and state change 2015-05-01 17:58:59 +02:00
thatsIch
03f9436ef9 Fixes #1331: Happened on deactivating features for intermediate crafting components 
If a feature dependency of ItemMultiMaterial was disabled, the returned value was never assigned with the constructed. Pulling out the construction and setting it before checking it, prevents the NPE and also matches the behaviour in ItemMultiPart, where parts are constructed, but never registered.
 2015-05-01 17:52:23 +02:00
yueh
8917a331eb Merge pull request #1373 from yueh/fix-1360 
Added missing check to detect missing cell workbenches
 2015-05-01 17:39:39 +02:00
thatsIch
8fbb317f6e Adds several badges 2015-05-01 17:34:06 +02:00
yueh
f15561c4dc Added missing check to detect missing cell workbenches 
Fixes #1360
 2015-05-01 12:48:08 +02:00
thatsIch
ee431b3269 Merge pull request #1359 from thatsIch/e-use-gradle-properties 
Do not use the slurper anymore
 2015-04-30 18:52:49 +02:00
thatsIch
ba97dacfdd Merge pull request #1356 from thatsIch/e-brackets-everywhere 
Puts everywhere brackets
 2015-04-30 18:52:34 +02:00
thatsIch
ce6a2e8487 Do not use the slurper anymore 
The proper way to use gradle is to actually use the gradle.properties. It will be automatically read without using a self defined config slurper.

The gradle.properties adds additional convenient options e.g. regarding the VM options and parallel calculation or daemons
 2015-04-29 21:03:49 +02:00
thatsIch
64ed05a1b4 Puts everywhere brackets 2015-04-29 18:38:24 +02:00
thatsIch
23aa8fd72d Merge pull request #1337 from thatsIch/e-1333-recipe-sorter 
Fixes #1333: Updated old code parts related to recipes
 2015-04-28 19:44:55 +02:00
yueh
332ea089e3 Fixes part interface inventory model 
Fixes #1336
 2015-04-28 19:13:51 +02:00
yueh
106003ebf9 Merge pull request #1349 from yueh/fix-1348 
Removed MJ as icon
 2015-04-28 19:11:21 +02:00
thatsIch
8271597394 Merge pull request #1341 from thatsIch/b-1339-server-crash 
Fixes #1339: Was not able to retrieve the name of an unregistered part
 2015-04-28 18:42:42 +02:00
thatsIch
9210069d9b Fixes #1333: Updated old code parts related to recipes 
Fixed an additional bug, where the disassembling recipes were not working properly. The fail logic was flawed, so that it would never match the recipe
 2015-04-28 18:37:46 +02:00
yueh
f364359905 Removed MJ as icon 
Fixes #1348
 2015-04-28 18:28:54 +02:00
thatsIch
fb618b939f Merge pull request #1342 from Mazdallier/patch-1 
Update fr_FR.lang
 2015-04-27 15:48:33 +02:00
Yves
43a47f8971 Update fr_FR.lang 
Minor correction and group organisation
 2015-04-27 13:23:28 +02:00
thatsIch
e85acf2bee Fixes #1339: Was not able to retrieve the name of an unregistered part 
Added an additional map to store all parts and be able to access them if needed.
Added public preconditions
Added private asserts
Excluded public overridden methods, since behaviour can be unexpected
 2015-04-27 09:51:40 +02:00