Commit graph

62 commits

Author SHA1 Message Date
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
Mohamed Ashraf 365f6ad5eb fix(TLS): tls shit 2026-03-03 00:41:40 +04:00
Leah Anderson 41a0befd07 preliminary fix because this is relatively easy to do 2026-03-02 13:36:12 -07:00
Mohamed Ashraf d63a688bec 6th batch of changes 2026-03-03 00:26:38 +04:00
Mohamed Ashraf 2e34f54ba7 fix(hasher): USE OPENSSL 2026-03-02 23:52:30 +04: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
Mohamed Ashraf a41f601bf8 fix(Minecraft.World): uhh 2026-03-02 23:27:12 +04:00
Mohamed Ashraf 81c8e50f04 chore: Merge branch 'leahs-dev-branch' of https://github.com/ThePixelMoon/4jcraft into leahs-dev-branch 2026-03-02 23:19:34 +04:00
Mohamed Ashraf 334cad146b chore(core): replace \ with / 2026-03-02 23:19:20 +04: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
Mohamed Ashraf 9cfc2e5b16 now its time to go through std hell... 2026-03-02 22:41:28 +04:00
Mohamed Ashraf 19da56305e chore: Merge branch 'leahs-dev-branch' of https://github.com/ThePixelMoon/4jcraft into leahs-dev-branch 2026-03-02 22:36:16 +04:00
Mohamed Ashraf a6bce04f9d hopefully fix std ver? 2026-03-02 22:36:04 +04: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
DecalOverdose 60b954cda3
Merge pull request #3 from 4jcraft/leahs-dev-branch
more casting errors fixed
2026-03-02 21:55:24 +04:00
Leah Anderson 8947b89f22 more casting errors fixed 2026-03-02 10:52:12 -07:00
DecalOverdose 143865600c
Merge pull request #2 from leahanderson1/dev
to whoever at 4j made this code not adhere to any C standard: why
2026-03-02 21:45:09 +04: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
Mohamed Ashraf f10f5845fd more fixes 2026-03-02 20:49:57 +04:00
Mohamed Ashraf a454171f42 fix(linux): more shit 2026-03-02 18:29:17 +04:00
Mohamed Ashraf 3ece2a588d You shall fix ze bugs you shall ve happy 2026-03-02 16:30:43 +04:00
Mohamed Ashraf 0803f67f47 fix(File): Remove WinAPI related shit 2026-03-02 14:27:09 +04:00
Mohamed Ashraf 141819a6c4 fix(bytebuffer): Fix bytebuffer compile 2026-03-02 12:42:45 +04:00
Mohamed Ashraf eefa1c1700 chore: Merge branch 'dev' of https://github.com/ThePixelMoon/4jcraft into dev 2026-03-02 12:18:20 +04:00
Mohamed Ashraf 115da74e1e fix(Minecraft.World) major fixes, now i need to fix byte bullshit 2026-03-02 12:18:09 +04:00
DecalOverdose e9625910a0
Update README.md 2026-03-02 10:25:06 +04:00
Mohamed Ashraf 84f61b0131 fix(world): attempts 2026-03-02 10:05:28 +04:00
Mohamed Ashraf 96e219ee1e fix(solution): HOLY SHIT IT'S COMPILING 2026-03-02 09:38:48 +04:00
Mohamed Ashraf 401d8fec96 fix(Renderer): Fully FIX 4J_renderer.h 2026-03-02 09:18:01 +04:00
Mohamed Ashraf 1ee463ff20 chore: Merge branch 'dev' of https://github.com/ThePixelMoon/4jcraft into dev 2026-03-02 08:58:39 +04:00
Mohamed Ashraf dcb2c43944 major fixes of my shit code 2026-03-02 08:58:33 +04:00
DecalOverdose 529a366ad5
update link attempt to resolve #1 2026-03-01 23:41:47 +04:00
DecalOverdose 863edfc457
Create CONTRIBUTING.md 2026-03-01 23:30:56 +04:00
ThePixelMoon 769d9ceb0d wlinux: move defines to the top 2026-03-01 21:16:38 +02:00
ThePixelMoon 32f065e21d Minecraft.World: move linux win defs into its own file 2026-03-01 21:14:51 +02:00
Mohamed Ashraf fc37ed6b06 chore: Merge branch 'dev' of https://github.com/ThePixelMoon/4jcraft into dev 2026-03-01 23:09:14 +04:00
Mohamed Ashraf 1c9953733f Moon forced me to this, i'm sorry valve 2026-03-01 23:09:07 +04:00
ThePixelMoon 1c9537e864 readme: update 2026-03-01 21:05:43 +02:00
ThePixelMoon 078da7c3b0 gitignore: update 2026-03-01 21:04:51 +02:00
DecalOverdose d0c5a39f4c
Update README.md 2026-03-01 23:02:44 +04:00
ThePixelMoon 5902020f20 readme: update 2026-03-01 21:00:14 +02:00
Mohamed Ashraf 7a83b33df1 SAVE_FILE_PLATFORM_LOCAL stub 2026-03-01 22:58:18 +04:00
Mohamed Ashraf 1f4e4d7968 chore: Merge branch 'dev' of https://github.com/ThePixelMoon/4jcraft into dev 2026-03-01 22:48:57 +04:00
Mohamed Ashraf 9bc3f561d9 fix(Renderer): Fix renderer compile 2026-03-01 22:48:35 +04:00