icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,411 Commits 1 Branch 0 Tags
9120aae313470d68e4f2b7c6702d996472b4eb4d
Commit Graph
2411 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
gnembon 9120aae313 Merge branch 'master' into 1.17 
# Conflicts:
#	src/main/java/carpet/script/api/Auxiliary.java
 2021-04-18 01:50:29 -03:00
gnembon 0e84ef5d65 Merge pull request #750 from replaceitem/display-title-additions 
Added player_list option to display_title()
 2021-04-18 01:36:49 -03:00
replaceitem eaa242c8eb Added option to only set footer, and clear both 2021-04-17 12:33:31 +02:00
replaceitem a106f2611f Update docs 2021-04-17 11:48:05 +02:00
replaceitem 53fc6fab9c Removed 'motd' 2021-04-17 11:47:53 +02:00
replaceitemandgnembon 794a80e4d4 update exception 
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
 2021-04-17 11:42:02 +02:00
replaceitemandgnembon fad68163c2 player_list 
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
 2021-04-17 11:41:33 +02:00
replaceitemandgnembon 472e1be663 replace 'header' with 'player_list' 
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
 2021-04-17 11:41:15 +02:00
gnembon 587e04c8db 1.17 update 2021-04-17 01:56:37 -03:00
gnembon 8f2c935fe6 Merge branch 'master' into 1.17 
# Conflicts:
#	src/main/java/carpet/network/ClientNetworkHandler.java
#	src/main/resources/assets/carpet/scripts/ai_tracker.sc
 2021-04-17 01:37:40 -03:00
gnembon 3e24c24648 silenced obtrusive log message with custom biomes. Fixes #810 2021-04-17 00:47:12 -03:00
gnembon 4e5184009d incorrect carpet data shoudn't crash the client. Fixes #812 2021-04-17 00:35:47 -03:00
gnembon 38285d4221 running functions will cause them not track the commandsource. fixes #815 2021-04-17 00:29:13 -03:00
gnembon 18705e44ba fixed distance_beta app 2021-04-16 23:23:42 -03:00
gnembon f517d2b79d Merge pull request #741 from Ghoulboy78/distance_beta-upgrade 
Update distance_beta.sc
 2021-04-16 23:08:19 -03:00
gnembon 6ef85437a9 fixed ai_tracker commands 2021-04-16 23:07:00 -03:00
gnembon 0fd7057138 Merge pull request #739 from Ghoulboy78/ai_tracker-upgrade 
Update ai_tracker.sc
 2021-04-16 22:51:00 -03:00
gnembon d0fa948a46 Merge branch 'master' into 1.17 2021-04-16 13:02:12 -03:00
gnembon df26e9853a fixed camera's commands 2021-04-16 12:34:11 -03:00
gnembon 0cd717023b Merge pull request #814 from Fallen-Breath/fix-745 
Fixed #745 (Fake Players take no knockback)
 2021-04-16 11:50:02 -03:00
Fallen_Breath 0f051cb4f7 Fixed #745 2021-04-16 11:06:40 +08:00
gnembon 9a6b598e48 taste the rainbow 2021-04-15 14:59:12 -03:00
gnembon 0dd88cd1dc Merge branch 'master' into 1.17 
# Conflicts:
#	src/main/java/carpet/utils/WoolTool.java
 2021-04-15 14:49:17 -03:00
gnembon 14263203c5 taste the rainbow 2021-04-15 14:47:58 -03:00
gnembon d6d3167bcf hopper counters pretty 2021-04-15 03:06:32 -03:00
gnembon a1e0cfbc69 naming 2021-04-14 22:49:06 -03:00
GhoulboyGhoulboy78gnembon
 		b7252a3465 Fixing small issues (#717) 
* adding unix_time and convert_dat eto editor autocomplete

I never used it, and only realised rn when I needed it.

* updating npp docs too

* Fixes #690

Fixes #690

* Fixes #687

Fixes #687

* fixes #672

* adding comma to make it look gooder

* Update src/main/java/carpet/helpers/HopperCounter.java

* using alias to shorten code

* compacting wool code

* Fixing minor todos

* removing hit/hand garbage

* removing scoreboards garbage

* making sure I dont edit file accidentally

* fixing borken code and problem with pink and magenta showing same colour

* Change name of mod to, you know, actually be the name of the mod

* Reverting previous change because it is more descriptive of the actual mod

* Update src/main/java/carpet/script/api/WorldAccess.java

Co-authored-by: Ghoulboy78 <ghoulboy78@gmail.com>
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
 2021-04-14 22:47:14 -03:00
gnembon eff3a1734e Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-04-14 21:19:26 -03:00
gnembon 6f13b9068e running execute store had no effect, fixes #809 2021-04-14 21:19:10 -03:00
github-actions[bot] 4e10eaa5da Merge docs for 'Carpet Mod 1.4.32 for Minecraft 1.16.5 and Minecraft 21w15a' 2021-04-14 18:32:19 +00:00
gnembon 2612dff497 Merge branch 'master' into 1.17 2021-04-14 15:07:15 -03:00
gnembon d3295e6b4e 21w15a 2021-04-14 15:07:08 -03:00
gnembon 1a96737cff 1.4.32 2021-04-14 14:35:49 -03:00
gnembon cc3723ae12 mapping 2021-04-13 19:54:23 -03:00
gnembon 2cc2101934 Merge branch '1.17' of https://github.com/gnembon/fabric-carpet into 1.17 2021-04-13 10:48:40 -03:00
replaceitemandgnembon c878ffd637 Added renewableDeepslate (#806) 
* Added renewableDeepslate

* Check for stillness

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
 2021-04-13 10:44:49 -03:00
gnembon b7cb73d38b Merge branch 'master' into 1.17 2021-04-13 09:10:06 -03:00
gnembon 51db851096 docs 2021-04-13 09:03:24 -03:00
BisUmTo 58436fc022 More datapack examples (#805) 
* Update Auxiliary.md

* Fixed players() TYPO
 2021-04-13 08:55:58 -03:00
gnembon 3d4fa6ae89 Merge branch 'master' into 1.17 2021-04-13 01:23:22 -03:00
gnembon f2721ab87a custom events backend, and entity attribute query. 2021-04-13 01:22:50 -03:00
gnembon 8ed4561a98 Merge branch 'master' into 1.17 
# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
 2021-04-12 14:26:22 -03:00
gnembon 40869ef9bf moved custom arguments to before the commands and handled missing functions nicely. 2021-04-12 14:24:10 -03:00
gnembon 92cc545896 less restricting use of shapes 2021-04-12 07:57:04 -03:00
replaceitem 396e844dce Merge branch 'master' into display-title-additions 2021-04-11 21:21:46 +02:00
gnembon ffcc269f3a Merge branch 'master' into 1.17 2021-04-10 15:09:14 -03:00
gnembon cd9a5b96c2 fix superhot not working on singleplayer when riding stuffs 2021-04-10 14:53:48 -03:00
gnembon 37a6913e72 mark off unnecessary iface 2021-04-10 02:19:24 -03:00
gnembon ba38080208 Merge branch 'master' into 1.17 2021-04-09 01:44:08 -03:00
gnembon c264011646 cleanup 2021-04-09 01:43:54 -03:00