 Sebastian Hartte
|
8e031ca8d6
|
Merge remote-tracking branch 'origin/cleanups' into fabric-1.16
# Conflicts:
# api/src/main/java/appeng/api/implementations/items/IItemGroup.java
# core/src/main/java/appeng/items/materials/MaterialItem.java
# src/main/java/appeng/core/Registration.java
# src/main/java/appeng/core/api/definitions/ApiParts.java
# src/main/java/appeng/items/parts/ColoredPartItem.java
# src/main/java/appeng/items/parts/PartItem.java
# src/main/java/appeng/items/parts/PartModelsHelper.java
# src/main/java/appeng/items/parts/PartType.java
# src/main/java/appeng/items/tools/powered/PortableCellItem.java
|
2020-07-01 01:41:54 +02:00 |
|
|
Sebastian Hartte
|
996d387525
|
More moves
|
2020-07-01 01:39:50 +02:00 |
|
|
Sebastian Hartte
|
1cda087c03
|
Merge remote-tracking branch 'origin/master' into fabric-1.16
|
2020-07-01 01:31:20 +02:00 |
|
|
Sebastian Hartte
|
007c7ceb56
|
Moved more parts of ME over
|
2020-07-01 01:04:53 +02:00 |
|
|
Sebastian Hartte
|
529d03fa9e
|
Added Quartz Tools and Quartz Knife Recipes
|
2020-06-30 15:33:53 +02:00 |
|
|
Sebastian Hartte
|
c0a4762ffc
|
Fixed TNT and basic networking.
|
2020-06-30 11:30:04 +02:00 |
|
|
Sebastian Hartte
|
3337eb9ae3
|
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
|
2020-06-29 21:35:34 +02:00 |
|
|
Sebastian Hartte
|
ca104912d6
|
More fixes
|
2020-06-29 21:23:50 +02:00 |
|
|
Sebastian Hartte
|
0d63f560d3
|
More moves and compilation fixes
|
2020-06-29 02:15:31 +02:00 |
|
|
Sebastian Hartte
|
3df93fc66d
|
Moving
|
2020-06-28 16:18:11 +02:00 |
|
|
Sebastian Hartte
|
f5412152a4
|
Utils ported
|
2020-06-28 15:47:44 +02:00 |
|
|
Sebastian Hartte
|
46955643b9
|
Utils ported
|
2020-06-28 13:28:14 +02:00 |
|
|
Sebastian Hartte
|
fee5b7fdfc
|
Utils ported
|
2020-06-28 03:41:44 +02:00 |
|
|
Sebastian Hartte
|
7c28a71e10
|
Moving code around
|
2020-06-28 00:51:00 +02:00 |
|
|
Sebastian Hartte
|
7f049e099d
|
Moving code around
|
2020-06-28 00:48:21 +02:00 |
|
|
Sebastian Hartte
|
37ce6b262e
|
Fabric port in progress
|
2020-06-28 00:45:33 +02:00 |
|
|
Sebastian Hartte
|
136c204421
|
Fixup logo and remove demo entrypoint
|
2020-06-27 15:40:10 +02:00 |
|
|
Sebastian Hartte
|
6cda95b979
|
Moved assets
|
2020-06-27 15:31:53 +02:00 |
|