fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,718 Commits 45 Branches 194 Tags
d28f33d198060f61a3f9d2a03070ff1afb417177
Commit Graph

1727 Commits

Author SHA1 Message Date
Sebastian Hartte d28f33d198 Split into internal and external inventories. 
Fixes Charger not being able to load inventories that violated the filter.
 2020-08-24 00:01:18 +02:00
Sebastian Hartte 7df5bf4076 Fix crank not attaching sideways. 2020-08-23 23:49:50 +02:00
Sebastian Hartte 7a469c1a1d Fix server-side HYWLA problems. 2020-08-23 22:30:08 +02:00
Sebastian Hartte e256a4f664 Post-Merge fixes. 2020-08-23 21:20:51 +02:00
Sebastian Hartte 73cc3f8998 Merge remote-tracking branch 'origin/master' into fabric/master 
# Conflicts:
#	gradle.properties
#	src/main/java/appeng/core/api/definitions/ApiItems.java
 2020-08-23 21:08:47 +02:00
Sebastian Hartte 9c9a49f9e7 Merge branch '8.0.x-1.16.1' 2020-08-23 20:48:19 +02:00
Sebastian Hartte 44c0931c02 Fixes #4635: Actually remove requesters when removing requesters. 2020-08-23 20:47:05 +02:00
Sebastian Hartte 874f46ed4d Fixes #4633: Storage buses cannot see attached inventories. 2020-08-23 11:23:35 +02:00
Sebastian Hartte d82c713112 Delay registration of various client settings until the client is fully initialized. 2020-08-21 00:00:03 +02:00
Sebastian Hartte 45cbc40177 Fix wrench interaction with part hosts. 2020-08-20 22:58:49 +02:00
shartte 33d7f02323 Fixes #4590: Crystal seeds (other than certus) don't display their growth stages. (#4619) 2020-08-19 16:43:47 +02:00
shartte 4e42b17e81 Fixes #4590: Crystal seeds (other than certus) don't display their growth stages. (#4618) 2020-08-19 16:43:45 +02:00
Sebastian Hartte 0e7e9313ee Fixes wrenches not working on tile entities. 
This is a temporary hack for now.
 2020-08-19 01:53:51 +02:00
Sebastian Hartte 2bba843313 Remove unused code in Condenser. 2020-08-19 01:34:15 +02:00
Sebastian Hartte 3fb813a81b Remove Hopper Mixins now merged into LBA. 2020-08-18 19:46:03 +02:00
Sebastian Hartte 9e4f51db6e Merge remote-tracking branch 'origin/master' into fabric/master 
# Conflicts:
#	src/main/java/appeng/entity/TinyTNTPrimedEntity.java
 2020-08-18 01:37:21 +02:00
shartte b8d4f0cffa Fixes #4611: Use of client-side only method for Tiny TNT explosion. (#4612) 2020-08-18 01:35:31 +02:00
shartte fc0f8eab56 Fixes #4611: Use of client-side only method for Tiny TNT explosion. (#4612) 2020-08-18 01:33:47 +02:00
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
shartte 41b7900706 Fixes #4598: Incorrectly rotated face for determining block lightlevel in ME Chest renderer. (#4599) (#4609) 
(cherry picked from commit 954ce1442e)
 2020-08-17 21:58:51 +02:00
shartte 1f9707e256 Fixes #4602: Prevent encoding invalid patterns and handle corrupted patterns a little more gracefully. (#4608) 2020-08-17 21:50:28 +02:00
shartte 7656157b0d Fixes #4602: Prevent encoding invalid patterns and handle corrupted patterns a little more gracefully. (#4608) 2020-08-17 21:49:37 +02:00
shartte 954ce1442e Fixes #4598: Incorrectly rotated face for determining block lightlevel in ME Chest renderer. (#4599) 2020-08-17 21:43:16 +02:00
Sebastian Hartte 739277ab64 Removed unused tunnel types and files. 
Added more tags, moved ender pearl dust to convention tag.
Added compatibility with TechReborn's chargers.
 2020-08-17 19:00:32 +02:00
Sebastian Hartte cf656e1540 Added initial TechReborn compatibility to the EnergyAcceptor. 2020-08-16 18:14:57 +02:00
Sebastian Hartte ab6f46077b Now really fix the encoded pattern not showing the tooltip with spaces. 2020-08-16 14:26:37 +02:00
Sebastian Hartte e9c7312e98 Merge fixes 2020-08-16 14:26:17 +02:00
Sebastian Hartte 006cf2f8c1 Fix missing spaces in encoded pattern item. 2020-08-16 14:06:31 +02:00
Sebastian Hartte 636dce66e3 Hide more Items in REI. 2020-08-16 14:06:22 +02:00
Sebastian Hartte 2787796cd3 Fix Text#toString use on the crafting screens. 2020-08-16 14:06:05 +02:00
Sebastian Hartte ee67c5ea50 Use different naming for fullbright, and always reset it back after setting it. 2020-08-16 14:05:10 +02:00
Sebastian Hartte 11d772a32b Fixed client-side only Text methods. 2020-08-15 17:44:28 +02:00
Sebastian Hartte f20f0e003e Merge remote-tracking branch 'origin/master' into fabric/master 
# Conflicts:
#	gradle.properties
#	src/main/java/appeng/server/subcommands/SpatialStorageCommand.java
 2020-08-15 17:34:54 +02:00
Sebastian Hartte 0f100341d3 Added experimental site export mod. 2020-08-15 17:33:59 +02:00
Sebastian Hartte 73735c5cd5 Remove use of func_244388_a, which is client-only. 2020-08-15 17:29:36 +02:00
Sebastian Hartte b1feeca41c Fixup imports + formatting. 2020-08-15 03:18:23 +02:00
Sebastian Hartte 7d43d79682 Merge remote-tracking branch 'origin/master' into fabric/master 2020-08-15 03:16:03 +02:00
Sebastian Hartte 6c544f2211 Reformatted, and ported back some enhancements from the Forge version. 2020-08-15 02:51:03 +02:00
Sebastian Hartte f455fd1994 Initial port to 1.16.2 2020-08-13 23:29:55 +02:00
Sebastian Hartte 1657c88681 Initial port to 1.16.2 2020-08-13 23:15:09 +02:00
Sebastian Hartte fd67e0e5c6 Initial port to 1.16.2 2020-08-13 23:14:49 +02:00
Sebastian Hartte 0a2f03aa92 Moved Creative Tabs to Bootstrap. 2020-08-12 18:42:58 +02:00
Sebastian Hartte b03a249da3 Remove libstructure 
Migrate to 1.16.2 final
 2020-08-12 18:23:32 +02:00
Sebastian Hartte 964559baa1 Merge remote-tracking branch 'origin/master' into fabric/master 
# Conflicts:
#	src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java
 2020-08-11 16:35:05 +02:00
Sebastian Hartte 87c2c94bd4 Use minus sign for minus buttons in number widget. 2020-08-11 16:31:20 +02:00
Sebastian Hartte 06f30b3daa Reformat 2020-08-11 16:21:05 +02:00
Sebastian Hartte 68a02ed64b Updated to 1.16.2-rc2 2020-08-11 16:20:31 +02:00
Sebastian Hartte c59a6e34eb Post-merge fixes 2020-08-11 02:12:26 +02:00
Sebastian Hartte 5b4f450fc3 Fix toLowerCase issues 2020-08-11 02:07:32 +02:00
Sebastian Hartte ff0d38d56a Merge fixes 2020-08-11 01:36:51 +02:00