Commit Graph
285 Commits
Author SHA1 Message Date
gnembon 4270f8d718 Merge branch 'master' into 1.16
# Conflicts:
#	gradle.properties
#	src/main/java/carpet/CarpetSettings.java
#	src/main/resources/fabric.mod.json
2020-04-22 17:11:10 -03:00
gnembon 1ab00ef957 1.3.20 2020-04-22 17:08:55 -03:00
gnembon 574b5e0431 added bastion remnants to overlay 2020-04-16 09:52:53 -03:00
gnembon 8cd79d0add b for bastion 2020-04-15 13:46:13 -03:00
gnembon ca74935742 Merge branch 'master' into 1.16 2020-04-15 12:40:44 -03:00
gnembon 4bb283a851 1.3.19 2020-04-15 12:39:36 -03:00
gnembon a757c6f88a Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/bundled/Module.java
2020-04-15 02:00:31 -03:00
gnembon 3e76adbdaa added deep frozen state where chunk tickets will not be expiring as well, preventing chunks from unloading. Fixes #204 2020-04-14 01:28:00 -03:00
gnembon 7ebc96106b Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/mixins/ChunkTicketManager_scarpetMixin.java
#	src/main/java/carpet/mixins/MinecraftServer_coreMixin.java
2020-04-13 01:08:06 -03:00
gnembon 2a1d5542f1 just to change from disabling spawn chunks to control over its size. Removes disableSpawnChunks, adds spawnChunksSize. Fixes #192 2020-04-13 00:59:55 -03:00
gnembon d6d6b69fcb added inhabited_time and player events revolving around damage, death and respawns. 2020-04-12 19:42:04 -03:00
gnembon 9b50bf3a79 Merge branch 'master' into 1.16 2020-04-08 12:32:07 -03:00
gnembon e1948a2fe0 1.3.18 2020-04-08 12:31:08 -03:00
gnembon a4626df004 Merge branch 'master' into 1.16 2020-04-01 13:22:16 -03:00
gnembon 321a051a80 1.3.17? 2020-04-01 13:19:37 -03:00
gnembon 1d86b4a223 Merge branch 'master' into 1.16 2020-03-31 00:05:08 -03:00
gnembon fe63334509 enabled some client side command interpretation. 2020-03-30 17:14:16 -03:00
gnembon 930dc6f701 Merge branch 'master' into 1.16 2020-03-26 03:19:09 -03:00
gnembon c66ed96a98 added handler for on_lightning 2020-03-26 03:18:49 -03:00
gnembon 999b547472 Merge branch 'master' into 1.16 2020-03-25 15:44:44 -03:00
gnembon 73e6c2ce5e 1.3.16 2020-03-25 15:43:43 -03:00
gnembon e39d09cd89 Merge branch 'master' into 1.16 2020-03-18 22:02:45 -03:00
gnembon a31262fc71 1.3.15 2020-03-18 22:00:30 -03:00
gnembon b9964c8da8 Merge branch 'master' into 1.16
# Conflicts:
#	gradle.properties
#	src/main/java/carpet/utils/PerimeterDiagnostics.java
#	src/main/java/carpet/utils/SpawnReporter.java
2020-03-10 22:57:48 -03:00
gnembon a366e63987 verbump 1.3.14 2020-03-10 22:52:55 -03:00
gnembon 0716d5e11d missing mixin 2020-03-04 22:45:11 -04:00
gnembon f28ae1aa70 Merge branch 'master' into 1.16 2020-03-04 13:17:57 -04:00
gnembon 7a611c53fc 1.3.13 2020-03-04 13:16:54 -04:00
gnembon 37e72cbf46 Merge branch 'master' into 1.16 2020-02-26 13:44:01 -04:00
gnembon d8e554f182 1.3.12 2020-02-26 13:42:05 -04:00
gnembon 50c5379f46 Merge branch 'master' into 1.16 2020-02-26 02:52:59 -04:00
gnembon 7af08306e4 reset_chunk 2020-02-26 02:52:12 -04:00
gnembon 49609b368d Merge branch 'master' into 1.16 2020-02-24 14:49:58 -04:00
gnembon 061e718a89 added __on_chunk_generated event and attempted to illegalize global events in player scoped apps. 2020-02-24 02:29:59 -04:00
gnembon 4f5e3b0928 Merge branch 'master' into 1.16 2020-02-23 02:26:19 -04:00
gnembon 72a7bed11a fixed logger issues #156 and #155 2020-02-23 02:25:51 -04:00
gnembon 75c0eca719 Merge branch 'master' into 1.16 2020-02-21 12:54:16 -04:00
gnembon c4c9f16fa6 1.3.11 2020-02-21 12:46:11 -04:00
gnembon 115e6a1777 Merge branch 'master' into 1.16
# Conflicts:
#	gradle.properties
2020-02-12 11:38:06 -04:00
gnembon f12283aea4 good to set your priorities straight 2020-02-12 11:37:25 -04:00
gnembon 8a09fb55b2 Merge branch 'master' into 1.16 2020-02-09 01:57:58 -04:00
gnembon dffaec7355 raneming 2020-02-08 18:21:18 -04:00
gnembon dc42ea77b1 Merge branch 'master' into 1.16 2020-02-05 19:55:57 -04:00
gnembon e6a49467c4 1.3.9, why not 2020-02-05 19:55:43 -04:00
gnembon b9bd5ec17d 20w06a features 2020-02-05 18:24:01 -04:00
gnembon 9fa0e6109b 20w06a 2020-02-05 13:56:51 -04:00
gnembon ae56f3e2ba 1.3.8 2020-02-05 13:28:44 -04:00
gnembon 00a540505e Merge branch 'master' into 1.15 2020-01-28 12:23:11 -04:00
gnembon 4bf27c3d15 interactionUpdates 2020-01-28 12:22:51 -04:00
gnembon 26a038041e Merge branch 'master' into 1.15 2020-01-27 23:14:15 -04:00