Commit Graph

8310 Commits

Author SHA1 Message Date
kay27 394e754729 #11 Put tabs instead of each 2 spaces 2022-02-05 02:39:40 +04:00
kay27 dbef4b2e3c #11 Temporarily remove amethyst - moved into amethyst branch 2022-02-05 02:37:57 +04:00
kay27 ad46a8c9db #11 Remove amethyst screenshot 2022-02-05 02:35:22 +04:00
kay27 022fc84f5c Merge pull request 'Amethyst related stuffs' (#21) from Emojigit/MineClone5:fork-20210727-amethyst into master
Reviewed-on: MineClone5/MineClone5#21
2022-02-04 22:33:03 +00:00
kay27 d5fcfdc139 Merge 5.1.4 2022-02-05 02:30:53 +04:00
kay27 e1eca4c146 Merge remote-tracking branch 'origin/testing' into production 2022-02-05 02:30:15 +04:00
kay27 779ab00635 Fix yet another boat visual size crash 2022-02-04 23:54:04 +04:00
kay27 ad188e8474 Merge pull request 'Mapgen v3! ;)' (#161) from mapgenv3 into testing
Reviewed-on: MineClone5/MineClone5#161
2022-02-04 02:11:17 +00:00
kay27 97896c19e9 Fix last mapgen v3 issues 2022-02-04 06:08:09 +04:00
kay27 080fe253ad Remove crashes 2022-02-04 05:04:31 +04:00
kay27 7d57bb7d6e Implement basic part of mapgen API v3 2022-02-04 04:44:41 +04:00
kay27 78ce759b4b Merge remote-tracking branch 'origin/testing' into production 2022-02-02 05:21:43 +04:00
kay27 6b848c51d2 Fix villages initialization 2022-02-02 05:21:05 +04:00
kay27 bfd9cf9d54 Merge remote-tracking branch 'origin/production' 2022-02-02 04:29:55 +04:00
kay27 47eab20d39 Merge remote-tracking branch 'origin/testing' into production 2022-02-02 04:29:12 +04:00
kay27 4f10c8c032 Fix a typo (crash) 2022-02-02 04:15:03 +04:00
kay27 6e43c62680 Fix fly anticheat bug 2022-02-02 04:11:11 +04:00
kay27 90c4929b56 Fix noclip anticheat bug 2022-02-02 04:00:55 +04:00
kay27 effe1a7ac5 #140 Fix anticheat (add settings) 2022-02-02 03:48:11 +04:00
kay27 03590d3730 #62 Spawn ender dragon again 2022-02-02 02:49:25 +04:00
Nils Dagsson Moskopp 011423ac6d Fix TGA file writing on Windows
Before this patch, the tga_encoder mod would write corrupted TGA files
on Windows: Bytes that looked like newlines were replaced by a carriage
return and a newline.
2022-02-02 01:48:45 +04:00
kay27 0e7f502ee1 Merge master into testing 2022-02-02 01:47:20 +04:00
NO11 568cf72683 Merge pull request 'fix interact being revoked permanently (typo) (#156)' (#157) from fix-interact-revoke into master
Reviewed-on: MineClone5/MineClone5#157
2022-02-01 15:56:09 +00:00
cora 5d1b5bf43f fix interact being revoked permanently (typo) 2022-02-01 16:39:51 +01:00
kay27 d007f33e6e Merge production (v1.2) into master 2022-02-01 13:11:20 +04:00
kay27 750e6e0f0a Merge testing into production 2022-02-01 13:10:33 +04:00
kay27 b6109aa44a Merge pull request 'Most of all, it fixes the grass color' (#153) from fix_biomes into testing
Reviewed-on: MineClone5/MineClone5#153
2022-02-01 02:37:51 +00:00
kay27 e10715aa59 Fix mapgen API.md 2022-02-01 06:36:19 +04:00
kay27 e023b96877 Fix biomes 3/3 2022-02-01 06:33:03 +04:00
kay27 7b47e4d12b Fix biomes 2/3 2022-02-01 04:44:05 +04:00
kay27 2f6242e04f Fix biomes 1/3 2022-02-01 03:11:53 +04:00
kay27 5b258f5344 Merge remote-tracking branch 'origin/master' into testing 2022-02-01 01:28:41 +04:00
kay27 31f60346cb Merge pull request 'ENVIRONMENT/mcl_weather: remove unnecessary on_dimensionchange' (#152) from weather-dimchange-fix into master
Reviewed-on: MineClone5/MineClone5#152
2022-01-31 21:25:17 +00:00
cora 04146d98b0 remove unnecessary on_dimensionchange 2022-01-31 21:35:21 +01:00
NO11 e48f089761 Merge pull request 'Fix interact behavior to prevent hackers from get interact back through shields' (#150) from NO11/MineClone5:shield_additions into master
Reviewed-on: MineClone5/MineClone5#150
2022-01-31 17:09:48 +00:00
NO411 33c7ce1610 Fix interact behavior to prevent hackers from get interact back through shields 2022-01-31 18:08:43 +01:00
NO11 5f9b6bcedc Merge pull request 'Remove unnecessary code' (#149) from NO11/MineClone5:shield_additions into master
Reviewed-on: MineClone5/MineClone5#149
2022-01-31 16:43:58 +00:00
NO411 e6bef67275 Remove unnecessary code 2022-01-31 17:42:20 +01:00
NO11 2be3a83aa8 Merge pull request 'master' (#1) from MineClone5/MineClone5:master into master
Reviewed-on: NO11/MineClone5#1
2022-01-31 16:38:37 +00:00
kay27 da28fc2cea Merge master into testing 2022-01-31 05:26:43 +04:00
kay27 ce9e6ca593 Merge pull request 'ENVIRONMENT/mcl_weather: use particle spawners instead of individual particles' (#146) from fix-weather-particles into master
Reviewed-on: MineClone5/MineClone5#146
2022-01-31 01:24:06 +00:00
cora 5f910e3803 fix snow not being properly removed 2022-01-31 00:35:26 +01:00
cora 6220ef4205 add indoor detection for snow 2022-01-31 00:22:46 +01:00
cora 89be677f8a remove unneccessary particle logic 2022-01-31 00:22:16 +01:00
cora f4f4156420 let rain and thunder use particlespawners 2022-01-31 00:14:15 +01:00
cora 3312b70321 let snow use particlespawners 2022-01-30 21:17:00 +01:00
cora cbe9f72526 add simple weather particlespawner manager 2022-01-30 21:16:54 +01:00
kay27 d968ceb209 Merge testing 2022-01-30 07:21:08 +04:00
kay27 e4a0645a33 #142 Merge fix-fire into testing 2022-01-30 07:04:57 +04:00
cora 82ddeba826 fix beds not to burn away and drop 2022-01-30 04:00:34 +01:00