mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-08-31 17:47:56 +00:00
Code Issues Releases Wiki Activity
2,361 Commits 22 Branches 252 Tags
be842f2a33438c0d15ba25dadd490e1f38fed192
Commit Graph

2361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
96d3b27064 Translations for Korean 
Co-authored-by: E. Kim <mindy15963@naver.com>
 2021-11-23 19:43:15 +00:00
Jonathan Coates
f33f57ea35 Allow generic peripherals to specify a custom source 
- Add a new GenericPeripheral interface. We don't strictly speaking
   need this - could put this on GenericSource - but the separation
   seems cleaner.

 - GenericPeripheral.getType() returns a new PeripheralType class, which
   can either be untyped() or specify a type name. This is a little
   over-engineered (could just be a nullable string), but I'm planning
   to allow multiple types in the future, so want some level of
   future-proofing.

 - Thread this PeripheralType through the method gathering code and
   expose it to the GenericPeripheralProvider, which then chooses an
   appropriate name.

   This is a little ugly (we're leaking information about peripherals
   everywhere), but I think is fine for now. It's all private internals
   after all!

Closes #830
 2021-11-22 18:05:13 +00:00
Jonathan Coates
070479d901 Make executeMainThreadTask a default method 
- Move TaskCallback into the API and make it package private. This
   effectively means it's not an API class, just exists there for
   convenience reasons.
 - Replace any usage of TaskCallback.make with
   ILuaContext.executeMainThreadTask.
 - Some minor formatting/checkstyle changes to bring us inline with
   IntelliJ config.
 2021-11-21 11:19:02 +00:00
Jonathan Coates
2fe40f669d Don't send packets when the server is stopping 
Fixes #956
 2021-11-20 23:20:27 +00:00
Jonathan Coates
1b39c9f470 Bump various package versions 2021-11-20 23:20:12 +00:00
Merith
ed9e823f3f update version number for new release v1.97.2 2021-11-17 13:19:25 -08:00
Weblate
814d5cbcd1 Translations for Italian 
Co-authored-by: Alessandro <ale.proto00@gmail.com>
 2021-11-17 14:24:23 +00:00
Anavrins
4d8862c78e Optimize peripheral calls in rednet.run (#954) 2021-11-14 06:57:47 +00:00
Weblate
6cc2f035db Translations for Japanese (ja_jp) 
Co-authored-by: MORIMORI0317 <morimori.0317@outlook.jp>
 2021-11-13 06:24:20 +00:00
Merith
2b8fea5b35 Merge pull request #20 from Wiggles1305/Wiggles1305-patch-1 
Recipe parity with CC: Tweaked
 2021-11-11 18:30:31 -08:00
Zachbutwithak
b3e6b4c29a Recipe parity with CC: Tweaked 2021-11-11 18:08:09 -08:00
Merith
c94ff68e7f Merge pull request #19 from Wiggles1305/1.17.1 
Fix en_us.json
 2021-11-11 17:19:22 -08:00
Wiggles1305
3fb96a3438 Added to en_us.json 
Added "upgrade.minecraft.netherite_pickaxe.adjective": "Netherite Mining", because apparently there is a netherite pickaxe mining turtle
 2021-11-11 14:53:17 -08:00
Jonathan Coates
cf3f1d3d48 Add correct tool to CC computers 
Also rerun data generators, forgot to do it as part of the previous
commit.

Fixes #953
 2021-11-03 09:40:30 +00:00
Jonathan Coates
bca964629a Merge branch 'mc-1.16.x' into mc-1.17.x 2021-11-03 09:34:21 +00:00
Merith
7a2b7c0701 Merge pull request #13 from 3prm3/1.17.1 
Added links to ever instance of Fabric.
 2021-10-31 12:47:28 -07:00
Merith
fa7a731ad1 Merge pull request #14 from joecharamut/1.17.1 
Fix drag-and-drop file uploading
 2021-10-31 12:45:18 -07:00
Joseph Charamut
8be48ebcf0 Fix drag-and-drop file uploading 2021-10-31 10:55:50 -04:00
ƐqɿmƐ
123f3abcaa Added links to ever instance of Fabric. 
Also capitalized the word "Forge".
 2021-10-30 11:21:58 -07:00
Merith
9f2e43f00a Merge pull request #9 from joecharamut/1.17.1 
Force Jitpack to actually use Java 16 instead of Java 8
 2021-10-28 10:22:25 -07:00
Merith
9fb35b2799 Merge pull request #11 from ga2mer/1.17.1 
Wired Modem/Cable breaking and creative picking of sided modem and cable
 2021-10-28 10:10:36 -07:00
Nikita Savyolov
272572dbf2 fix: creative picking sided modem/cable 2021-10-28 01:10:47 +03:00
Nikita Savyolov
702e4fc787 fix: correct (maybe) modem properties 
something changed in 1.17 and the modem now slowly breaks with hand or pickaxe, so we set this manually
 2021-10-28 01:08:31 +03:00
Jonathan Coates
ea7a218f4a Make turtle breaking a little more data driven 
- Allow any tool to break an "instabreak" block (saplings, plants,
   TNT). Oddly this doesn't include bamboo or bamboo sapings (they're
   marked as instabreak, only to have their strength overridden again!),
   so we also provide a tag for additional blocks to allow.

 - Hoes and shovels now allow breaking any block for which this tool is
   effective.

 - Use block tags to drive any other block breaking capabilities. For
   instance, hoes can break pumpkins and cactuses despite not being
   effective.

