Skip to content
This repository has been archived by the owner on Jun 19, 2021. It is now read-only.

Yatopia 2 Electric Boogaloo [Yatopia Reforged] #339

Merged
merged 95 commits into from
Jan 21, 2021
Merged
Changes from 1 commit
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
45bba72
Init Reforged
duplexsystem Jan 17, 2021
4a7e7cc
Init Submodules
duplexsystem Jan 17, 2021
316dce5
Clean Up
duplexsystem Jan 17, 2021
c4ccdb8
Re Add removed
duplexsystem Jan 18, 2021
58ccf6a
Try fix github actions
duplexsystem Jan 18, 2021
64c8eae
Don't clone unnecessary submodules
duplexsystem Jan 18, 2021
0d663ad
fix build?
duplexsystem Jan 18, 2021
ddb8248
remove pom
duplexsystem Jan 18, 2021
14c604a
more clean up
duplexsystem Jan 18, 2021
6881c78
fix build
duplexsystem Jan 18, 2021
aee8c20
caching should work now
duplexsystem Jan 18, 2021
b097db1
fix java 15
duplexsystem Jan 18, 2021
2a0a10e
gradle cache
duplexsystem Jan 18, 2021
0872062
Speed up gradle
duplexsystem Jan 18, 2021
1cdb039
correct caches
duplexsystem Jan 18, 2021
7b47473
thread paperclip
duplexsystem Jan 18, 2021
b198853
fix build
duplexsystem Jan 18, 2021
89c281e
fix gradle cache
duplexsystem Jan 18, 2021
8b71464
fix maven cache restore
duplexsystem Jan 18, 2021
2365d4a
maybe I shouldn't be editing this in text editor
duplexsystem Jan 18, 2021
952d0cc
remove restore key
duplexsystem Jan 18, 2021
200d12d
do daemon for paperclip
duplexsystem Jan 18, 2021
76138f5
more threading?
duplexsystem Jan 18, 2021
92e6f8e
try making paperclip faster
duplexsystem Jan 18, 2021
75a567a
bad idea
duplexsystem Jan 18, 2021
a2202a8
Java 8
duplexsystem Jan 18, 2021
cb1a095
add java version to gradle cache
duplexsystem Jan 18, 2021
22ae125
try to fix stability issues
duplexsystem Jan 18, 2021
77d27b0
remove that
duplexsystem Jan 18, 2021
8058bb3
might fix
duplexsystem Jan 18, 2021
ebc98ab
fix 2
duplexsystem Jan 18, 2021
547d428
this is a very strange bug
duplexsystem Jan 18, 2021
9323f69
fix strange fix to strange bug
duplexsystem Jan 18, 2021
7993785
more debug
duplexsystem Jan 18, 2021
519c0fa
more debug
duplexsystem Jan 18, 2021
052bcec
Merge remote-tracking branch 'origin/dev/reforged' into dev/reforged
duplexsystem Jan 18, 2021
320e061
potentially fix bug
duplexsystem Jan 18, 2021
26ab7d2
opt imports
duplexsystem Jan 18, 2021
ac52d47
Suppress warning
duplexsystem Jan 18, 2021
3900f17
Ignore my previous comment
duplexsystem Jan 18, 2021
fd527fb
Patch Credits
duplexsystem Jan 18, 2021
ac5c6b1
Small tweak
duplexsystem Jan 18, 2021
79fc527
Misc Improvements
duplexsystem Jan 18, 2021
cd518e4
Fix
duplexsystem Jan 18, 2021
508d4af
Cursed mode flag
duplexsystem Jan 18, 2021
b4f004d
debug and formatting
duplexsystem Jan 18, 2021
e1d682a
Simplify code
duplexsystem Jan 18, 2021
905faca
fix todo
duplexsystem Jan 18, 2021
a6def72
fix bug
duplexsystem Jan 18, 2021
774c975
Sidestream Support For Commit Message
duplexsystem Jan 18, 2021
0d8c1e9
CodeMC should work
duplexsystem Jan 18, 2021
9808799
EOF
duplexsystem Jan 18, 2021
31e890f
ReadME changes
duplexsystem Jan 18, 2021
c4c14a7
H1 > H3
duplexsystem Jan 18, 2021
1eb9bef
Update Licence
duplexsystem Jan 18, 2021
60a7ebf
Merge remote-tracking branch 'origin/ver/1.16.5' into dev/reforged
duplexsystem Jan 18, 2021
ede7d44
space
duplexsystem Jan 18, 2021
2f9dd85
Update README.md
duplexsystem Jan 18, 2021
204b1d0
Updated Upstream and Sidestream(s) (AirplaneLite)
duplexsystem Jan 19, 2021
a15336e
Fix upstreamCommit
duplexsystem Jan 19, 2021
28c2af2
Fix Branch Issue
duplexsystem Jan 19, 2021
2c7acf7
Fix Build
duplexsystem Jan 19, 2021
be92ebb
More print out
duplexsystem Jan 19, 2021
2ae2744
Oops
duplexsystem Jan 19, 2021
95e77f4
Updated Upstream and Sidestream(s) (Tuinity)
duplexsystem Jan 19, 2021
1c3d1b9
try not updating sub-modules
duplexsystem Jan 19, 2021
de7d60c
Fix build
duplexsystem Jan 19, 2021
df8005b
Revert "try not updating sub-modules "
duplexsystem Jan 19, 2021
d3ff148
Add another Airplane Patch and clean up spaghetti code
duplexsystem Jan 19, 2021
6ad095e
Change Patch Authors
duplexsystem Jan 19, 2021
4e6790d
Correct Licencing
duplexsystem Jan 20, 2021
b45f473
Updated Upstream and Sidestream(s) (PaperPurpur)
MrIvanPlays Jan 20, 2021
3095764
Let's try this
MrIvanPlays Jan 20, 2021
5f1f781
We're 2021
MrIvanPlays Jan 20, 2021
828088d
Test this too
MrIvanPlays Jan 20, 2021
ad24717
Didn't work, remove that
MrIvanPlays Jan 20, 2021
895e1cf
Apply the same strategy in readme as in license.md
MrIvanPlays Jan 20, 2021
ad1f51a
Make sure its 1 tab
MrIvanPlays Jan 20, 2021
d2f130f
Make Some things safer
duplexsystem Jan 20, 2021
37929ec
slight clean up
duplexsystem Jan 20, 2021
248def3
fix brandings
Titaniumtown Jan 20, 2021
89a675f
Merge branch 'dev/reforged' of github.com:YatopiaMC/Yatopia into dev/…
Titaniumtown Jan 20, 2021
034e262
forgot how to code for a second
duplexsystem Jan 20, 2021
2401e4c
Merge branch 'dev/reforged' of github.com:YatopiaMC/Yatopia into dev/…
Titaniumtown Jan 20, 2021
adc47af
fix commit message /es
duplexsystem Jan 20, 2021
c50fb33
Updated Upstream and Sidestream(s) (Paper/AirplaneLite)
duplexsystem Jan 20, 2021
48e5fb1
Add new line
duplexsystem Jan 20, 2021
869319e
Merge remote-tracking branch 'origin/dev/reforged' into dev/reforged
duplexsystem Jan 20, 2021
c6fdf6a
Auto Fix Branches
duplexsystem Jan 21, 2021
504ce6f
Merge remote-tracking branch 'origin/ver/1.16.5' into dev/reforged
duplexsystem Jan 21, 2021
ebedc56
Simplify fixBranch logic
duplexsystem Jan 21, 2021
913b710
Forgot a null check
duplexsystem Jan 21, 2021
893a87f
update tuinity (dev/lighting was merged!)
Titaniumtown Jan 21, 2021
81c5544
Update upstreams
Titaniumtown Jan 21, 2021
df762e7
Merge branch 'ver/1.16.5' of https://github.com/YatopiaMC/Yatopia int…
MrIvanPlays Jan 21, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Forgot a null check
  • Loading branch information
duplexsystem committed Jan 21, 2021
commit 913b710ae4dc67e8b3c7a5afbfe7d3a27cbfa0ed
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/task/ApplyPatches.kt
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ internal fun Project.createApplyPatchesTask(

for (upstream in upstreams) {
if (((folder == "server" && upstream.serverList?.isEmpty() != false) || (folder == "api" && upstream.apiList?.isEmpty() != false)) && !upstream.useBlackList) continue
if (((folder == "server" && upstream.getRepoServerPatches()?.isEmpty() != false) || (folder == "api" && upstream.getRepoAPIPatches()?.isEmpty() != false)) && upstream.useBlackList) continue
project.gitCmd("branch", "-D", "${upstream.name}-$folder", dir = projectDir)
project.gitCmd("checkout", "-b", "${upstream.name}-$folder", dir = projectDir)
// Apply patches
Expand Down