Commit Graph

8149 Commits

Author SHA1 Message Date
kay27 e4c90a95ef Merge pull request 'Release Amethyst' (#166) from compatibility into production-compatible
Reviewed-on: MineClone5/MineClone5#166
2022-02-05 17:18:06 +00:00
kay27 eebf756f16 Merge testing into compatibility 2022-02-05 21:13:12 +04:00
kay27 304ea98ef9 Merge pull request 'Add Amethyst Stuff' (#165) from amethyst into testing
Reviewed-on: MineClone5/MineClone5#165
2022-02-05 16:57:24 +00:00
kay27 ed3ae8c32e #11 Fix amethyst buds light levels again 2022-02-05 20:56:26 +04:00
kay27 218ab6fe15 #11 Fix amethyst buds light levels 2022-02-05 20:55:26 +04:00
kay27 22351ca1d8 #11 Fix various amethyst errors, write better seed function 2022-02-05 20:49:45 +04:00
kay27 adbde60b10 #11 Spawn buds 2022-02-05 06:27:23 +04:00
kay27 1a78fde1a0 #11 Generate amethyst geodes naturally 2022-02-05 05:34:59 +04:00
kay27 6be95762bc #11 Distort geodes 2022-02-05 04:56:17 +04:00
kay27 e828757fae #11 Fix geode placement (spherical last time) 2022-02-05 04:16:30 +04:00
kay27 6f1719b297 #11 Fix geode placement 2022-02-05 04:03:22 +04:00
kay27 19e77c755b #11 Add geode 2022-02-05 03:58:05 +04:00
kay27 b3a67162d2 #11 Fix translation filename 2022-02-05 03:07:34 +04:00
kay27 a9f5e74396 #11 Fix the style, add template.txt, add Russian translation 2022-02-05 03:01:23 +04:00
kay27 394e754729 #11 Put tabs instead of each 2 spaces 2022-02-05 02:39:40 +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 d17c103dfe Merge remote-tracking branch 'origin/compatibility' into production-compatible 2022-02-04 23:55:37 +04:00
kay27 7a5d632449 Merge remote-tracking branch 'origin/testing' into compatibility 2022-02-04 23:54:48 +04:00
kay27 779ab00635 Fix yet another boat visual size crash 2022-02-04 23:54:04 +04:00
kay27 697d8396dd Merge pull request 'Release 1.4' (#164) from compatibility into production-compatible
Reviewed-on: MineClone5/MineClone5#164
2022-02-04 19:50:01 +00:00
kay27 24dec437e5 #123 Make latest mapgen changes compatible with 5.4 2022-02-04 20:28:04 +04:00
kay27 8ee20a2d18 Merge remote-tracking branch 'origin/testing' into compatibility 2022-02-04 19:51:44 +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 a2f464c67f Merge remote-tracking branch 'origin/compatibility' into production-compatible 2022-02-02 04:18:13 +04:00
kay27 c917cd2e46 Merge remote-tracking branch 'origin/testing' into compatibility 2022-02-02 04:15:31 +04:00
kay27 4f10c8c032 Fix a typo (crash) 2022-02-02 04:15:03 +04:00
kay27 d14cdceaa3 Merge remote-tracking branch 'origin/testing' into compatibility 2022-02-02 04:11:32 +04:00
kay27 6e43c62680 Fix fly anticheat bug 2022-02-02 04:11:11 +04:00
kay27 61c87c7e1a Merge pull request 'Release 1.3 "Bugfix"' (#158) from compatibility into production-compatible
Reviewed-on: MineClone5/MineClone5#158
2022-02-02 00:02:37 +00:00
kay27 07603a8642 Merge remote-tracking branch 'origin/testing' into compatibility 2022-02-02 04:01:23 +04:00
kay27 90c4929b56 Fix noclip anticheat bug 2022-02-02 04:00:55 +04:00
kay27 f2898a0d1c Merge testing into compatibility 2022-02-02 03:51:25 +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