backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-26 00:47:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1331 commits 11 branches 1 tag 1.7 GiB
Commit graph

41 commits

Author SHA1 Message Date
Tropical ed726d291a fix: properly bind minecart texture
Some checks failed
Build (Linux, x86_64) / build-linux (push) Has been cancelled
Details
Build (Linux, x86_64) / build-linux-debug (push) Has been cancelled
Details
Clang Format / clang-format (push) Has been cancelled
Details 
happened because of a bad merge
 2026-03-24 23:17:47 -05:00
Sally Knight 5972c01ed4 fix: use original gui tile rendering (again) for proper lighting
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
Clang Format / clang-format (push) Waiting to run
Details
2026-03-25 00:07:11 +03:00
MatthewBeshay fdb2a1098b fix: restore block lightmap sampling 2026-03-24 08:21:19 +11:00
Tropical e6e8db7ae9 add some missing nikita patches to TileRenderer 2026-03-22 17:06:52 -05:00
Tropical 03355211ca more fixes 2026-03-22 03:13:45 -05:00
Tropical ad5e8dd012 getting further 2026-03-22 02:52:30 -05:00
Tropical ce57edff9d fix strings, includes, the usual 2026-03-22 02:28:46 -05:00
Tropical 6c92bc0be8 more build fixes 2026-03-22 01:14:52 -05:00
Tropical 8f90088611 TU19: merge Minecraft.Client/Rendering 2026-03-21 22:28:58 -05:00
Sally Knight 97172039dd Merge branch 'dev' into feat/restore-java-gui 2026-03-16 16:04:30 +03:00
Tropical e8424f2000 chore: format Minecraft.Client 2026-03-13 17:10:10 -05:00
notmatthewbeshay 0249bfd2bf Fix Linux build warnings 2026-03-14 04:37:55 +11:00
Tropical 177ed6d176
Merge pull request #215 from 4jcraft/dev 
just merging all of the dev branch stuff into the java gui branch
 2026-03-13 12:11:37 -05:00
Tropical 8f10806f70 Merge branch 'dev' into feat/restore-java-gui
Some checks are pending
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
2026-03-13 01:02:17 -05:00
notmatthewbeshay bcc765f3e7 Merge remote-tracking branch 'upstream/dev' into issue/51-phase-1-portable-win32-cleanup 
# Conflicts:
#	Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
#	Minecraft.Client/Rendering/Tesselator.cpp
 2026-03-13 15:16:43 +11:00
Nikita Edel 6cfc1efec2
Merge branch '4jcraft:dev' into fix-with-ubsan 2026-03-12 14:40:02 +01:00
Sally Knight e66f279a5b Merge branch 'dev' into feat/restore-java-gui 2026-03-12 16:01:31 +03:00
Sally Knight 4b8d65d5e6 fix: use original disabled transforms to fix hotbar block lighting 2026-03-12 03:50:34 +03:00
Nikita Edel faa4a989ce new blob 2026-03-11 18:49:36 +01:00
Nikita Edel cc65f7ee29 FINALLY LOADS IN, crashes when clicking :( 2026-03-11 18:01:00 +01:00
notmatthewbeshay a503336887 Merge upstream/dev into issue/51-phase-1-portable-win32-cleanup 2026-03-11 16:02:48 +11:00
notmatthewbeshay 1bf50e2549 Use fixed-width language IDs in sign rendering 2026-03-11 15:38:52 +11:00
Tropical cf3defee35 Merge branch 'dev' into feat/restore-java-gui 2026-03-10 21:02:58 -05:00
Nikita Edel f9fc430c43
Merge branch '4jcraft:dev' into dev 2026-03-10 19:34:42 +01:00
Tropical 1d406debe6 Merge branch 'dev' into feat/restore-java-gui
Some checks are pending
Build Linux Release / build-linux (push) Waiting to run
Details
2026-03-10 02:29:05 -05:00
Tropical db7a5f9519 feat: restore unused java GUI 
Co-Authored-By: ffqq <36998498+realffqq@users.noreply.github.com>
 2026-03-09 22:29:32 -05:00
Tropical e4868446bd chore: add comments for 4jcraft-added functionality, undo #135 2026-03-09 19:46:54 -05:00
Nikita Edel 66b31669c3 new batch of delete operator missmatch 2026-03-09 22:48:36 +01:00
Tropical 4be19958ea Merge branch 'dev' into refactor/untangle-assets-mess
Some checks failed
Build Linux Release / build-linux (push) Has been cancelled
Details
2026-03-09 01:20:45 -05:00
Tropical 5a36950239 fix: shuffle around remaining paths to get everything building again/home/tropical/Documents/GitHub/4jcraft-real/Minecraft.World/Level/../../Minecraft.Client/Textures/Packs/TexturePack.h 2026-03-09 00:34:09 -05:00
lotaviods d1c602c2d7 fix: Camera movement and player hand 2026-03-09 00:53:44 -03:00
Tropical 54dab7708d refactor: rename Build -> Platform in Minecraft.World 2026-03-08 21:33:18 -05:00
Tropical ed551d8658 refactor: unglob std::dynamic_pointer_cast 2026-03-06 22:13:29 -06:00
Tropical bc7d4ff1d8 refactor: byebye using namespace std 
shoo
 2026-03-06 12:16:41 -06:00
Tropical 7c95bfc0bd refactor: begin unglobbing std::vector 2026-03-06 11:58:11 -06:00
Tropical cdc08700e4 refactor: unglob std::wstring 2026-03-06 11:50:22 -06:00
Tropical ecf7fc7f61 refactor: unglob std::unordered_map 2026-03-06 11:29:36 -06:00
Tropical 67ceccf2d4 refactor: unglob std::shared_ptr 2026-03-06 11:20:45 -06:00
Tropical 15af35eef2 fix: remove byte type alias 2026-03-06 05:03:37 -06:00
JuiceyDev 17ac8deddf hhhhh 2026-03-06 07:13:57 +01:00
ella love 2383fcee6e feat: move script & folder refactor 2026-03-05 03:29:23 -05:00