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

merged 1.18.2 into 1.19.2 #359

Merged
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f1aec78
Update bug_report.yml
millennIumAMbiguity Apr 29, 2024
be38745
Korean Localization add
Merhaf May 1, 2024
59af6a4
Update ko_kr.json
Merhaf May 1, 2024
cebad4d
Merge pull request #352 from Merhaf/patch-2
millennIumAMbiguity May 2, 2024
2d634d1
New helm model
millennIumAMbiguity May 2, 2024
ff5f754
fixed log/stem typo
millennIumAMbiguity May 2, 2024
e97c623
Added retro helm resource pack
millennIumAMbiguity May 4, 2024
763dc41
Merge pull request #353 from millennIumAMbiguity/1.18.x/main
millennIumAMbiguity May 4, 2024
8cb7f53
fixed #349
millennIumAMbiguity May 4, 2024
8248ab2
Merge pull request #355 from millennIumAMbiguity/1.18.x/fix-349
millennIumAMbiguity May 4, 2024
8854aba
Engine boost
millennIumAMbiguity May 4, 2024
a64783d
Merge pull request #356 from millennIumAMbiguity/1.18.x/engine-boost
millennIumAMbiguity May 4, 2024
500194d
changed mass scaling (0.5x) and added config.
millennIumAMbiguity May 4, 2024
ed439cb
Merge pull request #357 from millennIumAMbiguity/1.18.x/main
millennIumAMbiguity May 5, 2024
6df930b
Update anchor blast resistance from 1200 to 6
millennIumAMbiguity May 5, 2024
24dda55
Update helm hitbox
millennIumAMbiguity May 5, 2024
7cd8089
Update en_pt.json
millennIumAMbiguity May 5, 2024
58cec59
Updated dependencies
millennIumAMbiguity May 6, 2024
1f68360
Merge pull request #358 from millennIumAMbiguity/Updated-dependencies
millennIumAMbiguity May 6, 2024
9422fdc
Create 1.5.1-beta.1.md
millennIumAMbiguity May 6, 2024
f3ae8a1
Update 1.5.1-beta.1.md
millennIumAMbiguity May 6, 2024
b9dc081
Increment version
millennIumAMbiguity May 6, 2024
3eaba73
Merge branch '1.18.x/main' into 1.19.2/main
millennIumAMbiguity May 6, 2024
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
Update helm hitbox
  • Loading branch information
millennIumAMbiguity authored May 5, 2024
commit 24dda552750f951297920070eec372e3a2b9c6f7
Original file line number Diff line number Diff line change
@@ -35,8 +35,8 @@ import org.valkyrienskies.mod.common.getShipManagingPos
import org.valkyrienskies.mod.common.getShipObjectManagingPos

class ShipHelmBlock(properties: Properties, val woodType: WoodType) : BaseEntityBlock(properties) {
val HELM_BASE = RotShapes.box(1.0, 0.0, 1.0, 15.0, 1.0, 15.0)
val HELM_POLE = RotShapes.box(4.0, 1.0, 7.0, 12.0, 12.0, 13.0)
val HELM_BASE = RotShapes.box(2.0, 0.0, 2.0, 14.0, 2.0, 14.0)
val HELM_POLE = RotShapes.box(4.0, 2.0, 5.0, 12.0, 13.0, 13.0)

val HELM_SHAPE = DirectionalShape(RotShapes.or(HELM_BASE, HELM_POLE))

Loading
Oops, something went wrong.