Commit graph

107 commits

Author SHA1 Message Date
Fireblade d4b98cf70b
Merge branch 'main' into TU43 2026-05-24 23:47:12 -04:00
Fireblade 8676650294 Merge branch 'pr-3' into TU43 2026-05-24 22:29:54 -04:00
Fireblade 05c14bc0fe feat: slime block 2026-05-22 21:15:13 -04:00
PUFF_MON 2cc554c11b
fix: Incorrect Rabbit Stew strings (#102)
Some checks are pending
Sync branches with main / sync (push) Waiting to run
2026-05-21 20:39:14 +03:00
Fireblade 9dd13ac289 fix: dlc heart paths 2026-05-18 14:58:33 -04:00
Fireblade 9d2bbaac15
Merge pull request #2 from Firebladedoge229/patch
remove dlc arc and pck files
2026-05-18 14:54:40 -04:00
Fireblade 5bb8dd2b42 control type stuff 2026-05-18 14:52:03 -04:00
Fireblade 3c0237d448 Merge remote-tracking branch 'upstream/main' into TU43 2026-05-12 23:09:05 -04:00
Fireblade c93b02bf78 chore: update dlc texturepacks 2026-05-12 23:00:16 -04:00
Fireblade 15e4da3308 feat: DLC world folder support 2026-05-12 22:11:26 -04:00
pieeebot 55ce17bc76 chore(TU31): change XXX Wood to XXX Planks for accuracy. 2026-05-12 17:58:36 +03:00
pieeebot 9932f765cd chore(TU31): update stringsGeneric.xml to use XXX Planks instead of XXX Wood Planks 2026-05-12 17:38:57 +03:00
Fireblade 00a3be0630 chore: expand arc + pck files 2026-05-11 21:33:01 -04:00
Fireblade 34884f00fb feat: TU34 settings menu 2026-05-08 22:02:20 -04:00
Fireblade d82e1afd59 feat: minecart sound effects 2026-05-08 03:41:44 -04:00
Fireblade a8f31211bf feat: cave sounds + improved settings ui 2026-05-08 02:11:44 -04:00
Fireblade f8e4f6376e fix: neoapps dysfunctional build script 2026-05-05 23:20:16 -04:00
Fireblade 8ccb2b6741
Merge branch 'pieeebot:main' into feat/blockstates 2026-05-05 15:34:54 -04:00
Lord Cambion 16f0495ac2
fix: guardian effect + guardian damage + sounds (#51) 2026-05-03 17:59:57 +03:00
Fireblade a7cad496e3 fix: tutorial
items actually appear now yay
item frames though...
2026-05-03 01:43:43 -04:00
Fireblade 02f1be3bb7 man this tutorial level is really screwed up
todo??:

- fix the id system [days since the universe was created is NOT a valid id]
- fix literally everything else although thats probably caused by the discrepancy above
2026-05-02 20:07:41 -04:00
SevenToaster509 05d7ccb6d4
feat(TU31): classic crafting (#48)
credits: comicgab
2026-05-01 19:44:30 +03:00
piebot a51d7ae834
feat(TU31): barrier block.
feat: barrier block
2026-05-01 19:21:56 +03:00
Fireblade 950de854a1 feat: barrier block
todo: deprecate *.col file usage
2026-04-29 16:35:14 -04:00
SevenToaster509 79d15ba542 feat (TU34): Biome Settlers Skin Pack 1 2026-04-29 18:08:34 +01:00
George V. 2a86a93971
feat(TU31): add Depth Strider enchantment 2026-04-28 09:37:17 +03:00
piebot de1b069835 mfeat(TU30): achievements 2026-04-27 05:33:47 +03:00
SevenToaster509 34504b7b93 feat: achievements
fully functional but some achievements dont work yet

EXPERIMENTAL!!!!
2026-04-26 15:27:19 +01:00
Fireblade a54552950a fix: tu31 potions in creative menu + level 2 abilities 2026-04-26 00:22:49 -04:00
Tranqlmao 4b6e9f8eb2 Elytra
mfeat: added early access elytra in creative for bug testing/accuracy comparison
TODO: replace temporary atlas, Properly implement 3d skulls
2026-04-24 20:00:35 -04:00
Fireblade a5eedcdc9c
hey man i dont think xbox live is a thing anymore nor does it really apply to us 2026-04-21 21:15:38 -04:00
piebot f13cbf2e4f Merge remote-tracking branch 'origin/main' 2026-04-21 13:02:11 +03:00
Lord_Cambion 4c8e38c721 feat: stoneslab2
fully implemented stoneslab2 with craftings and revisited existing slabs according to wii u decomp

todo:Material.cs
2026-04-21 01:32:02 +03:00
piebot 1b007b9d0f fix: replace explode sound with modern explode sound 2026-04-18 22:44:55 +03:00
George V. 82c6c5db8f
Merge remote-tracking branch 'itsRevela/main' into upstream-merge
# Conflicts:
#	.github/ISSUE_TEMPLATE/config.yml
#	.github/workflows/nightly.yml
#	Minecraft.Client/Windows64/4JLibs/libs/4J_Profile.lib
#	README.md
2026-04-17 21:22:20 +03:00
Marvelco bbc8c599b5 removed duplicates 2026-04-16 21:57:24 +03:00
Marvelco 0bc80a6e04 added missing dlc's 2026-04-16 21:50:43 +03:00
Loki Rautio 9d92d5eb9b Swap critical.mp3 for critical.ogg (#1503) 2026-04-15 05:22:37 -05:00
George V. c2c4eb6ea8
fix: Change string ID for Elder Guardian entity
The string identifier for the Elder Guardian entity was set
to `IDS_GUARDIAN_ELDER`. This has been changed to the
consistent identifier `IDS_ELDER_GUARDIAN`.

Additionally, the localization file has been updated to include the
missing string definitions for both `IDS_GUARDIAN` and
`IDS_ELDER_GUARDIAN`
2026-04-13 22:43:19 +03:00
George V. 734f186cd3
Merge remote-tracking branch 'itsRevela/main' into upstream-merge
# Conflicts:
#	Minecraft.Client/Common/Audio/SoundNames.cpp
#	Minecraft.Client/SheepRenderer.cpp
#	Minecraft.World/SoundTypes.h
#	README.md
#	cmake/CopyAssets.cmake
2026-04-13 17:54:36 +03:00
Tyler Reese 6913ce5323 fix: Implement missing critical hit sound (#1141) 2026-04-13 00:51:16 -05:00
Firebladedoge229 4d10af2ccb chore: update logo 2026-04-11 16:52:18 -04:00
George V. a0f4063807
Merge branch 'main' into upstream-merge 2026-04-11 02:52:52 +03:00
Fireblade 0ed96f1592
fix: resolve merge conflicts and integrate XML locale updates (#1)
Resolve merge conflicts across multiple components
Merge and synchronize XML locale changes
Ensure consistency between string resources and localization files
Minor fixes to restore successful builds after merge
2026-04-11 02:47:59 +03:00
SevenToaster509 c038506071 Feat: Armour Quick Equip, Fix: Baby Armour on Players 2026-04-10 16:06:57 +01:00
George V. 506ebd2176 Merge remote-tracking branch 'itsRevela/main'
# Conflicts:
#	.github/workflows/nightly.yml
#	.gitignore
#	Minecraft.Client/ChatScreen.cpp
#	Minecraft.Client/ClientConnection.cpp
#	Minecraft.Client/Common/Audio/SoundEngine.cpp
#	Minecraft.Client/Common/Audio/SoundEngine.h
#	Minecraft.Client/Common/Media/MediaWindows64.arc
#	Minecraft.Client/Common/UI/IUIScene_HUD.cpp
#	Minecraft.Client/Common/UI/UIControl_Base.cpp
#	Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
#	Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
#	Minecraft.Client/Common/XUI/XUI_Chat.cpp
#	Minecraft.Client/Common/XUI/XUI_Death.cpp
#	Minecraft.Client/Font.cpp
#	Minecraft.Client/Gui.cpp
#	Minecraft.Client/PendingConnection.cpp
#	Minecraft.Client/PlayerConnection.cpp
#	Minecraft.Client/PlayerConnection.h
#	Minecraft.Client/PlayerList.cpp
#	Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp
#	Minecraft.Client/Windows64/Network/WinsockNetLayer.h
#	Minecraft.Client/Windows64Media/strings.h
#	Minecraft.Client/cmake/sources/Common.cmake
#	Minecraft.Server/Console/ServerCliEngine.cpp
#	Minecraft.Server/Console/commands/whitelist/CliCommandWhitelist.cpp
#	Minecraft.Server/Windows64/ServerMain.cpp
#	Minecraft.World/WitherBoss.h
#	Minecraft.World/cmake/sources/Common.cmake
#	README.md
2026-04-09 15:21:43 +03:00
itsRevela 71b1bf92b8 Revert "fix: tutorial world"
This reverts commit 222852c11b.
2026-04-08 13:00:44 -05:00
neoapps-dev 222852c11b fix: tutorial world 2026-04-08 12:21:09 +03:00
/home/neo 29ebc01ea9
feat: TU19 tutorial world (#1) 2026-04-07 22:42:22 +03:00
piebot e45633defc Fix TU31 Fishing Changes
also remove halloween 2015 and greek for now as its currently causing crashes
2026-04-06 14:50:39 +03:00