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

merge 1.19.2 into 1.19.3 #1009

Closed
Changes from 1 commit
Commits
Show all changes
482 commits
Select commit Hold shift + click to select a range
5bba21c
biome foilage (#572)
alex-s168 Sep 18, 2023
58550de
replaced override in block tinting mixin (#578)
alex-s168 Sep 18, 2023
b86112b
update gradle, update core, update quiltflower to vineflower
Rubydesic Sep 21, 2023
0bf1ea9
update core
Rubydesic Sep 21, 2023
f0c1f76
New terrain loading
Sep 24, 2023
869ce06
Update 1_18_blocks.json
Weromano Sep 25, 2023
d9456ca
Update crafting_stations.json
Weromano Sep 25, 2023
1b5c822
Update plants.json
Weromano Sep 25, 2023
a1928f5
Update redstone_components.json
Weromano Sep 25, 2023
49d6c28
Update misc.json
Weromano Sep 26, 2023
69f4c97
Update ground.json
Weromano Sep 26, 2023
2c854cd
Update masonry.json
Weromano Sep 26, 2023
31df0cb
Update wood.json
Weromano Sep 26, 2023
66d53f3
Updated vs-core
Sep 27, 2023
e733856
Fixed ships getting stuck on top of the world
Sep 28, 2023
58665aa
Updated forge Krunch
Sep 28, 2023
be901b8
Fixed forge not depending on vs-core util
Sep 28, 2023
939e4ee
Merge pull request #581 from ValkyrienSkies/feature/new-terrain
StewStrong Sep 28, 2023
31d4767
Merge pull request #589 from Weromano/patch-30
StewStrong Sep 28, 2023
de4c377
Merge pull request #588 from Weromano/patch-29
StewStrong Sep 28, 2023
1355a4e
Merge pull request #587 from Weromano/patch-28
StewStrong Sep 28, 2023
628cab7
Merge pull request #585 from Weromano/patch-26
StewStrong Sep 28, 2023
07004a0
Merge pull request #583 from Weromano/patch-24
StewStrong Sep 28, 2023
9cb78ac
Merge pull request #582 from Weromano/patch-23
StewStrong Sep 28, 2023
5b5d41f
Merge pull request #586 from Weromano/patch-27
StewStrong Sep 28, 2023
d8e64df
Update plants.json
Weromano Sep 28, 2023
de4fa39
Update misc.json
Weromano Sep 28, 2023
a9247ba
Update wood.json
Weromano Sep 28, 2023
5472229
Create 1_19_blocks
Weromano Sep 28, 2023
4bc9c69
Create 1_20_blocks
Weromano Sep 28, 2023
3fd6860
Added isStatic property to ServerShip
Sep 30, 2023
32bc9e0
Fixed malformed json
Oct 1, 2023
7b13223
Fixed vs-core dependencies
Oct 1, 2023
1551831
Fixed vs-core dependencies (again)
Oct 1, 2023
57f9cc2
Fixed ship creator item not handling scale correctly
Oct 1, 2023
c46ae36
Added json/yaml validator to GitHub Actions
Oct 1, 2023
0b7cf8a
Updated Krunch
Oct 4, 2023
3c9dc35
Updated vs-core
Oct 8, 2023
e3b580f
Merge pull request #584 from Weromano/patch-25
StewStrong Oct 10, 2023
3d05ecb
Merge pull request #591 from Weromano/patch-32
StewStrong Oct 10, 2023
61411a6
Merge pull request #592 from Weromano/patch-33
StewStrong Oct 10, 2023
c67a24f
Fixed invalid json 😭
Oct 10, 2023
0c7fe94
Fixed another invalid json 🤡
Oct 10, 2023
95d18bd
Fixed ShipArgument @v always being suggested in teleport command
Oct 10, 2023
c8e9817
Fixed EntitySelectorParser suggesting over @v ShipArgument
Oct 10, 2023
a726ba3
Made ShipArgument behave like EntityArgument
Oct 10, 2023
7bcdf18
Fixed EntitySelectorParser.getSelector() not throwing an exception
Oct 10, 2023
2dd59c6
Made VSCommands require permission 2
Oct 10, 2023
60312f9
Incremented version to 2.1.1-beta.1
Oct 10, 2023
9465f52
Added ServerTickListener interface
Oct 11, 2023
8b4f026
Use kotlinforforge 3.12.0 at runtime
Oct 11, 2023
9445389
Get kotlinforforge from curse maven instead
Oct 11, 2023
328c4f4
More kotlinforforge madness! 🙄🙄🙄
Oct 11, 2023
2505880
🔥🐛 Remove outdated CBC mixin MixinAbstractCannonProjectile.java
rbasamoyai Oct 12, 2023
0d985b3
Increment version
Oct 12, 2023
bfbdffe
Merge pull request #598 from rbasamoyai/1.18.x/main
StewStrong Oct 12, 2023
e225187
Increment version
Oct 12, 2023
abe814e
Added some change logs
Oct 12, 2023
babd287
Don't create render chunks for air sections
Oct 15, 2023
4861dfb
Fix mounted players teleported to void when ship is destroyed #601
Oct 15, 2023
1419646
Removed unused import
Oct 15, 2023
247fdee
Updated vs-core
Oct 15, 2023
2139deb
Fixed PhysShip.transform scaling
Oct 16, 2023
33e03c5
Updated create to 0.5.1
Oct 16, 2023
f95be0e
Fixed mixins
Oct 16, 2023
ba64881
Fixed wings not working on contraptions
Oct 16, 2023
71c5986
Merge pull request #603 from ValkyrienSkies/1.18.x/feature/create-0.5.1
StewStrong Oct 16, 2023
dad25fc
Initial work moving create compat mixins
Oct 16, 2023
cb158e8
Added fabric create mixins
Oct 16, 2023
63468f6
Fixed forge not launching
Oct 16, 2023
e00ea73
Added forge create mixins
Oct 16, 2023
4986c94
Fixed static ships acting sus
Oct 17, 2023
854f492
Fixed static ships acting sus (again 😳)
Oct 17, 2023
4c612b2
Extra info for a log, and limited the zip bombing
ewoudje Oct 17, 2023
f8638b1
Replaced MixinCarriageContraptionEntity @Redirect with @WrapOperation
Oct 19, 2023
c82b836
Updated vs-core
Oct 19, 2023
1b862df
Fixed crash when moving train from ship to world
Oct 19, 2023
8578aac
Fixed ship contraption raytracing when multiple ships near player
Oct 19, 2023
a3c2f4e
Updated vs-core
Oct 20, 2023
df32e76
Fixed game freezing because of too-large entity AABBs
Oct 21, 2023
6aba87a
Added setting to disable teleporting ships when touching portals
Oct 22, 2023
0ba628d
Fixed bug when teleporting ships across dimensions
Oct 22, 2023
799c85d
Empty commit to retry actions
Oct 22, 2023
ce9d361
Fixed players getting stuck colliding with ships in other dimensions
Oct 22, 2023
d11ad1a
Make Level.transformAabbToWorld only transform if the ship dimension …
Oct 22, 2023
1413de5
Made getShipObjectManagingPos() only return the ship if it's in the s…
Oct 22, 2023
8dedf68
Fixed create compat on forge
Oct 23, 2023
2a68860
Updated vs-core
Oct 25, 2023
52b910b
Revert "Don't create render chunks for air sections"
Oct 26, 2023
3df498e
Use contraption anchor pos for wings
Oct 28, 2023
4e46321
Added 100 tick delay when unloading chunks
Oct 28, 2023
301addc
Unified common mixin code
Nov 2, 2023
b3b3682
Improved drill contraptions on ships
Nov 2, 2023
9528e93
Fixed flywheel block entities still rendering after ship is deleted
StewStrong Nov 6, 2023
959c039
Print reason when Krunch fails to load
StewStrong Nov 6, 2023
b101025
Fix entities in ships not rendering when Sodium is installed
StewStrong Nov 6, 2023
e90b710
Only load Sodium mixins on client side
StewStrong Nov 7, 2023
1993e17
Added compat with ReachEntityAttributes to fix chests on ships closin…
StewStrong Nov 9, 2023
c8f16eb
Make VSPhysicsEntity.physicsEntityData and VSPhysicsEntity.physicsEnt…
StewStrong Nov 12, 2023
7155e68
Fixed compile error
StewStrong Nov 12, 2023
edc9712
Fixed chests rendering double with sodium
StewStrong Nov 12, 2023
b794c55
s
mrsterner Nov 16, 2023
14cedf2
1.19.2 port
mrsterner Nov 16, 2023
79b7df2
1.19.2 port
mrsterner Nov 16, 2023
dc3851c
1.19.2 port forge also works now
mrsterner Nov 16, 2023
5f84102
1.19.2 eh somehow this doesnt work anymore
mrsterner Nov 16, 2023
5c994e5
1.19.2 there we go, both fab and forg seems to work
mrsterner Nov 16, 2023
4c71fdb
links to deps
mrsterner Nov 16, 2023
47d4fcc
clokwork thingy
mrsterner Nov 16, 2023
b3b37ee
Change Deprecated Libraries
some-du6e Nov 16, 2023
b535060
Merge pull request #626 from some-du6e/patch-1
StewStrong Nov 17, 2023
b6d2101
Merge remote-tracking branch 'origin/1.19.2/main' into 1.19.2/update
mrsterner Nov 17, 2023
21ee564
merge conflict misses
mrsterner Nov 17, 2023
8171a8a
your shit together fabric
mrsterner Nov 17, 2023
6f85423
get out of here joml
mrsterner Nov 17, 2023
f998b17
jk get back in here joml
mrsterner Nov 17, 2023
b742eeb
Added dependency for Modular Routers
TechTastic Nov 18, 2023
b370b41
Merge pull request #624 from mrsterner/1.19.2/update
StewStrong Nov 19, 2023
efbac0c
Fixed entities not sitting in seats on ships
StewStrong Nov 19, 2023
9b3a101
Merge branch 'ValkyrienSkies:1.18.x/main' into 1.18.x/compat/modular_…
TechTastic Nov 19, 2023
62d1c0e
Fixed dismounting destroyed seats teleporting entities into the sky
StewStrong Nov 20, 2023
57ff5e9
Fixed forge server not launching
StewStrong Nov 20, 2023
183167f
Replaced an @Overwrite with @WrapOperation
StewStrong Nov 20, 2023
90e23ed
Don't drag entities that are mounted to an entity
StewStrong Nov 21, 2023
75ac6a0
Merge pull request #629 from TechTastic/1.18.x/compat/modular_routers
StewStrong Nov 21, 2023
aa02ad9
Fixed Sodium rendering deleted ships
StewStrong Nov 21, 2023
a9b1a7c
Added necessary remap
StewStrong Nov 21, 2023
30f689d
Updated vs-core
StewStrong Nov 21, 2023
b25fa98
Updated the thing
StewStrong Nov 25, 2023
e1d14c6
Fixed stabilized contraptions acting weird on ships
StewStrong Nov 26, 2023
e59ff2a
Fixed order of rotations in VS teleport command
StewStrong Nov 27, 2023
4e5fa7c
Merge pull request #593 from Weromano/patch-34
StewStrong Nov 27, 2023
5fcbc72
Merge pull request #594 from Weromano/patch-35
StewStrong Nov 27, 2023
6248cbd
TFC mixin compat
ewoudje Nov 29, 2023
c2e8c77
fixed create valuebox rendering on ships (#637)
mrsterner Nov 30, 2023
19a64ea
Updated vs-core
StewStrong Dec 2, 2023
d20ba10
Updated vs-core (again :sob:)
StewStrong Dec 2, 2023
17f0d50
Fixed compat with create 0.5.1.f
StewStrong Dec 3, 2023
5d5cec5
Fixed compat with create 0.5.1.f (again)
StewStrong Dec 3, 2023
0dc9c2d
initial commit
ThePlasticPotato Dec 3, 2023
ceac173
pain?
ThePlasticPotato Dec 4, 2023
f25af18
Literally the only mixin needed
ThePlasticPotato Dec 5, 2023
8475374
Update masonry.json (#646)
Weromano Dec 9, 2023
27bc019
Made ships drag jumping entities for 1 second instead of 0.5 seconds
StewStrong Dec 16, 2023
88d5832
Fixing the processUnloads() crash
StewStrong Dec 18, 2023
3cd4605
Fixing the processUnloads() crash (pt 2)
StewStrong Dec 18, 2023
e1ec152
Updated vs-core
StewStrong Dec 18, 2023
4bc1b4a
Added kinematic property to ships
StewStrong Dec 18, 2023
23f71c6
Fixed stickers being broken
StewStrong Dec 21, 2023
3396e16
Fix replaceProcessUnloads I think?
StewStrong Dec 22, 2023
89fa980
Increment version
StewStrong Dec 22, 2023
4a0b4b3
Moved vs maven to the bottom to fix gradle not working
StewStrong Dec 23, 2023
a3667d0
Merged changes from 1.18.x/main
StewStrong Dec 23, 2023
39b8d01
Changed version to 2.1.2-beta.1
StewStrong Dec 23, 2023
ca66856
Feature/refactor ship mounting (#660)
StewStrong Dec 24, 2023
cbbadd3
Added partialTicks to ShipMountedToDataProvider.provideShipMountedToD…
StewStrong Dec 24, 2023
fbad5cb
Make it possible to disable Contraption positionRider changes
StewStrong Dec 24, 2023
d9d9a3e
Removed positionRider code from MixinAbstractContraptionEntity
StewStrong Dec 24, 2023
b9cf9be
Use ShipMountedToData when rendering entities
StewStrong Dec 24, 2023
ee9a5f3
Added code I forgot
StewStrong Dec 24, 2023
c877334
Increment version
StewStrong Dec 24, 2023
cc6e5f8
Merged changes from 1.18.x
StewStrong Dec 25, 2023
b10a02f
fixed create valuebox rendering, on 1.18 (#662)
mrsterner Dec 26, 2023
2e0c543
Fixed enabling collision between ships not working
StewStrong Dec 27, 2023
72fac32
Catch setWingGroupTransform() throwing an exception
StewStrong Dec 28, 2023
a04911c
Merged changes from 1.18.x
StewStrong Dec 28, 2023
b1ee932
Increment version
StewStrong Dec 29, 2023
fc8f75b
DONE.
ThePlasticPotato Dec 29, 2023
a2caf4d
loot container dupe fix on ship assembly (#667)
mrsterner Dec 30, 2023
cb72d0f
loot container dupe fix (#668)
mrsterner Dec 30, 2023
eace2ef
Increment version
StewStrong Dec 30, 2023
e2c87d4
Mekanism radiation compat (#671)
illucc Dec 31, 2023
3c80849
Fixed ValkyrienSkiesMod.PHYSICS_ENTITY_CREATOR_ITEM not being initial…
StewStrong Dec 31, 2023
8808931
Added block masses for steel armor blocks mod
StewStrong Jan 2, 2024
5eef901
Add credits to FluffyJenkins for Create compat
Rubydesic Jan 5, 2024
8f8eceb
Add credits to FluffyJenkins for Create compat
Rubydesic Jan 5, 2024
8a4ee71
Update VS-Core
ThePlasticPotato Jan 19, 2024
7dbf187
Merge branch '1.18.x/main' into 1.18.x/dynamic-connectivity
ThePlasticPotato Jan 19, 2024
2a9c46f
Merge pull request #643 from ValkyrienSkies/1.18.x/dynamic-connectivity
ThePlasticPotato Jan 19, 2024
535ef4f
fixed chutes on ships
ThePlasticPotato Jan 20, 2024
473a1e8
Merge branch '1.18.x/main' of https://github.com/ValkyrienSkies/Valky…
ThePlasticPotato Jan 20, 2024
79af633
update vscore also kjill mef
ThePlasticPotato Jan 21, 2024
138e7bb
Update VSCore
ThePlasticPotato Jan 21, 2024
1409e2d
No collision, does expand AABB otherwise we can't find blocks wich ar…
ewoudje Jan 23, 2024
5944d56
Move ValueBox mixin to client (#681)
Rubydesic Jan 29, 2024
0b8f5b6
Move ValueBox mixin to client (#682)
Rubydesic Jan 29, 2024
80d2d93
Create Compat(1.18.x): Fixed track outlines and picking (#692)
FluffyJenkins Jan 29, 2024
7b60936
Create Compat(1.19.2): Fixed track outlines and picking (#693)
FluffyJenkins Jan 29, 2024
d3a84b5
Wierd, the errors were not showing in PR?
ewoudje Jan 29, 2024
4504235
Wierd, the errors were not showing in PR?
ewoudje Jan 29, 2024
42ce6f5
Priorities in datapacks
ewoudje Jan 29, 2024
5e053f1
If an error happens on place, untransform
ewoudje Jan 30, 2024
8efd751
Fixed placing error, cleaned a bit of code
ewoudje Feb 5, 2024
6754162
Create Compat(1.18.x): Removed old file causing crashes/renamed funct…
FluffyJenkins Feb 18, 2024
97bf648
Create Compat(1.19.2): Removed old file causing crashes/renamed funct…
FluffyJenkins Feb 18, 2024
1705b55
Bluemap Compat (#703)
ewoudje Feb 24, 2024
a585dff
Added id to @v
ewoudje Mar 11, 2024
1d478eb
The Great Weightloss of 2024
ThePlasticPotato Mar 25, 2024
e0fc053
Reverted default weight to 100kg
ThePlasticPotato Mar 25, 2024
6d2685e
Merge pull request #775 from ValkyrienSkies/1.18.x/weight-reduction
ThePlasticPotato Mar 25, 2024
c1cfc53
Update README.md
Rubydesic Mar 26, 2024
88d9088
updated create to patch f (#776)
mrsterner Mar 27, 2024
daecb53
Create build.yml
mrsterner Mar 28, 2024
48a563f
fixed chute mixin
mrsterner Apr 15, 2024
413ab26
Merge remote-tracking branch 'origin/1.18.x/main' into 1.18.x/main
mrsterner Apr 15, 2024
62ca22c
fixed chute mixin
mrsterner Apr 15, 2024
2d1e1cd
Merge pull request #814 from mrsterner/1.18.x/main
ThePlasticPotato Apr 16, 2024
b2211ee
Create ko_kr.json (#827)
Merhaf May 2, 2024
3b5aedd
update vscore, remove old splitting code, add new assembly
ThePlasticPotato Jun 23, 2024
82ad879
uhh more stuff i forgot to commit
ThePlasticPotato Jun 27, 2024
41ac195
Fix Create, CBC contraption seats (#847)
Endalion Jun 29, 2024
ddedf39
update vscore
ThePlasticPotato Jun 30, 2024
ea52ced
ACTUALLY update vscore
ThePlasticPotato Jun 30, 2024
242a339
these tiny reference changes will be the death of me
ThePlasticPotato Jun 30, 2024
ae1bd53
pain
ThePlasticPotato Jun 30, 2024
f673211
fix: All of the references to renamed or relocated vscore classes
ThePlasticPotato Jun 30, 2024
2ef6f72
backporting api stuff more
ThePlasticPotato Jun 30, 2024
a22ebde
API Backport Changes [by Ruby]
ThePlasticPotato Jul 2, 2024
1c62ccc
Fix Computer Craft speaker (#889)
xiewuzhiying Jul 21, 2024
e8120ae
Minor fix, Urgent: Fix soft-overwrite preventing other mods' mobs fro…
ByThePowerOfScience Jul 21, 2024
2d456ca
Revert "Minor fix, Urgent: Fix soft-overwrite preventing other mods' …
StewStrong Jul 21, 2024
dcba513
Fixed PR #907
StewStrong Jul 21, 2024
1681692
Fixed forge server
StewStrong Jul 21, 2024
6809a80
Weather 2 wind & storm affecting ships (#897)
alex-s168 Jul 26, 2024
9ec9b1c
Stop Flywheel BatchingEngine crash (#893)
ByThePowerOfScience Jul 28, 2024
eac19c8
Fix Create Schematic placement, rendering on ships (#690)
Endalion Aug 8, 2024
968578a
An attempt at fixing thread bugs (#954)
StewStrong Sep 3, 2024
91ec207
Only render ship chunk sections in the frustum, skip empty chunk sect…
StewStrong Sep 8, 2024
9255e4e
Update core
StewStrong Sep 8, 2024
eac5640
Update core
StewStrong Sep 8, 2024
be13687
call tryCheckInsideBlocks in redirectSetVelocity (#955)
MoePus Sep 23, 2024
686bd75
Make gravity dimension specific
StewStrong Sep 24, 2024
52443a1
Merge from 1.18.x/main
StewStrong Sep 24, 2024
6be3966
Well the fabric work
StewStrong Sep 26, 2024
c372f07
Got forge working
StewStrong Sep 26, 2024
f27f754
Merge remote-tracking branch 'origin/1.18.x/main' into 1.19.2/main
StewStrong Sep 27, 2024
d437831
Initial
ThePlasticPotato Oct 19, 2024
cf815ca
Fixed DenseBlockPosSet.iterator()
StewStrong Oct 25, 2024
68764a2
Spliterating
ThePlasticPotato Oct 25, 2024
7c6b8b6
Added area assembler, fixed splitting
ThePlasticPotato Oct 25, 2024
8450cfc
Update VSCore
ThePlasticPotato Oct 26, 2024
e1b70b4
Merge branch '1.18.x/main' into 1.18.x/Splitting-3
ThePlasticPotato Oct 26, 2024
78a9535
Missed a tiny bit
ThePlasticPotato Oct 26, 2024
2261ded
Merge remote-tracking branch 'origin/1.18.x/Splitting-3' into 1.18.x/…
ThePlasticPotato Oct 26, 2024
1edb9df
Another quick miss
ThePlasticPotato Oct 26, 2024
ed0ef81
Merge pull request #993 from ValkyrienSkies/1.18.x/Splitting-3
ThePlasticPotato Oct 26, 2024
a0517ba
Fixed ShipAssembler.assembleToShip()
StewStrong Oct 28, 2024
cf1ea86
Fix create forge not working
StewStrong Oct 28, 2024
7e18ed0
Merge from 1.18.x/main
StewStrong Oct 28, 2024
5032dbf
Fixed changed tag (#995)
millennIumAMbiguity Oct 29, 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
Original file line number Diff line number Diff line change
@@ -449,6 +449,11 @@
"mass": 50.0,
"friction": 0.7
},
{
"block": "minecraft:dragon_egg",
"mass": 1400.0,
"friction": 0.8
},
{
"block": "minecraft:end_portal_frame",
"mass": 3000.0,