icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,318 Commits 1 Branch 0 Tags
2b1bb9652bd17f2f587fd1a4bc048436ea39bf7e
Commit Graph
915 Commits
Author SHA1 Message Date
gnembon b80b555781 Merge branch 'master' into 1.17 
# Conflicts:
#	src/main/java/carpet/script/utils/SnoopyCommandSource.java
#	src/main/java/carpet/utils/WoolTool.java
 2021-05-18 21:23:15 -03:00
Ghoulboyandgnembon 7536edc2b9 Adding Javadocs to CounterCommand.java and relevant files (#838) 
* adding class javadoc

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
 2021-05-17 19:32:57 -03:00
gnembon 727bdd7b1a 21w19a 2021-05-12 23:40:09 -03:00
gnembon dfa826bb24 21w18a 2021-05-05 20:34:59 -03:00
gnembon 5ac22aa000 mapping 2021-05-05 01:50:04 -03:00
gnembon b84478e7db 21w17a 2021-04-28 17:05:42 -03:00
gnembon 99e8db192a mappings 2021-04-28 01:42:49 -03:00
gnembon 988357317a Merge branch 'master' into 1.17 2021-04-26 23:29:27 -03:00
Ghoulboy 164122eba2 Adding query player language (#824) 2021-04-26 21:38:29 -03:00
gnembon e8ab5f0d50 Merge branch 'master' into 1.17 2021-04-25 00:50:22 -03:00
gnembon 33c0cc6979 damage can also be reported if its == 0. Might be useful 2021-04-25 00:50:06 -03:00
gnembon e8f135872d fixes #827 2021-04-22 08:41:27 -03:00
gnembon fc87053978 21w16a 2021-04-21 20:12:44 -03:00
gnembon cd6827767a Merge branch 'master' into 1.17 2021-04-21 18:42:50 -03:00
gnembon 72a3d74a97 extremeBehaviours let wither spawn charged skulls at 10%, not 0.1% 2021-04-20 17:35:41 -03:00
gnembon 8870c245ff mapping 2021-04-20 00:09:00 -03: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 d0fa948a46 Merge branch 'master' into 1.17 2021-04-16 13:02:12 -03:00
Fallen_Breath 0f051cb4f7 Fixed #745 2021-04-16 11:06:40 +08:00
gnembon d3295e6b4e 21w15a 2021-04-14 15:07:08 -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 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
gnembon 93c989e2b6 added create_explosion and more event handlers. 2021-04-09 01:42:57 -03:00
gnembon 388a3de577 Merge branch 'master' into 1.17 
# Conflicts:
#	src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java
#	src/main/java/carpet/script/api/WorldAccess.java
 2021-04-09 01:40:38 -03:00
gnembon e063748e83 added create_explosion and more event handlers. 2021-04-09 01:38:00 -03:00
BisUmToJames103gnembon
 		7b00952653 Added onExplosion Scarpet Event (#620) 
* Added onExplosion Scarpet Event

* Reverted changes to Full.md

* Grammar corrections by James103

Co-authored-by: James103 <37945304+James103@users.noreply.github.com>

* Separated Explosion Mixins

Applied Ghoulboy78 suggestion.
WARNING: 'blocks' list is now empty if 'explosionNoBlockDamage' carpet rule is set to 'true'

* List Value from Triple

Suggested by Gnembon

* Explosion Mixin priority

Suggestion by Gnembon

* Added affectedEntities parameter

* Updated docs

* Optimizing calls

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

* Update docs/scarpet/api/Events.md

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>

* Update docs/scarpet/api/Events.md

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>

* Update src/main/java/carpet/mixins/Explosion_scarpetEventMixin.java

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>

Co-authored-by: James103 <37945304+James103@users.noreply.github.com>
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
 2021-04-08 18:05:13 -03:00
gnembon 75a823f994 mapping 2021-04-07 19:05:45 -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 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 00f932bafc Can place skulls inside when creativeNoClip. Fixes #775 2021-04-04 18:28:25 -03:00
gnembon da2873de52 Merge branch 'master' into 1.17 2021-04-03 20:31:35 -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 0320de5d6d 21w13a 2021-03-31 22:02:09 -03:00
gnembon b49b99aea6 21w11a mappings 2021-03-31 19:20:44 -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 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 f8208c8334 fixed commands disappearing when using datapack command or create_datapack 2021-03-18 18:54:15 -03:00
gnembon 7d135187b1 fixed shapes for 1.17 rendringo 2021-03-18 00:37:05 -03:00