 Sebastian Hartte
|
2655620fd0
|
Merge remote-tracking branch 'origin/master' into fabric-1.16
# Conflicts:
# src/api/java/appeng/api/parts/IPart.java
# src/main/java/appeng/block/AEBaseBlockItemChargeable.java
# src/main/java/appeng/block/qnb/QnbFormedModel.java
# src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java
# src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java
# src/main/java/appeng/client/render/BakedModelUnwrapper.java
# src/main/java/appeng/client/render/BasicUnbakedModel.java
# src/main/java/appeng/client/render/FacadeItemModel.java
# src/main/java/appeng/client/render/cablebus/CableBusModel.java
# src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java
# src/main/java/appeng/client/render/crafting/CraftingCubeModel.java
# src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java
# src/main/java/appeng/client/render/model/BiometricCardModel.java
# src/main/java/appeng/client/render/model/ColorApplicatorModel.java
# src/main/java/appeng/client/render/model/DriveBakedModel.java
# src/main/java/appeng/client/render/model/DriveModel.java
# src/main/java/appeng/client/render/model/GlassModel.java
# src/main/java/appeng/client/render/model/MemoryCardModel.java
# src/main/java/appeng/client/render/model/SkyCompassModel.java
# src/main/java/appeng/client/render/spatial/SpatialPylonModel.java
# src/main/java/appeng/client/render/tesr/ChestTileEntityRenderer.java
# src/main/java/appeng/core/AERecipeType.java
# src/main/java/appeng/core/AppEng.java
# src/main/java/appeng/core/Registration.java
# src/main/java/appeng/core/api/client/ApiCellModelRegistry.java
# src/main/java/appeng/core/api/definitions/ApiItems.java
# src/main/java/appeng/fluids/helper/DualityFluidInterface.java
# src/main/java/appeng/items/misc/CrystalSeedItem.java
# src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java
# src/main/java/appeng/parts/automation/PlaneModel.java
# src/main/java/appeng/recipes/handlers/GrinderRecipe.java
# src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java
# src/main/java/appeng/recipes/handlers/InscriberRecipe.java
# src/main/java/appeng/recipes/handlers/InscriberRecipeSerializer.java
# src/main/java/appeng/spatial/SpatialDimensionManager.java
# src/main/java/appeng/tile/networking/CableBusBlockEntity.java
# src/main/java/appeng/tile/storage/SkyChestBlockEntity.java
|
2020-08-02 14:37:29 +02:00 |
|
|
shartte
|
c8d08f9726
|
Fixes sidedness issues that cropped up with 1.16 (#4533)
|
2020-08-01 22:16:57 +02:00 |
|
|
yueh
|
0beab559a6
|
Fix formatting
|
2020-07-28 11:44:57 +02:00 |
|
|
yueh
|
a65be62cd1
|
Organize and clean imports
|
2020-07-28 10:29:57 +02:00 |
|
|
Sebastian Hartte
|
84e6aaa122
|
Compiles again.
|
2020-07-27 23:50:28 +02:00 |
|
|
Sebastian Hartte
|
780f68952b
|
Added spotless back and reformatted
|
2020-07-27 20:07:27 +02:00 |
|
|
yueh
|
56ecda5173
|
1.16 port
|
2020-07-27 11:21:50 +02:00 |
|
|
Sebastian Hartte
|
8306f5bf0a
|
Port more stuff
|
2020-07-25 02:24:36 +02:00 |
|
|
Sebastian Hartte
|
5bf05f6cb1
|
Port more stuff
|
2020-07-24 18:39:39 +02:00 |
|
|
Sebastian Hartte
|
15d4583c56
|
Working on Spatial Stuff.
|
2020-07-17 22:38:27 +02:00 |
|
|
Sebastian Hartte
|
2642ced86b
|
Moving to source sets
|
2020-07-01 23:36:51 +02:00 |
|
|
Sebastian Hartte
|
f2e3d81fd7
|
Working in part placement
|
2020-07-01 21:27:37 +02:00 |
|
|
Sebastian Hartte
|
80fbb58d4f
|
API compiles
|
2020-06-27 18:09:44 +02:00 |
|
|
yueh
|
5225ea426b
|
pick 97420a31d The big reformat of 2020
|
2020-06-16 21:45:35 +02:00 |
|
|
Sebastian Hartte
|
a4b16c21a3
|
Spatial Sky Renderer fixed
Changed Tooltips for Spatial Cells
Updated forge + mcp
|
2020-06-13 15:51:04 +02:00 |
|
|
Sebastian Hartte
|
5ec9600177
|
Refactored spatial dimension data into a helper class.
|
2020-06-13 13:07:15 +02:00 |
|