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.

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

Feature/1.20.x/ropes #1952

Merged
merged 14 commits into from
Dec 19, 2023
Merged

Feature/1.20.x/ropes #1952

merged 14 commits into from
Dec 19, 2023

Conversation

jodlodi
Copy link

@jodlodi jodlodi commented Dec 19, 2023

Fully implemented the Rope block

jodlodi and others added 14 commits December 3, 2023 17:53
… into feature/1.20.x/ropes

� Conflicts:
�	src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
�	src/generated/resources/.cache/409f85cf7196fa8ba3cc1f155fe7b234c26d36b1
�	src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
�	src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e
�	src/generated/resources/.cache/94f15e09d9a54d422942084512238ed72a5efe0c
�	src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
�	src/generated/resources/.cache/aceeec62bf10186f98b7c0ef34c2a200449b25e2
�	src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
�	src/main/java/twilightforest/data/BlockLootTables.java
�	src/main/java/twilightforest/data/CraftingGenerator.java
�	src/main/java/twilightforest/data/ItemModelGenerator.java
�	src/main/java/twilightforest/data/tags/BlockTagGenerator.java
�	src/main/java/twilightforest/init/TFCreativeTabs.java
�	src/main/java/twilightforest/init/TFItems.java
�	src/main/java/twilightforest/world/registration/TreeConfigurations.java
@jodlodi jodlodi merged commit 4c21368 into 1.20.x Dec 19, 2023
2 checks passed
@jodlodi jodlodi deleted the feature/1.20.x/ropes branch December 19, 2023 12:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants