Commit graph

609 commits

Author SHA1 Message Date
SevenToaster509 add784b259 fix: clients crashing on enchantment attempt, disabled quick equip until further notice, updated enchantingmenu swfs because lapis slot was missing? 2026-04-16 20:47:14 +01:00
piebot 5dd8d982bb
fix: add missing dlcs (greek mythology and halloween 2015)
Added Missing DLC's
2026-04-16 22:10:29 +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
Marvelco 63a8eb2fbd
Merge branch 'pieeebot:main' into main 2026-04-16 21:27:18 +03:00
Marvelco fcbf81b5ae forgot this 2026-04-16 21:26:54 +03:00
Marvelco 833e449c8c fixed stained glass not rendering the water 2026-04-16 21:26:40 +03:00
George V. bd6586e45b fix: prevent crash when copying version when no ingame 2026-04-16 20:33:50 +03:00
George V. 56705f0576 feat: add version display and copy-to-clipboard functionality
Add version string (branch/version) to the debug overlay when F3 is active.
Also add a new keyboard shortcut (B key while F3 is held) to copy the
version string to the clipboard and show a confirmation message. This
improves debugging and support by making version information easily
accessible.
2026-04-16 20:33:50 +03:00
/home/neo 219d871c54
Merge branch 'main' into upstream-merge 2026-04-15 12:10:41 +03:00
Fireblade 8d72625516
feat: neoLegacy logo
Signed-off-by: George V. <georgev22.github@gmail.com>
2026-04-14 22:26:00 +03:00
George V. 9803addf5c
chore: clean up the Minecraft.Client/Common/Media folder 2026-04-14 21:20:44 +03:00
George V. 8bfebcabf4
Merge branch 'pieeebot:main' into upstream-merge 2026-04-14 19:32:01 +03:00
SevenToaster509 cc94cb8966 Feature: Players start with an empty map instead of a drawn map 2026-04-14 16:47:23 +01:00
Lord_Cambion 02ea52926c feat: sprintable horse and boats 2026-04-14 17:33:07 +02:00
George V. 00af47178d
refactor: Remove worldSizeChunks param from BiomeSource::findSeed 2026-04-13 23:02:05 +03:00
George V. 2ddf72a4eb
fix(audio): restore missing comma lost in upstream merge
A comma between "item.armor.equip_generic6" and "damage.critical" was
accidentally dropped during an upstream merge, causing the two entries
to be concatenated into a single string literal at compile time.

This produced an invalid sound key and led to crashes when:
- equipping armor
- triggering critical hits
2026-04-13 22:45:10 +03: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. ac7a207597
Merge branch 'main' into upstream-merge
# Conflicts:
#	Minecraft.Client/Windows64Media/strings.h
#	Minecraft.World/BiomeSource.cpp
#	Minecraft.World/BiomeSource.h
2026-04-13 22:26:43 +03:00
SevenToaster509 f307d7b0eb Fix: Enchanting Table taking wrong levels
Was using cost instead of the index of the slot
2026-04-13 17:25:19 +01:00
Lord_Cambion 4fe92f9a5a changed: guardians placeholders 2026-04-13 18:21:58 +02:00
SevenToaster509 5656aa979f Fix: Controller support broken on LoadMenu
SWF updates:
LoadMenu1080
CreateWorldMenu1080
2026-04-13 16:35:46 +01:00
George V. 80179ae3be
Merge branch 'main' into upstream-merge 2026-04-13 17:56:40 +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
George V. edeb0d2230
Merge branch 'main' into upstream-merge
# Conflicts:
#	.github/workflows/nightly.yml
#	Minecraft.Server/cmake/sources/Common.cmake
2026-04-13 17:39:46 +03:00
SevenToaster509 0606ce717d Refactor: Allow slider to be set
WARNING: REQUIRES ARC TO BE EDITED TO FUNCTION, PUSHED THIS TASK TO georgev22
2026-04-13 15:30:40 +01:00
George V. 5efd489229
fix: Prevent crash when displaying hardcore difficulty label
The hardcore difficulty label was using the raw string ID `IDS_HARDCORE` (oops)
instead of a localized string, which caused a crash in the UI.

