dfsek
|
10f62b75b6
|
resolve conflicts
|
2021-09-26 22:49:47 -07:00 |
|
dfsek
|
0a6a3268da
|
Merge remote-tracking branch 'origin/ver/6.0.0' into architecture/slf4j-logging
# Conflicts:
# common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java
# common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureExportCommand.java
# common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/EnchantFunction.java
# common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java
# common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedBlock.java
# common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedLootApplication.java
# common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedStateManipulator.java
# common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java
# common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java
# common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java
# common/api/core/src/main/java/com/dfsek/terra/api/Platform.java
# common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java
# common/implementation/src/main/java/com/dfsek/terra/InternalAddon.java
# common/implementation/src/main/java/com/dfsek/terra/commands/AddonsCommand.java
# common/implementation/src/main/java/com/dfsek/terra/commands/ReloadCommand.java
# common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileQueryCommand.java
# common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java
# common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java
# common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java
# common/implementation/src/main/java/com/dfsek/terra/event/FunctionalEventHandlerImpl.java
# common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java
# common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java
# common/implementation/src/main/java/com/dfsek/terra/registry/master/ConfigRegistry.java
# platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitAddon.java
# platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java
# platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java
# platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricAddon.java
# platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricEntryPoint.java
# platforms/fabric/src/main/java/com/dfsek/terra/fabric/PlatformImpl.java
# platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java
# platforms/sponge/src/main/java/com/dfsek/terra/sponge/PlatformImpl.java
|
2021-09-26 22:46:54 -07:00 |
|
dfsek
|
98d147a304
|
depend on Strata
|
2021-09-26 14:40:41 -07:00 |
|
dfsek
|
4945a3bbfa
|
rename main parameters/fields to platform
|
2021-09-26 13:22:45 -07:00 |
|
dfsek
|
8f51707505
|
use expression switches
|
2021-09-26 13:16:43 -07:00 |
|
dfsek
|
3de02c5d63
|
rename TerraPlugin to Platform
|
2021-09-26 13:02:19 -07:00 |
|
dfsek
|
cc55588967
|
more Distributor API
|
2021-09-24 22:14:17 -07:00 |
|
solonovamax
|
9eef2599b9
|
Finish up merge into ver/6.0.0, as there were still some errors.
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
|
2021-09-25 01:12:06 -04:00 |
|
dfsek
|
c928a1a806
|
more Column API
|
2021-09-24 22:06:26 -07:00 |
|
solonovamax
|
4c1ac827ad
|
Merge remote-tracking branch 'upstream/ver/6.0.0' into architecture/slf4j-logging
# Conflicts:
# common/api/util/src/main/java/com/dfsek/terra/api/util/Logger.java
# common/implementation/src/main/java/com/dfsek/terra/AbstractTerraPlugin.java
# common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java
# common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java
# common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java
# common/implementation/src/main/java/com/dfsek/terra/util/logging/DebugLogger.java
# common/implementation/src/main/java/com/dfsek/terra/util/logging/JavaLogger.java
# platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraPluginImpl.java
# platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraPluginImpl.java
# platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraPluginImpl.java
|
2021-09-25 00:42:09 -04:00 |
|
dfsek
|
09b4da7974
|
move DI stuff to new subproject
|
2021-09-24 12:31:08 -07:00 |
|
dfsek
|
ed1eb02256
|
move NoiseSampler to noise project
|
2021-09-24 12:24:06 -07:00 |
|
dfsek
|
dda2ed955d
|
move vectors to util project
|
2021-09-24 12:22:44 -07:00 |
|
dfsek
|
b3503026b4
|
create noise project
|
2021-09-24 12:20:57 -07:00 |
|
dfsek
|
328bdee602
|
move MathUtil to util project
|
2021-09-24 12:19:37 -07:00 |
|
dfsek
|
988579b708
|
move Sampler to util package
|
2021-09-24 12:18:57 -07:00 |
|
solonovamax
|
b03c8b4a11
|
Merge remote-tracking branch 'upstream/ver/6.0.0' into architecture/slf4j-logging
# Conflicts:
# common/api/core/src/main/java/com/dfsek/terra/api/Logger.java
|
2021-09-24 13:50:21 -04:00 |
|
dfsek
|
c35d1acbbf
|
refactor StringIdentifiable and Logger
|
2021-09-24 07:57:49 -07:00 |
|
dfsek
|
0a6cde69d6
|
move mutable utils
|
2021-09-19 11:32:24 -07:00 |
|
dfsek
|
05cd7084ef
|
move reflection utils
|
2021-09-19 11:31:59 -07:00 |
|
dfsek
|
33ab4c5bfd
|
move generic utils to util project
|
2021-09-19 11:30:49 -07:00 |
|
dfsek
|
554369be31
|
create util api package
|
2021-09-19 11:23:17 -07:00 |
|
dfsek
|
acf3844139
|
move API project
|
2021-09-19 11:20:50 -07:00 |
|