Commit Graph
2346 Commits
Author SHA1 Message Date
gnembon 8903865faa Merge branch 'master' into 1.17 2021-04-07 19:12:08 -03:00
gnembon 6c9dbdda12 21w14a 2021-04-07 19:11:59 -03:00
gnembon 75a823f994 mapping 2021-04-07 19:05:45 -03:00
gnembon e0eec1bb9c 1.4.31 2021-04-07 18:49:53 -03:00
gnembon 8054e0336d mapping 2021-04-06 23:52:20 -03:00
gnembon 2e3a49756b mapping 2021-04-06 21:05:34 -03:00
gnembon 0aff2f90c3 Merge branch 'master' into 1.17 2021-04-06 20:59:59 -03:00
gnembon 6fc38d6ec1 slashes fix issues with some java versions 2021-04-06 20:57:14 -03:00
gnembon 9b9251190b Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/network/ClientNetworkHandler.java
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2021-04-06 00:44:16 -03:00
gnembon 647a3a15b6 profiler rework 2021-04-06 00:41:12 -03:00
gnembon 2ed5861278 Merge branch 'master' into 1.17 2021-04-05 13:42:54 -03:00
gnembon 063b4b84ec deferred creation of a dummy entity for block breaking to when its needed. 2021-04-05 13:42:22 -03:00
gnembon 214aa45140 Merge branch 'master' into 1.17 2021-04-05 10:59:01 -03:00
gnembon e37e4050b1 get proper lazy host for execution of suggestions. Fixes #793 2021-04-05 10:58:26 -03:00
gnembon 7ab7f00316 Merge branch 'master' into 1.17 2021-04-05 09:33:24 -03:00
gnembon 6f4ee1fd00 fake players shake off players when removing 2021-04-05 09:33:04 -03:00
gnembon 8ebe0e60e4 Merge branch 'master' into 1.17 2021-04-04 22:58:44 -03:00
gnembon ebd0f78794 fix npe 2021-04-04 22:58:26 -03:00
gnembon b96ef34e31 merge fix 2021-04-04 22:36:04 -03:00
gnembon 0cce983092 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/commands/PerimeterInfoCommand.java
#	src/main/resources/carpet.mixins.json
2021-04-04 22:34:38 -03:00
gnembon f0d044a49f added scarpet to the carpet profiler 2021-04-04 22:32:34 -03:00
gnembon 51a548991d reword to properly reflect what up. fixes #761 2021-04-04 20:56:50 -03:00
gnembon 9117d85c73 for 2021-04-04 19:45:08 -03:00
gnembon dafebffb5a Rewording since all extra semicolons are now stripped in tokenization stage. Fixes #771 2021-04-04 19:22:06 -03:00
gnembon 00f932bafc Can place skulls inside when creativeNoClip. Fixes #775 2021-04-04 18:28:25 -03:00
gnembon 8f5330e241 added system_info world_spawn_point. Fixes #785 2021-04-04 17:55:57 -03:00
gnembon 27612905b8 added system_info world_spawn_point. Fixes #785 2021-04-04 17:54:05 -03:00
gnembon 3f372180e6 increased store for random seeds to 64k 2021-04-04 12:33:52 -03:00
gnembon da2873de52 Merge branch 'master' into 1.17 2021-04-03 20:31:35 -03:00
gnembon 512a1c4b28 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-04-03 13:18:03 -03:00
gnembon 5c7bbc19ad optional mixins to provide better compatibility. fixes #788 2021-04-03 13:17:34 -03:00
gnembon 5dd2a12aa7 mapping 2021-04-02 18:38:55 -03:00
gnembon 3756ca9f86 Merge branch 'master' into 1.17 2021-03-31 22:04:24 -03:00
gnembon 470821524d 1.4.30 foreal 2021-03-31 22:03:09 -03:00
gnembon 0320de5d6d 21w13a 2021-03-31 22:02:09 -03:00
gnembon b49b99aea6 21w11a mappings 2021-03-31 19:20:44 -03:00
github-actions[bot] 4ad1c3e029 Merge docs for 'Carpet Mod 1.4.30 for Minecraft 1.16.5, 21w13a' 2021-03-31 22:19:33 +00:00
gnembon 502c4e270e Merge branch 'master' into 1.17 2021-03-26 22:30:23 -03:00
gnembon c5f666b95c specify 2021-03-26 22:29:06 -03:00
gnembon 03e0e72c8c Merge branch 'master' into 1.17 2021-03-25 14:03:29 -03:00
gnembon 1ef764b9b1 specify 2021-03-25 14:03:09 -03:00
gnembon ab553187c5 its a doozie 2021-03-24 10:35:52 -03:00
gnembon 365892b9ca cleaner 2021-03-24 02:22:21 -03:00
gnembon 8be832a74c Merge branch 'master' into 1.17 2021-03-23 20:15:44 -03:00
gnembon ff4b292871 Merge pull request #742 from Ghoulboy78/draw_beta-upgrade
Update draw_beta.sc
2021-03-23 08:36:42 -03:00
gnembon 02e097dc4f fix 2021-03-23 04:15:51 -03:00
gnembon b246bff5a8 update 2021-03-21 03:35:41 -03:00
gnembon 4616bf4333 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/bundled/FileModule.java
2021-03-21 02:35:43 -03:00
gnembon 47f9efb0f2 extended info provided with system_info 2021-03-21 02:33:24 -03:00
gnembon 53f6a49b8d removed sun's import 2021-03-20 17:41:17 -03:00