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 |
|
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 |
|