Replaced `IDS_HARDCORE` with `app.GetString(IDS_HARDCORE)`
2026-04-13 17:18:15 +03:00
George V. 6d98c4ebf6
fix: Prevent gamemode slider movement when hardcore mode is enabled
Add virtual `canMoveSlider` method to UIScene base class and override it
in both LoadMenu and CreateWorldMenu scenes. The method returns false
when attempting to move the gamemode slider while hardcore mode is active,
effectively locking the slider in that state.

The UIController now checks `canMoveSlider` before initiating a slider
drag and during ongoing drag updates.
2026-04-13 17:18:15 +03:00
itsRevela 0544add4e2 chore: remove redundant/unused 4JLibs files 2026-04-13 03:15:58 -05:00
Tyler Reese 6913ce5323 fix: Implement missing critical hit sound (#1141) 2026-04-13 00:51:16 -05:00
DrPerkyLegit 71707fbb8c Add Chat Formatting Support For Servers (#1483) 2026-04-13 00:49:49 -05:00
GabsPuNs ae9dbd837d Exclude more files, reduce build .zip size (#1374) 2026-04-13 00:48:43 -05:00
Toru the Red Fox 825e96da54 Request dedicated GPU (#850) 2026-04-13 00:47:00 -05:00
Botch dea2bad0c4 fix: Disable font mipmapping (#1410) 2026-04-13 00:46:32 -05:00
DrPerkyLegit ae3c843ee5 fix: Increase entity network limit to 16k entities (#1492) 2026-04-13 00:43:18 -05:00
DrPerkyLegit 6c572d4940 feat: Scrollable chat (#1493) 2026-04-13 00:42:04 -05:00
DrPerkyLegit 5e7ad7333e Better Text Scaling (#1494)
* f3 menu text scaling

* Reduce overscaling above 1080p

Restores original scaling for 1440p to try and keep the text size more
sane on high DPI monitors

---------

Co-authored-by: Loki Rautio <lokirautio@gmail.com>
2026-04-13 00:37:54 -05:00
Firebladedoge229 190f9eff2c fix: server failing from localization changes + abrupt wine crash on exit 2026-04-13 04:51:00 +03:00
SevenToaster509 3d57609e12 Chore: Disable track debugging
Hope no-one needs it, it was pissing me off
2026-04-12 20:43:55 +01:00
SevenToaster509 e0cc846be5 Fix: Lapis Slot for Enchanting takes and consumes any item 2026-04-12 18:42:59 +01:00
SevenToaster509 48ce29a28e Fix: Clicking book while signing removes signing text, Clicking book when book is signed allows text editing, Added default resolution to not crash on smaller screens (720p and less) 2026-04-12 18:25:27 +01:00
Logan Gibson d8da9af7fe
Add particles when fishing (#1)
Co-authored-by: Lord_Cambion <lordcambion.gaming@gmail.com>
2026-04-12 14:18:03 +03:00
George V. 7d05b6a9d6
fix: Replace hardcoded "Hardcore" string with localization resource ID
Replace the hardcoded string literal "Hardcore" in the difficulty slider
label with the localization resource identifier `IDS_HARDCORE` in both
the load menu and create world menu scenes.
2026-04-12 00:41:17 +03:00
Fireblade c322f759f3
Merge branch 'GeorgeV220:upstream-merge' into upstream-merge 2026-04-11 17:25:50 -04:00
Firebladedoge229 e77458b7e8 fix: folderFile common linking 2026-04-11 17:24:49 -04:00
George V. 401ccbcdc9
fix: lock survival when hardcore and swf changes 2026-04-12 00:22:38 +03:00
Firebladedoge229 4d10af2ccb chore: update logo 2026-04-11 16:52:18 -04:00
George V. 1a78363ee5
Merge branch 'main' into upstream-merge
# Conflicts:
#	Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
#	Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
#	Minecraft.Client/Common/UI/UIScene_LoadMenu.h
2026-04-11 23:36:43 +03:00
George V. 18f7d9a219
feat: merge hardcore hearts 2026-04-11 23:10:43 +03:00
George V. 84f1382a40
chore: merge Windows 64-bit media SWF files from revelations 2026-04-11 22:31:37 +03:00