mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-08-30 00:57:55 +00:00
Code Issues Releases Wiki Activity
2,365 Commits 22 Branches 252 Tags
4bf071a32928dad5c847f328a8b65bd6e6f4c5c9
Commit Graph

2365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Coates
74752c561c Correctly extract parse errors from build reports 2021-07-18 16:17:11 +01:00
Jonathan Coates
ee96458b56 Merge pull request #862 from Angalexik/typo 
Fix typo in paintutils documentation
 2021-07-18 12:16:19 +01:00
Angalexik
333410e4cd Fixed typo in paintutils documentation 2021-07-18 12:37:16 +02:00
Jonathan Coates
999a39a3e6 Merge branch 'mc-1.15.x' into mc-1.16.x 2021-07-15 13:05:31 +01:00
Jonathan Coates
82ca19c296 Add type check for http.checkURL 2021-07-15 13:04:44 +01:00
Jonathan Coates
56d8a5d585 Don't update block states when there is no world 
Fixes #856
 2021-07-15 12:13:38 +01:00
Jonathan Coates
aa5fbb2980 Use heap buffers rather than direct ones 
Closes #855, even if it doesn't really fix it.
 2021-07-15 11:55:52 +01:00
Jonathan Coates
db0bb071f5 Add motd for file uploading 2021-07-15 10:58:52 +01:00
Jonathan Coates
ab702e2ba1 Correctly render turtles' selected slot 
We had the wrong texture bound, which meant nothing was being rendered!

Fixes #852
 2021-07-15 10:58:40 +01:00
SkyTheCodeMaster
d4efacd40a Turn a nil to a string 
Makes a `nil` a string inside of an expect in `define`, allowing `nil` to be passed.
 2021-07-15 10:54:30 +01:00
Jonathan Coates
347affcc5c Merge pull request #859 from emiliskiskis/patch-1 
Fix typo in turtle.craft documentation
 2021-07-12 14:31:28 +01:00
Emilis Kiškis
8ebe34b8da Fix typo in turtle.craft documentation 
Description wrote "to craft sticks, slots should contain sticks", whereas it should say "planks" in the second part.
 2021-07-11 11:03:41 +03:00
Merith
fbe28dc51a update dep versions, actual compile errors yay! 2021-07-11 02:09:43 +00:00
Merith
14e013d075 move remappedSrc to src/main/java 2021-07-11 01:40:01 +00:00
Merith
9bc4e9530c gradle=7.1.1, gradle migrateMappings 2021-07-11 01:33:21 +00:00
Merith
cbff505297 Merge pull request #67 from 3prm3-Org/readme 
Fix the badge with a different method using camo.githubusercontent.com
Closes #68
 2021-07-10 08:04:07 -07:00
Jonathan Coates
7086cb8a02 Merge pull request #848 from SkyTheCodeMaster/patch-3 
Turn a nil to a string
 2021-07-05 06:16:05 +01:00
SkyTheCodeMaster
8dbc930c2f Turn a nil to a string 
Makes a `nil` a string inside of an expect in `define`, allowing `nil` to be passed.
 2021-07-04 20:54:55 -04:00
Jonathan Coates
61eb67849d Some fs examples 
See #566
 2021-07-03 14:05:41 +01:00
Jonathan Coates
c2316ef256 Publish docs from 1.16 instead 2021-07-02 21:49:42 +01:00
Jonathan Coates
0d22270f8b Publish docs from 1.16 instead 2021-07-02 21:49:19 +01:00
Jonathan Coates
abb9c14256 Bump Forge Gradle version 2021-07-02 21:48:28 +01:00
Jonathan Coates
815e534dc6 Merge branch 'mc-1.15.x' into mc-1.16.x 2021-07-02 21:03:39 +01:00
Jonathan Coates
51dde077fe And there was me thinking I understood Gradle 2021-06-29 09:08:45 +00:00
Jonathan Coates
31d0b7afcd Some further fixes to previous commit 
Did NOT mean to push that
 2021-06-28 23:20:54 +01:00