This should get a little nicer in 1.17, as we can just use block tags
for everything.
 2021-10-27 19:32:58 +01:00
Merith
511327effe Merge pull request #10 from 3prm3/1.17.1 
Fixed grammar errors like your/you're added a link.
 2021-10-27 08:44:12 -07:00
ƐqɿmƐ
940e35caea Fixed grammar errors like your/you're added a link. 2021-10-26 19:14:04 -07:00
Joseph Charamut
fca01693dd Update jitpack.yml 2021-10-26 21:21:31 -04:00
Joseph Charamut
8846a3f36f Create jitpack.yml 2021-10-26 21:19:36 -04:00
Merith
8002c9e932 Merge pull request #2 from ga2mer/1.17.1 
Mainly WiredModem/Cable fixes
 2021-10-26 13:29:33 -07:00
Jonathan Coates
544bcaa599 Clear the entity drop list as well as cancelling 
Fixes #940
 2021-10-24 19:11:21 +01:00
Nikita Savyolov
6fd8331e94 fix: BlockCable removedByPlayer 2021-10-18 21:47:43 +03:00
Nikita Savyolov
7a667b9028 fix: correct cable with wired modem highlight 
The right thing would be to fix Mixin, just like it is done in Forge, but I think that's enough for now
 2021-10-18 21:45:33 +03:00
Nikita Savyolov
67b7cd7a14 fix: wired modem direction 2021-10-17 21:10:10 +03:00
Nikita Savyolov
960d79803d fix: MixinWorld more correct height check 
I think this Mixin need to be revisiting
 2021-10-17 21:08:48 +03:00
Jonathan Coates
ab6b861cd6 Move repo to cc-tweaked org 
Let's see how this goes.
 - Update references to the new repo
 - Use rrsync on the server, meaning make-doc.sh uploads relative to the
   website root.
 - Bump Gradle wrapper to 7.2. Not related to this change, but possibly
   fixes running under Java 16. Possibly.
 2021-10-17 18:14:32 +01:00
Merith-TK
43ef36fa15 Update links to repo 2021-10-15 16:08:55 -07:00
Merith
f037d9539e update to beta-1 2021-10-14 06:35:57 +00:00
Merith
a3b2f7b5bd please the linter 
fix excess whitespace in readme
 2021-10-13 23:25:52 -07:00
Merith
0859145d18 Merge pull request #80 from joecharamut/1.17.1 
Fix NPE when activating piston
 2021-10-13 23:25:14 -07:00
Joseph Charamut
f6e4122f7f Fix NPE when activating piston 2021-10-14 01:33:12 -04:00
Merith
8e4023fdbc please the linter 
pleasing the linter
 2021-10-13 17:40:28 -07:00
Merith
f10818ec6b update readme 2021-10-13 19:35:37 +00:00
Jonathan Coates
72e8fc03d3 Fix upload bandwidth limit not being set 
Lol, woops.
 2021-10-13 17:56:12 +01:00
Jonathan Coates
0e94355a85 Some post-1.17 cleanup 
- Fix broken Javadoc references
 - Apply a couple of refactoring suggestions from IDEA
 2021-10-13 17:46:29 +01:00
Merith
bc2358489b Merge pull request #78 from ga2mer/1.17-alpha 
fix: more correct mouseReleased event
V1.97.1-beta 		2021-10-12 09:23:55 -07:00
Nikita Savyolov
6e5e682e3a fix: more correct mouseReleased event 
WidgetTerminal still calls mouseReleased on every container click instead of terminal only (like Forge does)
 2021-10-12 19:14:03 +03:00
Merith
02c63ce7e8 update version number 2021-10-12 16:10:27 +00:00
Jacob Farley
fd24d89f89 my bad 2021-10-11 19:12:07 -05:00
Jacob Farley
685d33a2dd fix github actions 2021-10-11 19:09:41 -05:00
Jacob Farley
ca40c9cf19 needs further testing, but presumably fixes #55 2021-10-11 18:26:20 -05:00