d053c9b1bc
Post-Merge Fixes
2020-07-19 01:09:06 +02:00
be4fdfed85
Merge remote-tracking branch 'origin/master' into fabric-1.16
...
# Conflicts:
# src/main/java/appeng/block/spatial/SpatialPylonBlock.java
# src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java
# src/main/java/appeng/core/AppEng.java
# src/main/java/appeng/hooks/TickHandler.java
# src/main/java/appeng/me/cluster/MBCalculator.java
# src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
# src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
# src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java
# src/main/java/appeng/me/helpers/AENetworkProxy.java
# src/main/java/appeng/tile/networking/CableBusBlockEntity.java
# src/main/java/appeng/tile/networking/DenseEnergyCellBlockEntity.java
# src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java
# src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java
# src/main/java/appeng/util/Platform.java
2020-07-19 01:05:14 +02:00
a94e8504f8
Correctly convert milliseconds to microseconds ( #4478 )
2020-07-18 20:51:30 +02:00
9275bfe001
Split TickHandler#onTick into more specific event handlers ( #4477 )
2020-07-18 19:35:33 +02:00
19802b96e8
Rendering/Model Fixes
2020-07-18 18:44:10 +02:00
15d4583c56
Working on Spatial Stuff.
2020-07-17 22:38:27 +02:00
0d43ca15be
Removed AEApi
...
Moved all internal access to the internal `Api` class using a new static
getter.
2020-07-11 19:40:34 +02:00
1478e4c378
Lots more moved
2020-07-04 21:03:30 +02:00
2642ced86b
Moving to source sets
2020-07-01 23:36:51 +02:00
f2e3d81fd7
Working in part placement
2020-07-01 21:27:37 +02:00
996d387525
More moves
2020-07-01 01:39:50 +02:00
007c7ceb56
Moved more parts of ME over
2020-07-01 01:04:53 +02:00
529d03fa9e
Added Quartz Tools and Quartz Knife Recipes
2020-06-30 15:33:53 +02:00
ca104912d6
More fixes
2020-06-29 21:23:50 +02:00
0d63f560d3
More moves and compilation fixes
2020-06-29 02:15:31 +02:00
fee5b7fdfc
Utils ported
2020-06-28 03:41:44 +02:00
b79cd732b2
Fabric port in progress
2020-06-27 23:25:38 +02:00
80fbb58d4f
API compiles
2020-06-27 18:09:44 +02:00
ba71a82288
Migrations
2020-06-27 16:18:20 +02:00
b4471b1abb
The Great Renamening of 2020
2020-06-22 13:21:23 +02:00
8606bd5c61
Fixes the color applicator
2020-06-21 20:59:14 +02:00
6d76bb989c
Meteorite Worldgen
2020-06-21 13:38:13 +02:00
fe215f0a91
Code Cleanup
2020-06-19 16:09:06 +02:00
5225ea426b
pick 97420a31d The big reformat of 2020
2020-06-16 21:45:35 +02:00
23b6e195ac
Revert using internal API
2020-06-07 17:21:20 +02:00
c411a800f6
Work on server data and registries.
2020-06-05 19:03:29 +02:00
237463dd94
Lots of compile fixes
2020-06-04 03:02:48 +02:00
3f5c299d09
More compile things
2020-06-02 15:12:30 +09:30
5cdeff01be
Custom Model Loader
2020-06-01 04:02:37 +02:00
16d6d55d7f
1.15 port
2020-05-18 14:02:45 +02:00
d7b97fa7b8
Replaced LinkedList with ArrayList or ArrayDeque when applicable. ( #3392 )
2018-05-27 21:15:50 +02:00
6032c0328e
Fixes #3143 : Queue network list updates in onTick ( #3144 )
2017-10-08 15:12:27 +02:00
548af3c6cc
Use standard inheritance to propagage NBT events ( #3058 )
...
* Remove the old annotation system
* Use TileEntity#onLoad instead of onChunkLoad event
* Do not call invalidate in onChunkUnload and validate in onLoad
2017-08-28 09:34:09 +02:00
7de90ed0ae
Finally use Java7 <>
2017-07-20 21:21:45 +02:00
621910df91
Format sourcecode
2017-07-20 21:17:10 +02:00
0f86efa3f5
Added workaround for dispenser logic.
2017-07-02 06:05:43 +02:00
7a8499c455
Fixed tools not working due to a change in the onItemUse method fields in ItemStack.java
...
I will have to fix the dispenser logic. Manually right clicking works.
2017-06-30 19:17:06 +02:00
ed9e6dd21c
Port to 1.11
2016-12-21 20:38:36 +01:00
a665200c31
Refactored AEConfig ( #2633 )
...
Added a singleton getter instead the public field.
Reduced all fields to private.
Replaced field access with getters.
Added setters where necessary (Dimension/Biome Registration)
Added config options to disable more features.
Splitted Enum name from the config key.
Changed FacadeConfig and Networkhandler similar to AEConfig.init().
2016-11-26 14:07:34 +01:00
9b51d54403
Fixes #2415 : Renaming remaining items/blocks.
2016-10-03 23:06:57 +02:00
8666936646
Updated forge and MCP mappings to latest version.
2016-09-30 22:13:57 +02:00
f185bc07a6
Capitalised enums to match conventions
2016-09-17 15:06:00 +02:00
6a5add38e2
Fixes incorrect onItemUse declaration, which in turn fixes the color applicator.
2016-09-12 01:46:55 +02:00
b7b5d2590c
Code updated to 1.10
...
Code updated to 1.10. NOT 1.9.4 COMPATIBLE!!!
2016-06-25 11:00:17 +02:00
05aa6972c4
Second update pass (2/3) - 82 -> 0 errors
...
Second update pass which fixes all compile errors. Some parts may have
aftermath effect, hence why 3rd pass will check those maked with
"aftermath".
Errors: 82 -> 0. Mod can be launched.
2016-06-21 11:03:10 +02:00
5498eb6d7c
First update pass (1/3) - ~1400 -> 82 errors
...
This is first update pass, which is mainly import reorganization, name
fixes, etc... Although some parts of second were done where changes
aren't important.
Errors: ~1400 -> 82.
2016-06-19 14:43:27 +02:00
02ac8cf220
Refactored the logging
...
Using LogManager instead of FMLRelaunchLog to access the logger instance.
Added logging of the name of failed exports instead of exception.
Improved crafting log to include issuer including their location and the
requested item.
Removed superfluous FMLRelaunchLog instance.
Removed superfluous parameters for PlayerData constructor.
2016-01-01 02:55:36 +01:00
f84b9a7e1d
All parameters on one line (for now)
...
Easier picking of 1.7 changes
2016-01-01 02:02:05 +01:00
99215e1701
Organized imports
2015-12-24 02:07:03 +01:00
c9e8a6e939
Formatted code
2015-12-24 02:03:16 +01:00
Sebastian Hartte