Octavia Togami
88db45b6bc
Bump paperweight + bundle to fix build
2022-04-21 19:17:56 -07:00
Madeline Miller
9c44dd75d7
Default to Java 17
2021-12-21 22:22:47 +10:00
Madeline Miller
98c93d011b
Merge remote-tracking branch 'origin/version/7.2.x' into chore/merging-to-master
2021-12-21 20:16:52 +10:00
Madeline Miller
9409cc9700
Pin adapter version
2021-12-21 20:09:55 +10:00
Madeline Miller
d0ecd8da78
Merge 1.18.1 to master
2021-12-21 20:09:55 +10:00
Madeline Miller
92dfe5e44e
Bump Paperweight to allow 1.17 adapters from source
2021-12-21 19:49:48 +10:00
wizjany
20c42b51c8
Extract log4j version to Versions.kt.
...
Also bump to match underlying platform versions to resolve runtime
version mismatches.
2021-12-12 18:49:32 -05:00
wizjany
885c326cee
Bump paperweight, dev bundle.
2021-12-12 17:27:22 -05:00
wizjany
a8656c5f24
Bump some versions, fix forge run configs.
2021-12-02 13:21:57 -05:00
wizjany
63d2ad4ec3
Bump forge (again).
2021-11-30 20:11:35 -05:00
wizjany
f534b61f30
Theoretically works on forge.
2021-11-30 16:01:06 -05:00
Octavia Togami
44d91b0c73
Shove 1.17 adapters into a jar to fix the build
2021-11-26 18:54:55 -08:00
Lilly Tempest
de6fa17b01
Add getBrush helper for use with instanceof pattern matching ( #1926 )
...
Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
2021-11-21 02:02:59 +00:00
Octavia Togami
09bdf0a629
Merge branch 'version/7.2.x'
...
Oh god this was so awful
2021-11-20 17:23:24 -08:00
Octavia Togami
953e22fc38
[Fabric] Update to 1.18-pre4
2021-11-18 18:20:05 -08:00
Octavia Togami
53559192b4
Fix the build a bit
...
Improved checkstyling
2021-11-14 00:15:22 -08:00
Octavia Togami
410688e7b7
[Fabric] Update to 1.18-pre1, Mojmapped
...
Also Gradle 7.3. :)
2021-11-14 00:01:06 -08:00
Octavia Togami
771ffae148
Some 1.18 related version shenaigans
...
Compiles: No
2021-11-13 21:54:21 -08:00
wizjany
bd87665e34
Update paperweight + userdev bundle. ( #1930 )
...
* Update paperweight + userdev bundle.
* remove unneeded config (set by userdev plugin already)
2021-11-11 20:05:43 +00:00
Octavia Togami
9928bc85b0
Specify UTF-8 for javadoc as well
2021-11-02 10:45:35 -07:00
Octavia Togami
e6857ec739
Move adapters to paperweight ( #1909 )
...
* Move adapters to paperweight
* Edit adapters JAR to remove 1.17 R1_2
* Fix checkstyle
* Add URL for updating version in the future
2021-10-01 21:11:29 -07:00
Octavia Togami
6c08b68244
Set Multi-Release in CLI manifest
...
Fixes #1890
2021-09-06 16:41:28 -07:00
Octavia Togami
ed7923a235
Require 16 in API
2021-08-30 11:03:14 -07:00
Madeline Miller
515863da1f
Merge branch 'version/7.2.x'
2021-08-09 20:17:59 +10:00
Octavia Togami
96c97997dc
Exclude JSR305 from libs
...
Fixes #1859
2021-08-01 09:44:44 -07:00
Octavia Togami
2e45a20348
[Forge] Update to 1.17.1 ( #1847 )
...
* [Forge] Update to 1.17.1
Includes minor updates to Fabric as well.
water and water and water water
* Fix a few things
* Move to latest versions of FG/Forge
Also drops TrueZIP in dev
2021-07-28 23:01:35 -07:00
Octavia Togami
8a830814df
Merge branch 'version/7.2.x'
2021-07-13 14:38:26 -07:00
Octavia Togami
1f21162bd0
Ensure the SLF4J ban is being applied
...
Fabric gets skipped 'cause its scuffed
2021-07-09 00:40:20 -07:00
Madeline Miller
b8a9c0070c
Merge branch 'version/7.2.x'
2021-06-19 15:19:32 +10:00
JOO200
eb7b79c949
Use require instead of strictly to reduce problems with mojang/bukkit updates ( #1787 )
2021-06-16 12:35:16 -07:00
Octavia Togami
043c3315aa
Fix Scuffed POMs ( #1779 )
...
* Repair fabric POM
* Fix-up a ton of publishing errors
* Remove shadow jar from publishing
* Remove shadow application from platform/core
2021-06-13 11:32:38 -07:00
Octavia Togami
47b64257fb
Restrict the weird forge maven to known content
2021-06-12 20:39:38 -07:00
Octavia Togami
7676a2d54c
[Fabric] Update to 1.17 ( #1772 )
2021-06-08 19:18:24 -07:00
Octavia Togami
8cfbf7e478
Use 16 as our toolchain, but set release to 8
2021-06-02 15:03:33 -07:00
Octavia Togami
67c99bed36
Merge branch 'version/7.2.x'
2021-05-25 18:10:14 -07:00
Octavia Togami
876108fdb3
Prepare for Gradle 7, but due to FG only get to 6.9
...
Gradle 7 stuff requires FG 5. Phooey.
2021-05-13 22:01:45 -07:00
Octavia Togami
10c8a11d7d
Merge branch 'version/7.2.x'
2021-04-22 11:18:28 -07:00
Octavia Togami
146867402f
Update FG for new maven repo
2021-04-20 20:20:26 -07:00
Octavia Togami
504b8bb249
Merge branch 'version/7.2.x'
2021-04-06 13:56:47 -07:00
Octavia Togami
f0a3848b97
Switch to maven-publish ( #1718 )
...
* Update to use maven-publish instead of maven
* Use published loom
* These shouldn't be needed
2021-04-06 13:45:57 -07:00
Octavia Togami
c7da4c0ade
Swap out logback for log4j2
2021-04-05 10:50:39 -07:00
Matthew Miller
97a4df96c3
Merge branch 'version/7.2.x'
2021-04-05 13:14:38 +10:00
Octavia Togami
609c7b8cc4
Scrapped Logging Framework 4 Java ( #1715 )
...
* The scramble is complete
* Fix version decl for Bukkit Log4J
* Swap out to a compatibility layer for LogManager
Slightly slower, but compatible across all Java versions
* Piston released with SL4JF removal
* Clean up declarations a bit
2021-03-28 20:35:48 -07:00
Octavia Togami
386656ffb4
Update extractor, see if that fixes anything
2021-03-27 23:30:10 -07:00
Octavia Togami
3194af3aa7
Merge branch 'version/7.2.x'
2021-03-10 01:59:36 -08:00
Matthew Miller
d3810865c8
Show a message with install instructions when running the jar file ( #1682 )
...
* Show a message with install instructions when running the jar file
* Typo
* Fixed checkstyle issue
* Slightly modify message to adapt to the type of install
* Clean up the display code a lot
* Allow line breaks before semi
Co-authored-by: Octavia Togami <octavia.togami@gmail.com>
2021-02-22 22:05:23 -08:00
Matthew Miller
2c7ac3d21f
Merge pull request #1611 from EngineHub/feature/nbt-parsing
...
Add NBT Parsing for items
2021-02-15 20:42:52 +10:00
Matthew Miller
137c266e3a
Migrate to adventure-nbt
2021-02-06 20:23:29 +10:00
Octavia Togami
9534a9cfce
Update so many dependencies, merge Forge/Fabric for final jar ( #1651 )
...
* Update so many dependencies, merge Forge/Fabric for final
* Clean up contrib docs for Gradle change
* Fix setting compat flags while using toolchain
* Fix deprecation in doc printer
* Restore proper forge JAR name
* Add dist classifier for mod jar
* Properly relocate new bStats
* Fix jar used from fabric
* Fix fabric bom
* Dup the shaded classes for consistency
* Sync Forge/Fabric log4j versions, de-dup
* Downgrade both log4j. This will work
* Update some plugins as well
* Drop the fabric force stuff
* Use duplicate strategy to directly merge jar
2021-01-25 02:14:09 -08:00
Octavia Togami
d0e6f9f33b
Always load internal strings.json for default locale
2020-11-29 17:20:32 -08:00
