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

1.4.0 1.21 cherrypick #1768

Merged
merged 122 commits into from
Aug 18, 2024
Merged

1.4.0 1.21 cherrypick #1768

merged 122 commits into from
Aug 18, 2024

Conversation

screret
Copy link
Member

@screret screret commented Aug 18, 2024

do changelog in separate PR

qwer523 and others added 30 commits August 18, 2024 11:05
@qwer523 @screret
Some Textures (#1535)
906f3bd
@3x1t-5tyl3 @screret
Removes the min and maxYLevel (#1542)
afeb734
@qwer523 @screret
Fix the issue where the armor value modifier is not working (#1539)
a89cc41
@screret @YoungOnionMC
fix rubber tree config crashing with some specific values (#1538)
de5e041 
Co-authored-by: YoungOnion <[email protected]>
@YoungOnionMC @screret
Battery Charge Tooltip Fix (#1551)
8af7cdb
@YoungOnionMC @screret
Better Fluid Tooltips (#1550)
4468fb8
@DEv0on @screret
Fix invalid unit on current charge on batteries (#1562)
b41bcf8
@qwer523 @screret
Add Buffers (#1567)
289a428
@qwer523 @YoungOnionMC @screret
Fix description text for rotor holder (#1565)
1d8f280 
Co-authored-by: YoungOnion <[email protected]>
@qwer523 @YoungOnionMC @screret
make light ring always render (#1554)
1d148ac 
Co-authored-by: YoungOnion <[email protected]>
@qwer523 @YoungOnionMC @screret
Fixes #1465 (#1544)
2b03534 
Co-authored-by: YoungOnion <[email protected]>
@qwer523 @YoungOnionMC @screret
Fixes #1384 (#1545)
4789e73 
Co-authored-by: YoungOnion <[email protected]>
@qwer523 @screret
Model clean (#1575)
4209d9d
@3x1t-5tyl3 @YoungOnionMC @screret
Update 000-bug-report.yml (#1573)
0ce5dc5 
Co-authored-by: YoungOnion <[email protected]>
@qwer523 @screret
Add Reservoir Hatch & Adjust model (#1576)
ed13299
@lonevox @YoungOnionMC @screret
Expose tool overlay layers (#1541)
e5ee47c 
Co-authored-by: YoungOnion <[email protected]>
@stivosha @screret @YoungOnionMC
Fix bug with battery save in miner and replace slot to top (#1577)
f1c30aa 
Co-authored-by: screret <[email protected]>
Co-authored-by: YoungOnion <[email protected]>
@qwer523 @YoungOnionMC @screret
add overlay renderer for lamp & try to fix tool bar renderer (#1571)
eb6ae61 
Co-authored-by: YoungOnion <[email protected]>
@YoungOnionMC @screret
Charcoal Pile Igniter (#1493)
918e568
@qwer523 @screret
Fix missing mixin config (#1583)
6c65a61
@YoungOnionMC @screret
Lighters can no longer break blocks :minniola: (#1578)
f49b4bb
@DEv0on @screret
Fix for death symptom implementation problem (#1560)
622c1ce 
Co-authored-by: screret <[email protected]>
@stivosha @screret
Fix: corrected a mistake in the word "mv_input_hatch" in Russian (#1585)
a40599c 
Co-authored-by: screret <[email protected]>
@marisathewitch @weblate @screret
Update ru_ru lang (#1590)
bc06103 
Co-authored-by: Anonymous <[email protected]>
Co-authored-by: Western01 <[email protected]>
Co-authored-by: screret <[email protected]>
@qwer523 @screret
Adding FE support for the charge slot & Removing the energy compatibi…
33fba15 
…lity layer (#1593)

Co-authored-by: screret <[email protected]>
@iouter @screret
Update zh_cn.json (#1594)
b0f8cc4 
Co-authored-by: screret <[email protected]>
@qwer523 @screret
Decoration Blocks (#1596)
2407ba8 
Co-authored-by: screret <[email protected]>
@qwer523 @screret
Fix preview structure for fusion reactor (#1598)
3499bc9 
Co-authored-by: screret <[email protected]>
@qwer523 @screret
FE Support (#1601)
3f54377 
Co-authored-by: screret <[email protected]>
@code-onigiri @code-omusubi @screret
Update ja_jp.json (#1602)
7146c21 
Co-authored-by: Shibata Masanari <[email protected]>
Co-authored-by: screret <[email protected]>
screret and others added 17 commits August 18, 2024 14:28
@screret
fix bedrock veins that have been removed crashing the game (#1750)
bcea6c5
@screret
fix build actions part 2 (#1752)
cb1fe52
@screret
fuuuck I can't test this locally AT ALL AAAAAAAAAAAA (#1756)
7794353
@qwer523 @screret
Dual Hatch Rework (#1759)
9c1d2fa
@qwer523 @screret
Fix MEPatternBufferProxyPartMachine (#1758)
a92aa29
@screret
fix Iodine processing (#1744)
86e4a28
@screret @Ghostipedia @YoungOnionMC
fix crates voiding contents on world load (#1753)
f542c62 
Co-authored-by: Ghostipedia <[email protected]>
Co-authored-by: YoungOnion <[email protected]>
@Ghostipedia @screret
Update README.md to include ULSTICK & Ghostipedia Texture Credits (#1672
dfc2b87 
)
@YoungOnionMC @screret
Dual hatch nerfing and hlsa naming (#1738)
6ba5624
@Ghostipedia @screret
Fixing CircuitInventory for buffers again. Please no one else change … (
10780c4 
#1761)
@YoungOnionMC @screret
NBT recipe removals for tanks and filters (#1760)
6293233
@YoungOnionMC @screret
merging branchs is a mistake (#1762)
3fa1c32
@Ghostipedia @screret
1.4 Changelog (#1763)
b7f55fe
@Ghostipedia @screret
Fixing Buffer Issues, AGAIN. (#1764)
6969bd4
@DancingSnow0517 @screret
MEPatternBufferPartMachine fixes (#1765)
253ec12
@qwer523 @screret
Fixes Dual Hatch voiding contents on world load (#1766)
87038cd
@screret
fix issues
c0d9434
@screret screret requested review from a team as code owners August 18, 2024 14:40
@screret screret added ignore changelog PR should not be added to the changelog. 1.21 labels Aug 18, 2024
@screret screret removed the request for review from a team August 18, 2024 19:53
@Ghostipedia Ghostipedia merged commit e12495c into 1.21 Aug 18, 2024
2 checks passed
@Ghostipedia Ghostipedia deleted the sc/1.4.0-1.21 branch August 18, 2024 19:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ghostipedia Ghostipedia Ghostipedia approved these changes

Assignees
No one assigned
Labels
1.21 ignore changelog PR should not be added to the changelog.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.