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
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
replaceitem and gnembon
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
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
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
9702262787
Merge pull request #801 from altrisi/exception-constructor-inheritance
...
Chain an exception's constructor
2021-04-07 21:25:45 -03:00
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
github-actions[bot]
8373a4611d
Merge docs for 'Carpet Mod 1.4.31 for Minecraft 1.16.5 and Minecraft 21w14a'
2021-04-07 19:23:15 +00: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
altrisi
5247bb15a8
Inherit an exception's constructor
2021-04-06 22:33:26 +02: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