Commit Graph
1284 Commits
Author SHA1 Message Date
gnembon 08d48e765d Merge branch 'master' into 1.16 2020-05-06 14:35:03 -03:00
gnembon 983f24a87d 1.3.22 2020-05-06 14:34:04 -03:00
gnembon 2333f57f4a Merge branch 'master' into 1.16 2020-05-05 17:18:30 -03:00
gnembon aade01a3b3 place_item can use non-block items. fixes #260 2020-05-05 17:18:04 -03:00
gnembon cfe1a9e729 fix 2020-05-04 23:09:02 -03:00
gnembon d29fa3bdf5 fix 2020-05-04 22:43:32 -03:00
gnembon e94bd7f59a Merge branch 'master' into 1.16 2020-05-04 22:08:31 -03:00
gnembon 771de74a03 noclip can place blocks intersecting with sefl 2020-05-04 22:07:22 -03:00
gnembon 18ecc4ec4f Merge branch '1.16' of https://github.com/gnembon/fabric-carpet into 1.16 2020-05-04 19:54:11 -03:00
gnembon 13289b023d duh 2020-05-04 19:53:40 -03:00
gnembon 74c5116ec3 Merge branch 'master' into 1.16 2020-05-04 19:47:02 -03:00
gnembon 440dc6e2f4 creative no clip 2020-05-04 19:46:28 -03:00
gnembon b9750a46ba update 2020-05-04 15:50:59 -03:00
gnembon ad713f0220 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/helpers/FeatureGenerator.java
2020-05-04 15:49:28 -03:00
gnembon ad43784ad6 unify structure info. 2020-05-04 15:48:45 -03:00
gnembon b16991d84b mapping updates 2020-05-04 00:09:22 -03:00
gnembon cdb79f9768 Merge branch 'master' into 1.16 2020-05-03 23:21:39 -03:00
gnembon 15ac3edc19 clarifications around 'str' 2020-05-03 23:10:09 -03:00
gnembon 04a5dd2c2c fixed missing links and commands 2020-05-03 16:01:01 -03:00
gnembon 1f65c1b55c Merge branch 'master' into 1.16 2020-05-02 20:19:34 -03:00
gnembon 2ec095a1bf oupsie 2020-05-02 20:19:19 -03:00
gnembon f84389c8d8 1.16 fixes 2020-05-02 20:05:40 -03:00
gnembon 6299e72e38 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/helpers/FeatureGenerator.java
#	src/main/java/carpet/script/CarpetExpression.java
2020-05-02 19:36:12 -03:00
gnembon 3821af4f82 structure_eligibility and notes on spawn_potential 2020-05-02 19:14:59 -03:00
gnembon e802b2df6c Merge branch 'master' into 1.16 2020-05-02 14:44:26 -03:00
gnembon 300e963b0b biome and structure calls should only request status they need. 2020-05-02 14:44:11 -03:00
gnembon ef61b396fd Merge branch 'master' into 1.16 2020-05-02 12:47:33 -03:00
gnembon dbb29cbeb9 multiline stings cause tokens to offset incorrectly error messages 2020-05-02 12:47:07 -03:00
gnembon 31a5ea6873 Merge branch 'master' into 1.16 2020-05-01 01:56:20 -03:00
gnembon 460a78f866 spawn_potential 2020-04-30 19:25:59 -03:00
Ghoulboy 4e17f2277e fixed typo (#256)
* fixed typo

* more typo
2020-04-30 08:26:15 -03:00
gnembon c283fddd38 Merge branch 'master' into 1.16 2020-04-30 00:45:35 -03:00
gnembon 2fe5ed615e fog off client command added 2020-04-30 00:44:46 -03:00
gnembon ce4bd4f37f 20w18a 2020-04-29 22:24:24 -03:00
gnembon f04888406d 20w18a-1 2020-04-29 20:45:01 -03:00
gnembon 98f514ffce mapping fixes 2020-04-29 11:49:27 -03:00
gnembon 95a7420e7d Merge branch 'master' into 1.16 2020-04-29 11:41:10 -03:00
gnembon 95d97608c2 added format to editor support files 2020-04-29 11:37:54 -03:00
gnembon 1e9a8726be tweaks to entity API code 2020-04-29 11:32:42 -03:00
gnembon 1aa237379e Merge pull request #241 from Ghoulboy78/modfy
added gamemode and jumping modifications
2020-04-29 10:36:48 -03:00
gnembon dd7c06c034 Merge branch 'master' into 1.16 2020-04-29 01:25:15 -03:00
gnembon 94ffd5b990 rotatorBlock can rotate hoppers, fixes #238 2020-04-29 01:24:54 -03:00
gnembon 434dedc57d 1.3.21 2020-04-29 01:03:39 -03:00
gnembon 07439cf648 detail 2020-04-29 00:53:57 -03:00
gnembon e64f6c87d4 Merge branch 'master' into 1.16 2020-04-29 00:48:26 -03:00
gnembon 7577c475f6 format, fixes #254 2020-04-29 00:48:02 -03:00
gnembon 9e4c27b148 merge fixes 2020-04-28 20:01:46 -03:00
gnembon 5713d2bffc Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/utils/Messenger.java
2020-04-28 19:40:46 -03:00
gnembon 0b72f85474 messenger can parse style 2020-04-28 19:39:13 -03:00
gnembon 5bb5f372b6 scoreboard_remove(obj, key) will remove the key from the objective. Fixes #255 2020-04-28 18:38:56 -03:00