Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport 1.0.2 (the latest 1.18 version) back to 1.16.5 #113

Open
wants to merge 67 commits into
base: 1.16
Choose a base branch
from
Open

Backport 1.0.2 (the latest 1.18 version) back to 1.16.5 #113

wants to merge 67 commits into from
+1,178 −572

Conversation

Gcat101
Copy link

@Gcat101 Gcat101 commented Oct 22, 2024

PLEASE ONLY MERGE AFTER KosmX/bendy-lib#38, as a compiled version of that pr is required to be on the maven repo for this to work.

Tested. Test mod works as expected, compared with unmodified verison of it on 1.18.2. This does mean that a version of bendy lib from that pr was now tested as well.

KosmX added 30 commits September 10, 2022 13:10
@KosmX
Merge branch '1.18' into port_18
3e94b4b
@KosmX
Merge pull request KosmX#19 from KosmX/port_18
0d5ca98 
Move forge resource loading to client package
@KosmX
Move forge resource loading to client package
59a8e5c
@KosmX
Merge pull request KosmX#22 from KosmX/dev
3dd7013 
extend registry api
@KosmX
Merge branch '1.18' into 118_port
ba7bdf1
@KosmX
Merge pull request KosmX#23 from KosmX/118_port
9a88341 
Backport fix
@KosmX
1.18 port
309f129
@KosmX
Merge branch '1.18' into port_1.18
616acca
@KosmX
remove 1.19 testing dependencies
a6b67b0
@KosmX
Merge pull request KosmX#28 from KosmX/port_1.18
f215a9a 
Backport fixes to 1.18
@KosmX
Merge pull request KosmX#32 from KosmX/dev
58f9cb6 
1.18 backport
@KosmX
Merge pull request KosmX#36 from KosmX/dev
7a9e001 
0.4 release
@KosmX
internal refactor
b2e33d0
@KosmX
Update issue templates
fe2f8c2
@KosmX
Update issue templates
d31ed63
@KosmX
change 1.19 to 1.19.2
3027bb9
@KosmX
Now with clamp guards(tm) - fix neck twist bug in multiplayer
2769dca
@KosmX
Now with clamp guards(tm) - fix neck twist bug in multiplayer
2ec13c1
@KosmX
Update gradle.properties
22f192b
@KosmX
Merge branch '1.18' into 18_back
3a3d7bb
@KosmX
Merge pull request KosmX#41 from KosmX/18_back
d3b5da9 
Fix neck-twisting bug with all lerp
@KosmX
Set license in fabric.mod.json and forge mods.toml
de152fc
@KosmX
Merge pull request KosmX#43 from KosmX/dev
bbdf075 
Set license in fabric.mod.json and forge mods.toml
@KosmX
Some proto first person animation stuff
719389d
@KosmX
only maven upload
7757ead
@KosmX
only maven upload attempt KosmX#2
1b4688c
@KosmX
only maven upload attempt KosmX#3
da96486
@KosmX
only maven upload attempt KosmX#4
160f1b3
@KosmX
only maven upload attempt KosmX#5
7d20f81
@KosmX
attempt to fix some small bugs
31f37d6
KosmX and others added 23 commits February 26, 2023 22:05
@KosmX
Update gradle.properties
bdf09a0
@KosmX
Merge pull request KosmX#55 from KosmX/dev
99a59a8 
port/1.18
@KosmX
Use safe cast to avoid crashes.
cf9f56c
@KosmX
Merge pull request KosmX#58 from KosmX/dev
5ad726c 
Port/1.18
@KosmX
fix stupid issue
2f766e7
@KosmX
Update gradle.properties
4eff6d3
@KosmX
Merge pull request KosmX#61 from KosmX/dev
1e551cb 
fix stupid issue
@KosmX
update buildscript
e1c4a58
@Amirhan-Taipovjan-Greatest-I
Tatar ModMenu Description Translation.
85cff9e
@KosmX
test and example of the use of coded animations
1cba387
@KosmX
Update gradle and loom
798edd6
@KosmX
Replace keyframe finding algorithm with binary search, this should ma…
e436fbe 
…ke things a little bit faster.
@KosmX
use lombok if possible
eaee4eb
@KosmX
Skip bendy-lib linear algebra if not necessary, this alone should spe…
fdee49c 
…ed-up some stuff
@KosmX
Merge pull request KosmX#69 from Amirhan-Taipovjan-Greatest-I/patch-1
c1f125b 
Tatar ModMenu Description Translation.
@KosmX
Merge pull request KosmX#72 from KosmX/dev
d9d4d96 
Small performance tweak backport
@KosmX @Gcat101
internal refactor
12e098d
@KosmX @Gcat101
Update issue templates
11dda4c
@KosmX @Gcat101
Update issue templates
d68ba26
@Gcat101
Start fixing conflicts
8b5adb3
@Gcat101
Merge 1.16 and 1.18
e319210
@Gcat101
Merge pull request #1 from Gcat101/1.18
f761ab5 
Merge 1.18 into 1.16 for backport
@Gcat101
Backport 2.1.1 to 1.16.5
16093a9
tizu69
tizu69 approved these changes Oct 22, 2024
View reviewed changes
Copy link

@tizu69 tizu69 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was forced to do this

@dima-dencep
Copy link
Contributor

I think you also want to port #98 and #96 (not merged yet)

@Gcat101
Copy link
Author

Gcat101 commented Oct 22, 2024

I think you also want to port #98 and #96 (not merged yet)

Didn't port anything that was beyond 1.18 as me and my modpack team currently don't need those features for our purposes; from what I can see those prs are all for the dev branch

@Gcat101
Copy link
Author

Gcat101 commented Oct 22, 2024

I was forced to do this

He was not, in fact, forced to do this

@Gcat101 Gcat101 changed the title Backport 2.1.1 (latest 1.18 version) back to 1.16.5 Backport the latest 1.18 version back to 1.16.5 Oct 29, 2024
@Gcat101 Gcat101 changed the title Backport the latest 1.18 version back to 1.16.5 Backport 1.0.2 (the latest 1.18 version) back to 1.16.5 Oct 29, 2024
@Gcat101
Copy link
Author

Gcat101 commented Oct 29, 2024

sorry for any misunderstandings, 1.0.2 is the version, I confused it with bendylib :trollface:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tizu69 tizu69 tizu69 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Gcat101 @dima-dencep @tizu69 @KosmX @Amirhan-Taipovjan-Greatest-I