Jonathan Coates
95b0d950aa Couple of gradle fixes 2021-06-28 23:07:36 +01:00
Jonathan Coates
efa2be2821 Update changelog for 1.16.x-only features v1.16.5-1.97.0 2021-06-28 22:58:13 +01:00
Jonathan Coates
670db97fc7 Merge branch 'mc-1.15.x' into mc-1.16.x 2021-06-28 22:52:05 +01:00
Jonathan Coates
1650b72edb Prepare for 1.97.0 release v1.15.2-1.97.0 2021-06-28 22:52:01 +01:00
Jonathan Coates
a5bca3f0df File uploading (#840) 2021-06-28 22:49:45 +01:00
Jonathan Coates
88f41314c7 Make io handles opaque to the docs 
Yep, this is kinda gross. But also a nice refactor
 2021-06-28 22:47:56 +01:00
Jonathan Coates
5ef8d52c13 Merge branch 'mc-1.15.x' into mc-1.16.x 2021-06-28 18:37:24 +01:00
Jonathan Coates
0b65d56ab0 Prevent some files from being eol converted 
Closes #813

Well, hopefully. This hasn't been tested, as I don't have easy access to
Windows.
 2021-06-28 18:16:30 +01:00
Jonathan Coates
a256b70685 Allow setting the subprotocol header 
Fixes #828, closes #829
 2021-06-24 20:48:28 +01:00
Jonathan Coates
f16d1499fe Woops 2021-06-24 09:07:22 +00:00
Jonathan Coates
79ca851e4f Like I said, 'there may be a few of these' 2021-06-24 08:34:38 +00:00
Jonathan Coates
d5c54d64a6 Hopefully fix the bug report template 
There may be a few of these commits :D:.
 2021-06-24 08:32:57 +00:00
Jonathan Coates
5cfdd2339f Try the new issue template system 2021-06-24 08:32:18 +00:00
Jonathan Coates
3ab3213290 Try the new issue template system 2021-06-24 08:31:41 +00:00
ƐqɿmƐ
c4aef2d4c7 Merge branch 'Merith-TK:fabric' into readme 2021-06-23 14:24:40 -07:00
ƐqɿmƐ
2ed6692f76 Fix the curseforge badge via githubusercontent 
Replace the svg with https://camo.githubusercontent.com/07622e6662ef5ead080c4840ef6514a34e079d63015f7e51c977a55b1881dfb9/687474703a2f2f63662e776179326d7563686e6f6973652e65752f7469746c652f63632d726573746974636865642e737667
 2021-06-23 14:22:24 -07:00
Jonathan Coates
46c9840d00 Merge pull request #842 from Lupus590-CC/fix-extra-,-in-expect 
remove extra ,
 2021-06-23 15:22:08 +01:00
Lupus590
b3f2f14e96 remove extra , 2021-06-23 15:14:01 +01:00
Merith
f075eabc32 Merge pull request #66 from 3prm3-Org/readme 
Fix curseforge svg, use new cc: restitched url
 2021-06-22 19:44:41 -07:00
ƐqɿmƐ
3d1c9d1667 Fix curseforge svg, use new cc: restitched url 
Make the curseforge svg visible rather than being a broken svg by switching to id
 2021-06-22 19:33:03 -07:00
Jonathan Coates
3ace49d27f Remove config option for debug API 
And also remove the "is present" guards within the various APIs. I'm
happy at this point that debug is safe, and think we can guarantee its
presence.
 2021-06-22 21:01:05 +01:00
Jonathan Coates
9bd662d8dc Fix CraftTweaker actions being applied twice 
By default CT applies them on the client and server. In a single player
world, this means we try to create two upgrades, which obviously fails!

Fixes #721
 2021-06-22 19:39:46 +01:00
Jonathan Coates
df7a40354e Merge branch 'mc-1.15.x' into mc-1.16.x 2021-06-19 15:18:12 +01:00
Jonathan Coates
c489d4bc4f Fix exiting paint typing "e" in the shell 
When exiting paint via the keyboard by typing "Ctrl" then "E"
separately, we consume the "key" event within paint, leaving the shell
to consume "read".

To avoid this, we run a sleep(0) to gobble any other left-over events.

Note, it's generally not enough to run a queueEvent/pullEvent here, as
the char event may not have ended up on the queue yet. Alas, as this
solution is pretty ugly.
 2021-06-19 15:13:26 +01:00
Jonathan Coates
2b029bd506 Refactor some computer screen logic 
- Move some shared Gui{Computer,Turtle} code into a new class. Using
   entirely different naming conventions because of course (they are
   consistent with MojMap, just not the rest of CC:T).
 - Fix some mouse scaling issues in the terminal.
 2021-06-19 14:18:12 +01:00