icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,576 Commits 1 Branch 0 Tags
b96a1b12163c6b253caa2abe07106ea23940a246
Commit Graph
216 Commits
Author SHA1 Message Date
gnembon b96a1b1216 Merge branch 'master' into 1.17 2021-05-25 17:25:55 -03:00
gnembon eb927f5e7c Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-05-25 17:24:29 -03:00
gnembon f18cc1c836 more thread safe carpet globs 2021-05-25 17:24:14 -03:00
Keuinandgnembon 0cb20e0795 Allow /player spawn spawn offline-mode player in online server; Code clean-up in /player spawn command (#872) 
* Clean up code in PlayerCommand.spawn and EntityPlayerMPFake.createFake.

* Update src/main/java/carpet/CarpetSettings.java

* Update src/main/java/carpet/commands/PlayerCommand.java

* Update src/main/java/carpet/patches/EntityPlayerMPFake.java

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
 2021-05-25 13:21:59 -03:00
gnembon cab37358ed Merge branch 'master' into 1.17 2021-05-25 00:41:29 -03:00
gnembon db9039c02a added app resources for apps from appstores 2021-05-25 00:41:06 -03:00
gnembon 95d8c5fd90 Merge branch 'master' into 1.17 2021-05-22 22:14:43 -03:00
gnembon dbae5813f0 added framework for auto resource fetching for the apps 2021-05-21 22:31:02 -03:00
gnembon 74cc9a39e1 Merge branch 'master' into 1.17 2021-05-21 14:14:18 -03:00
gnembon 79fb489ab7 renames 2021-05-21 14:13:50 -03:00
gnembon 84dd972758 Merge branch 'master' into 1.17 2021-05-21 04:42:21 -03:00
gnembon 4466c77780 small refactor, customizable appstore, minimize app calls. 2021-05-21 03:50:38 -03:00
gnembon 866f1f1497 moved downloader 2021-05-19 20:46:19 -03:00
Ghoulboy 5f16ffd933 Adding /script download (#826) 
This reverts commit e98adb77a52d1e274ec320e0cafab34b24c1c738.

* First attempt at creating download system...

* Last try, I had uncommitted changes which I forgot to add.

If it fails now i swear imma delete my fork of fabric carpet.

* OK, this is the last chance. I have checked and double checked, this should not fail.

Todo make them more detailed, Im not the best person to do that tbh...

* Towards a suggestion builder

(Also committing stuff in ScriptDownloader incase it crashes)

* Finished first theoretically functional draft of suggestion builder

* improving suggestion building with actual github api

* Collapsing identical error messages

* Got suggestions to work!

Now gotta get the actual file to save to disk properly

* replacing whitespace with url whitespace to make it read form 'creativ building tools' etc

* Successfully downloaded script into folder location!

* only clients can access global scripts folder, so don't want to cause error message

* Compacting code and updating docs

* Fixed getting folders from file names
 2021-05-19 17:30:39 -03:00
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 5ac22aa000 mapping 2021-05-05 01:50:04 -03:00
gnembon 0367170bac Merge branch 'master' into 1.17 2021-04-29 02:17:17 -03:00
gnembon 06c9aea326 tracking module integrity when module composition changes 2021-04-29 02:17:02 -03:00
gnembon b84478e7db 21w17a 2021-04-28 17:05:42 -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 d6d3167bcf hopper counters pretty 2021-04-15 03:06:32 -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 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 f0d044a49f added scarpet to the carpet profiler 2021-04-04 22:32:34 -03:00
gnembon 51a548991d reword to properly reflect what up. fixes #761 2021-04-04 20:56:50 -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 1bd6dcbf12 rework on shapes. Labels are showing up, but lines don't. 2021-03-16 15:31:58 -03:00
gnembon 42f78a596a 20w10a 
- broken scarpet shapes
 2021-03-10 23:13:59 -04:00
gnembon 9fb43b6095 mappings 2021-03-02 08:52:32 -04:00
gnembon 34bfe32e39 Merge branch 'master' into 1.17 2021-03-02 08:48:46 -04:00
gnembon 84797bef0e restrict player placement to buildable area. 2021-02-25 21:59:36 -04:00
gnembon 71a8dcc31e Merge branch 'master' into 1.17 2021-01-26 05:42:20 -04:00
gnembon 58b6974369 fixing so that the player option in /log is accessible. 2021-01-26 04:25:57 -04:00
gnembon ed4afa15ff Merge branch 'master' into 1.17 2021-01-07 00:41:15 -04: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 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 0bacbcc2f5 Merge branch 'master' into 1.17 2020-12-02 13:23:32 -04:00
gnembon d29f49967f rework of the event system, allowing apps to function more independently and allowing for player scoped apps to handle global events. fixes #596 2020-12-02 01:02:36 -04:00
gnembon 253604b34a Merge branch 'master' into 1.17 2020-11-25 02:12:41 -04:00
gnembon 209c3b9262 fixed issues with reload and missing command handler 2020-11-24 22:52:05 -04:00
gnembon c8d3f01f78 Merge branch 'master' into 1.17 2020-11-23 02:40:16 -04:00
gnembon a297fd1441 Scarpet rules can provide multinary boolean permission level, fixes #572 2020-11-23 02:35:01 -04:00
gnembon 091a4deadc Merge branch 'master' into 1.17 
# Conflicts:
#	src/main/java/carpet/script/value/ValueConversions.java
 2020-11-22 21:59:57 -04:00
gnembon 190d17d1fe fixes NPE when summoning a player with a banned account. 2020-11-22 21:47:32 -04:00