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

2293 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 c5848fe323 Fixes #1710 Use the correct culling face for the meteor compass 2015-09-30 12:57:31 +02:00
yueh 373fa522be Fixes #1718 Use the correct resolver for crystal seeds 2015-09-30 12:56:47 +02:00
yueh 432724623e Fixes #1728 Mark the entity as dead before spawning overflow 2015-09-30 12:56:35 +02:00
yueh 33e2eb5a74 Fixes #1686: Let PlayerRegistry handle nonexistent players 2015-09-30 12:54:22 +02:00
yueh 37f51db0d9 Changed to immutable list to prevent direct modifcations 2015-09-30 12:52:53 +02:00
yueh 0d6f80e813 Fixes #1706 Adds a test to disable unsupported BetterStorage integration 2015-09-30 12:48:25 +02:00
thatsIch bcb4c0bc02 Fix compile errors 2015-09-30 12:47:23 +02:00
yueh c978bf90f8 Ensure that disabled parts are actually disabled and removed. 2015-09-30 12:30:47 +02:00
yueh b013f3a8fa Fixes #1648 Removes unecessary cast to BlockQuartzTorch 2015-09-30 12:22:36 +02:00
thatsIch e5ee4e0e61 Fixes #1474: Prevents crafting of disabled recipes and deletes invalid parts 2015-09-30 12:20:12 +02:00
yueh 5d34b4e182 Reset the lastUsedChannels on a gridstorage change 2015-09-30 12:09:18 +02:00
yueh d866b6c167 Removed overly defensive code and ensure GL state to be restored. 
Fixes #1673
 2015-09-30 12:09:06 +02:00
yueh accfc1221f Fixes #1666 Missing check for the memory card 2015-09-30 12:08:56 +02:00
yueh ca97a7a5e3 Fixes #1656 Reduces the amount of block updates a controller sends. 2015-09-30 12:08:39 +02:00
yueh b39a51a870 Fixes #1646 Save GridStorage properly 2015-09-30 11:51:59 +02:00
Cricket 8be68e9b22 Allows the automation of Vibration Chambers with lava buckets 2015-09-30 11:50:15 +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
thatsIch b20afd0ffa Optimize imports 2015-06-22 18:17:14 +02:00
thatsIch 28c30c44c5 Rename IRenderHelper to ModelGenerator 2015-06-22 18:16:25 +02:00
bakaxyf cc78153fe4 Update zh_CN.lang 2015-06-22 15:38:43 +02:00
yueh 94ac69ce37 Removed meta based rotation of CGA 
Fixes #1618

Conflicts:
	src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java
 2015-06-22 15:38:32 +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
thatsIch 07a4a8505b Fixes #1599: Removes preconditions for world data and children 2015-06-22 14:51:00 +02:00
thatsIch 863b57fc3b Improves the message generated when generating the folder for the compass data. 
Outsources the encoding of the compass data into the file name
Written tests for the encoding
Did some internal cleaning of the class

Conflicts:
	src/main/java/appeng/block/solids/BlockSkyStone.java
	src/main/java/appeng/core/WorldSettings.java
	src/main/java/appeng/core/features/registries/PlayerRegistry.java
	src/main/java/appeng/core/sync/network/NetworkHandler.java
	src/main/java/appeng/core/worlddata/PlayerMapping.java
	src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java
	src/main/java/appeng/services/CompassService.java
	src/main/java/appeng/worldgen/MeteoritePlacer.java
	src/main/java/appeng/worldgen/MeteoriteWorldGen.java
 2015-06-22 14:49:35 +02:00
thatsIch a62d9bfcbf Fixes wrong interface names for BuildCraft Transport 
Conflicts:
	src/main/java/appeng/parts/misc/PartStorageBus.java
	src/main/java/appeng/parts/p2p/PartP2PItems.java
 2015-06-18 20:12:18 +02:00
thatsIch 51ed55510c rest of BC commit 2015-06-18 20:10:37 +02:00
thatsIch 97f23cf955 Updates BuildCraft to 7.0.9 
Split dependency logic on the BuildCraft modules.
Config needs to be reset, if BuildCraft was disabled actively,
because now there are 3 BC modules to be taken account of

Conflicts:
	gradle.properties
	src/main/java/appeng/facade/FacadeContainer.java
	src/main/java/appeng/facade/FacadePart.java
	src/main/java/appeng/integration/abstraction/IBC.java
	src/main/java/appeng/integration/modules/BC.java
	src/main/java/appeng/integration/modules/BCHelpers/BCPipeHandler.java
	src/main/java/appeng/integration/modules/BCHelpers/BCPipeInventory.java
	src/main/java/appeng/items/tools/ToolNetworkTool.java
	src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java
	src/main/java/appeng/parts/CableBusStorage.java
	src/main/java/appeng/parts/layers/LayerIPipeConnection.java
	src/main/java/appeng/parts/misc/PartStorageBus.java
	src/main/java/appeng/parts/p2p/PartP2PItems.java
	src/main/java/appeng/util/inv/AdaptorBCPipe.java
	src/main/java/appeng/util/inv/WrapperBCPipe.java
 2015-06-18 20:09:36 +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 13d40c922b Fixes #1559: Level Emitter with P:R alloy wire does not crash anymore 
Required to implement a more advanced interface, if not done that way, the parts will update themselves recursively
 2015-06-18 01:19:56 +02:00
yueh de260b5283 Splitted channeldata into two ints 
Previously it did encode the current and previous used channels into the
same as well as mask it with 0xFF. Which lead to an overflow every 256
gridnodes requiring a channel. This will not happen at > 2^31

Also removes the need to bitshift them for every access.

Fixes #1510
 2015-06-18 00:46:14 +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
yueh d2563de6c3 Updated eclipse formatter and import order 2015-06-18 00:44:29 +02:00
thatsIch c3e11c6cca Add IntelliJ Code-Style 2015-06-18 00:44:20 +02:00
thatsIch 8861811c93 Updated NEI to latest 2015-06-18 00:02:21 +02:00
thatsIch e6eb58bcf5 Update Invtweaks to latest 2015-06-17 23:52:22 +02:00
thatsIch 03eec78d6f Remove deprecated sameAs for blocks 2015-06-17 23:32:33 +02:00
thatsIch 0cd25428e6 Remove deprecated item definition 2015-06-17 23:30:23 +02:00
thatsIch 6d510d3912 Remove cell deprecation 2015-06-17 23:25:16 +02:00
Uristqwerty 41b8150ef4 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-17 21:35:46 +02:00
yueh 20f72cae04 No longer invalidate the cache of MEMonitorIInventory on simulate. 
Should fix #1036
 2015-06-17 21:34:11 +02:00
thatsIch a95b9962b9 make it runnable 2015-06-17 19:39:18 +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
thatsIch b0348fb888 Merge pull request #1543 from thatsIch/f-1541-td-attunements 
Closes #1541: Implements Thermal Dynamics attunements
 2015-06-03 23:18:17 +02:00