Merge remote-tracking branch 'origin/master' into fabric-1.16

# Conflicts:
#	build.gradle
#	core/src/main/java/appeng/block/AEBaseBlock.java
#	core/src/main/java/appeng/block/misc/TinyTNTBlock.java
#	core/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java
#	core/src/main/java/appeng/fluids/util/AEFluidStack.java
#	src/main/java/appeng/core/AEConfig.java
#	src/main/java/appeng/core/api/definitions/ApiItems.java
#	src/main/java/appeng/debug/EnergyGeneratorBlockEntity.java
#	src/main/java/appeng/entity/TinyTNTPrimedEntity.java
#	src/main/java/appeng/tile/storage/DriveBlockEntity.java

src/main/resources/META-INF/mods.toml

@@ -13,9 +13,16 @@ version="${file.jarVersion}"
 displayName="Applied Energistics 2"
 description="A Mod about Matter, Energy and using them to conquer the world.."
 
-[[dependencies.jei]]
+[[dependencies.appliedenergistics2]]
     modId="forge"
     mandatory=true
     versionRange="[31.0.0,)"
     ordering="NONE"
-    side="BOTH"
+    side="BOTH"
+
+[[dependencies.appliedenergistics2]]
+    modId="minecraft"
+    mandatory=true
+    versionRange="[1.15.2]"
+    ordering="NONE"
+    side="BOTH"

src/main/resources/assets/appliedenergistics2/models/item/dummy_fluid_item.json

@@ -0,0 +1,3 @@
+{
+  "loader": "appliedenergistics2:dummy_fluid_item"
+}