gnembon
fb40120460
cluenap
2021-05-13 02:00:05 -03:00
gnembon
65447f09ad
Merge branch 'master' into 1.17
...
# Conflicts:
# src/main/java/carpet/helpers/FeatureGenerator.java
2021-05-13 01:52:08 -03:00
gnembon
495a22ca0c
fix concurrentModifications from Java 16
2021-05-13 01:50:29 -03:00
gnembon
727bdd7b1a
21w19a
2021-05-12 23:40:09 -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
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
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
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
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
5dd2a12aa7
mapping
2021-04-02 18:38:55 -03:00
gnembon
0320de5d6d
21w13a
2021-03-31 22:02:09 -03:00
gnembon
ab553187c5
its a doozie
2021-03-24 10:35:52 -03:00
gnembon
42f78a596a
20w10a
...
- broken scarpet shapes
2021-03-10 23:13:59 -04:00
gnembon
170fd9d762
mappings
2021-03-09 20:06:29 -04:00
gnembon
34bfe32e39
Merge branch 'master' into 1.17
2021-03-02 08:48:46 -04:00
gnembon
ec25bf4032
Should fix NPE when blowing stuff up, fixes #728
2021-03-02 00:04:05 -04:00
gnembon
2cf403057c
21w08a
...
- rework on handling /log packets
- rework on player attack and interaction with entities
- rework display_title (need recheck)
- rework packets for structure blocks
2021-02-24 18:25:16 -04:00
gnembon
257aca4254
mappings
2021-02-09 00:16:07 -04:00
gnembon
50eae09c17
21w05a
2021-02-03 20:15:45 -04:00
gnembon
b14cf288a1
mappings
2021-01-15 04:51:06 -04:00
gnembon
ed4afa15ff
Merge branch 'master' into 1.17
2021-01-07 00:41:15 -04:00
altrisi
e38e8f74ea
Better javadoc for #deeplyFrozen()
2020-12-29 16:17:59 +01:00
altrisi
6d3ac93e4c
Use setters and getters for frozen state, separate superHot and
...
don't tick regular tick events
2020-12-29 16:00:07 +01:00
altrisi
33347baaf7
Freezing Scarpet
...
And the client
2020-12-21 00:14:20 +01:00
gnembon
00ad9eccc7
mappings
2020-12-14 02:51:01 -04:00
gnembon
947474e9e9
Merge branch 'master' into 1.17
2020-12-07 22:13:45 -04:00
altrisi
bf9aa3207a
Fix optimizedTNT entity behaviour ( #617 )
...
Fixes gnembon#616
2020-12-07 17:30:04 -04:00
gnembon
d580399368
fix
2020-12-04 00:40:02 -04:00
gnembon
b2bde4b836
Merge branch 'master' into 1.17
2020-12-04 00:39:18 -04:00
gnembon
4b0fd8296c
player selects hotbar slot, fixes #557
2020-12-03 22:40:16 -04:00
gnembon
5422493c33
20w49a
2020-12-02 19:22:56 -04:00
gnembon
4f7ebdd9ff
Merge branch 'master' into 1.17
2020-11-28 12:13:07 -04:00
gnembon
083d2a7f2e
plop with no args returns all available structures and features.
2020-11-28 01:44:16 -04:00
gnembon
ede1872803
Merge branch 'master' into 1.17
2020-11-16 21:35:21 -04:00
gnembon
b00b5772c9
player doesn't attack in continuous and fixed event suggestions fixes #552 .
2020-11-16 20:02:47 -04:00
gnembon
be3cb35f75
Merge branch 'master' into 1.17
2020-11-11 02:08:05 -04:00
gnembon
0e1a152510
this seems to also be true.
2020-11-09 23:07:05 -04:00
gnembon
a40b8ff0cc
fixed player use timings
2020-11-09 20:39:45 -04:00
gnembon
ed30bcad7c
Merge branch 'master' into 1.17
2020-11-09 03:05:02 -04:00
gnembon
083792ae96
player fixes
2020-11-08 01:22:59 -04:00
gnembon
d48896ad8b
mappings. More colors and materials
2020-11-06 23:10:43 -04:00
gnembon
2cdea92da7
20w45a
2020-11-06 00:06:53 -04:00
altrisi
2b4a381221
Add rotation to all instances of PillarBlock
...
Logs, hay bales, actual pillars, etc
2020-10-27 22:48:26 +01:00
gnembon