fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
74480502b17df7154e9d2720f31dcd13ddd82909
Applied-Energistics-2/src/main/java/appeng
T
History
Sebastian Hartte 74480502b1 Merge remote-tracking branch 'origin/master' into fabric/master 
# Conflicts:
#	.github/workflows/release.yml
2020-08-18 00:20:46 +02:00
..
attributes
Added spotless back and reformatted
2020-07-27 20:07:27 +02:00
block
Merge fixes
2020-08-16 14:26:17 +02:00
bootstrap
Fixup imports + formatting.
2020-08-15 03:18:23 +02:00
client
Fixes #4598: Incorrectly rotated face for determining block lightlevel in ME Chest renderer. (#4599)
2020-08-17 21:43:16 +02:00
container
Merge remote-tracking branch 'origin/master' into fabric/master
2020-08-18 00:20:46 +02:00
core
Merge remote-tracking branch 'origin/master' into fabric/master
2020-08-18 00:20:46 +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
Reformatted, and ported back some enhancements from the Forge version.
2020-08-15 02:51:03 +02:00
entity
Fixup imports + formatting.
2020-08-15 03:18:23 +02:00
facade
Merge remote-tracking branch 'origin/master' into fabric/master
2020-08-05 23:40:58 +02:00
fluids
Removed unused tunnel types and files.
2020-08-17 19:00:32 +02:00
helpers
Fixup imports + formatting.
2020-08-15 03:18:23 +02:00
hooks
Fixup imports + formatting.
2020-08-15 03:18:23 +02:00
integration
Removed unused tunnel types and files.
2020-08-17 19:00:32 +02:00
items
Merge remote-tracking branch 'origin/master' into fabric/master
2020-08-18 00:20:46 +02:00
me
Fixup imports + formatting.
2020-08-15 03:18:23 +02:00
mixins
Merge remote-tracking branch 'origin/master' into fabric/master
2020-08-15 03:16:03 +02:00
parts
Removed unused tunnel types and files.
2020-08-17 19:00:32 +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
Reformatted, and ported back some enhancements from the Forge version.
2020-08-15 02:51:03 +02:00
tile
Removed unused tunnel types and files.
2020-08-17 19:00:32 +02:00
util
Added initial TechReborn compatibility to the EnergyAcceptor.
2020-08-16 18:14:57 +02:00
worldgen
Fixup imports + formatting.
2020-08-15 03:18:23 +02:00