fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
fcbebd4ffc7213c88782743642b4326cd672786c
Applied-Energistics-2/src/main/java/appeng
T
History
Sebastian Hartte fcbebd4ffc Merge remote-tracking branch 'origin/master' into fabric/master 
# Conflicts:
#	gradle.properties
#	src/api/java/appeng/api/implementations/items/IGrowableCrystal.java
#	src/main/java/appeng/core/AEConfig.java
#	src/main/java/appeng/core/api/definitions/ApiBlocks.java
#	src/main/java/appeng/core/features/registries/LocatableRegistry.java
#	src/main/java/appeng/decorative/solid/QuartzGlassBlock.java
#	src/main/java/appeng/decorative/solid/SkyStoneBlock.java
#	src/main/java/appeng/entity/GrowingCrystalEntity.java
#	src/main/java/appeng/fluids/parts/FluidImportBusPart.java
#	src/main/java/appeng/items/misc/CrystalSeedItem.java
#	src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java
#	src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
#	src/main/java/appeng/parts/CableBusContainer.java
#	src/main/java/appeng/tile/AEBaseBlockEntity.java
2020-09-09 01:41:49 +02:00
..
attributes
Fixes #4633: Storage buses cannot see attached inventories.
2020-08-23 11:23:35 +02:00
block
Added back dynamic cable bus lighting.
2020-08-29 01:02:32 +02:00
bootstrap
Delay registration of various client settings until the client is fully initialized.
2020-08-21 00:00:03 +02:00
client
Implemented a cache with maximum quad-count it will cache for the cable bus, (#4670)
2020-09-08 14:28:08 +02:00
container
Merge remote-tracking branch 'origin/master' into fabric/master
2020-09-02 02:45:31 +02:00
core
Merge remote-tracking branch 'origin/master' into fabric/master
2020-09-09 01:41:49 +02:00
crafting
Reformatted, and ported back some enhancements from the Forge version.
2020-08-15 02:51:03 +02:00
debug
Fixup imports + formatting.
2020-08-15 03:18:23 +02:00
decorative
Merge remote-tracking branch 'origin/master' into fabric/master
2020-09-09 01:41:49 +02:00
entity
Merge remote-tracking branch 'origin/master' into fabric/master
2020-09-09 01:41:49 +02:00
facade
Merge remote-tracking branch 'origin/master' into fabric/master
2020-09-02 02:45:31 +02:00
fluids
Merge remote-tracking branch 'origin/master' into fabric/master
2020-09-09 01:41:49 +02:00
helpers
Fixup imports + formatting.
2020-08-15 03:18:23 +02:00
hooks
Remove Hopper Mixins now merged into LBA.
2020-08-18 19:46:03 +02:00
integration
Fixed exclusion zones for many screens.
2020-09-02 02:37:47 +02:00
items
Merge remote-tracking branch 'origin/master' into fabric/master
2020-09-09 01:41:49 +02:00
me
Merge remote-tracking branch 'origin/master' into fabric/master
2020-09-09 01:41:49 +02:00
mixins
Also update the layer-map, even though the spatial biome should never show up in any vanilla layering.
2020-09-02 19:44:37 +02:00
parts
Merge remote-tracking branch 'origin/master' into fabric/master
2020-09-09 01:41:49 +02:00
recipes
Fixup imports + formatting.
2020-08-15 03:18:23 +02:00
server
Fixed client-side only Text methods.
2020-08-15 17:44:28 +02:00
services
Fixup imports + formatting.
2020-08-15 03:18:23 +02:00
spatial
Added experimental site export mod.
2020-08-15 17:33:59 +02:00
thirdparty/codechicken/lib
Fixes #4657: Remove usage of an implementation class and just copy the needed values into arrays.
2020-08-29 00:45:01 +02:00
tile
Merge remote-tracking branch 'origin/master' into fabric/master
2020-09-09 01:41:49 +02:00
util
Merge fixes
2020-09-02 19:41:44 +02:00
worldgen
Fixup imports + formatting.
2020-08-15 03:18:23 +02:00