Commit Graph
29 Commits
Author SHA1 Message Date
Leah Anderson 5cc4a41c30 Merge pull request #262 from 4jcraft/tropicaaal-patch-1
Remove GCC version requirement from README
2026-03-16 08:08:36 -06:00
Leah Anderson 2fd1a136df Merge pull request #210 from lotaviods/creative_java_gui
(java gui) Implement Creative Inventory screen and container
2026-03-13 09:23:28 -06:00
Leah Anderson 2a0215852a Merge pull request #208 from 4jcraft/docs-changez
Update to the scope & platform support section of readme.
2026-03-12 18:52:10 -06:00
Leah Anderson a386bcfbfd Merge pull request #191 from 4jcraft/chore/remove-pragma-warning
chore: remove `#pragma warning` directives
2026-03-12 08:17:48 -06:00
Leah Anderson 316577484f Merge pull request #201 from realffqq/feat/restore-java-gui
(feat/restore-java-gui)fix: reorder and correct lighting for blocks in container screens
2026-03-12 07:53:47 -06:00
Leah Anderson de924fee0d Merge pull request #195 from realffqq/dev
fix: use original disabled transforms to fix hotbar block lighting
2026-03-11 19:18:54 -06:00
Leah Anderson d9dbb5c39c Merge pull request #157 from 4jcraft/feat/sdl-support
Added SDL support & Remade 4j_Input
2026-03-10 19:42:49 -06:00
Leah Anderson 4e39635f20 Merge pull request #167 from 4jcraft/fix/missing-asset-error
fix: remove unused console-only asset archive imports
2026-03-10 14:31:36 -06:00
Leah Anderson 9c996b6014 Merge pull request #137 from MathiewMay/dev
Added nullptr check on itemInHandRenderer to prevent an seg fault.
2026-03-09 12:14:55 -06:00
Leah Anderson 41314fa873 Merge pull request #72 from MrShrekThird/dev
Update CONTRIBUTING.md
2026-03-06 11:41:18 -07:00
Leah Anderson 5a3768ce36 hit a wall 2026-03-03 09:29:08 -07:00
Leah Anderson 1003ed9cd3 Merge pull request #8 from tropicaaal/refactor/no-more-backslash
refactor: all backslash includes must die
2026-03-02 16:34:36 -07:00
Leah Anderson 092001eeab more fixes 2026-03-02 15:37:06 -07:00
Leah Anderson e835351668 Merge pull request #7 from tropicaaal/leahs-dev-branch
fix: remove hardcoded locales and include through stdafx
2026-03-02 15:29:16 -07:00
Leah Anderson 6b31c49bc9 im an idiot
This reverts commit 137bad7040.
2026-03-02 15:10:47 -07:00
Leah Anderson 137bad7040 more 2026-03-02 15:09:10 -07:00
Leah Anderson d6d7fa7ada fix a myriad of other files 2026-03-02 14:09:40 -07:00
Leah Anderson b2e255fc05 resolve conflicts 2026-03-02 13:57:58 -07:00
Leah Anderson 41a0befd07 preliminary fix because this is relatively easy to do 2026-03-02 13:36:12 -07:00
Leah Anderson a7a1ceed39 fuck 2026-03-02 12:29:25 -07:00
Leah Anderson 9a3dd2df38 Merge branch 'leahs-dev-branch' of github.com:4jcraft/4jcraft into leahs-dev-branch 2026-03-02 12:28:03 -07:00
Leah Anderson 71db263e5d yet another quickfix 2026-03-02 12:27:29 -07:00
Leah Anderson 29980137a5 Merge pull request #6 from 4jcraft/dev
oh for fucks sake
2026-03-02 12:18:55 -07:00
Leah Anderson eb45804d11 oh for fucks sake 2026-03-02 12:18:07 -07:00
Leah Anderson 79c1737c34 4th batch 2026-03-02 12:00:59 -07:00
Leah Anderson e729d27372 third batch of fixes 2026-03-02 11:28:02 -07:00
Leah Anderson 87c2aa0dba fix that one error 2026-03-02 11:07:34 -07:00
Leah Anderson 8947b89f22 more casting errors fixed 2026-03-02 10:52:12 -07:00
Leah Anderson daa04a789a to whoever at 4j made this code not adhere to any C standard: why 2026-03-02 10:40:53 -07:00