AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 19:25:20 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,543 Commits 29 Branches 143 Tags
Commit Graph

3543 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
164a501f38 Cleanup in fs access sound stuff. 2014-09-20 07:02:19 +02:00
Florian Nücke
aed8c63079 Guess what. Starts with an "r". 2014-09-19 20:31:03 +02:00
Florian Nücke
b464e816c6 More refactoring. 2014-09-19 20:17:37 +02:00
Florian Nücke
0005aac05f Added parameter for file system creation to pass along name of sound effect to play when file system is being accessed. 2014-09-19 20:14:22 +02:00
Florian Nücke
5d908fce55 Massive API refactoring. 2014-09-19 19:54:44 +02:00
Florian Nücke
2f8dca2643 Some more 1.4 API adjustments. 2014-09-19 18:29:52 +02:00
Florian Nücke
11ccc8898c Changed slot in API to use string instead of enum and general cleanup. 2014-09-19 18:03:52 +02:00
Florian Nücke
3a0d895392 Splitting up delegates into separate, real blocks. 2014-09-19 16:38:37 +02:00
Florian Nücke
326858ff56 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-09-19 11:41:07 +02:00
Florian "Sangar" Nücke
40595750c4 Merge pull request #29 from NixillUmbreon/master 
Update OpenComponents.java to add @NetworkMod
 2014-09-18 23:26:10 +02:00
NixillUmbreon
a12ef2f467 Update OpenComponents.java to add @NetworkMod 
Removes the client side requirement of the mod when the server contains it
 2014-09-18 17:21:55 -04:00
Florian "Sangar" Nücke
b96f93cfdf Merge pull request #572 from natedogith1/master 
Fixed some docstrings on debug card callbacks.
 2014-09-18 04:01:39 +02:00
natedogith1
48bfa71c31 Update DebugCard.scala 
Fixed a few of the Callback docs
 2014-09-17 21:00:56 -04:00
Florian Nücke
e75b25c06e Made tractor beam upgrade work in tablets and added pfx. 2014-09-17 18:53:12 +02:00
Florian Nücke
bd289be003 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/server/component/DebugCard.scala
 2014-09-17 17:48:56 +02:00
Florian Nücke
4c379bdc37 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-09-17 17:44:23 +02:00
Florian Nücke
ec08847b79 Added some basic player querying to the debug card. 2014-09-17 17:42:15 +02:00
Florian "Sangar" Nücke
6ec9b641ba Merge pull request #569 from ViKaleidoscope/patch-2 
Update zh_CN.lang
 2014-09-17 13:04:04 +02:00
∑( ° △ °|||)
17a97216aa Update zh_CN.lang 
Add translations for piston upgrade.
 2014-09-17 18:46:18 +08:00
Florian Nücke
893bb2e819 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-09-17 09:48:27 +02:00
Florian Nücke
5a27e601c4 Allow passing a table to redstone.setBundledOutput containing multiple color values for quickly setting multiple channels. 2014-09-17 09:47:00 +02:00
Florian Nücke
b56f42c464 Fixes for 1.7. 2014-09-17 07:30:36 +02:00
Florian Nücke
31cbb8c715 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-09-17 07:28:06 +02:00
Florian Nücke
de3938942d Too lazy to test if this works right now, but if it does that'd be cool. 2014-09-17 07:27:54 +02:00
Florian Nücke
ffc62381f1 Added delay for screen multiblock check on clients, to make it less likely that some tile entities don't have their data when the check is performed; hopefully fixes #560. 2014-09-17 07:27:03 +02:00
Florian Nücke
0a58af6d84 Fixed validation of saved resolutions to avoid clamping down vertical resolution (see #560). 2014-09-17 06:09:09 +02:00
Florian Nücke
211034bbde Allow inserting tablets into disk drives to access their first internal drive. 2014-09-16 18:55:46 +02:00
Florian Nücke
88e6f00b67 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	build.gradle
	src/main/scala/li/cil/oc/Settings.scala
	src/main/scala/li/cil/oc/common/SaveHandler.scala
	src/main/scala/li/cil/oc/common/block/PowerConverter.scala
	src/main/scala/li/cil/oc/common/tileentity/Geolyzer.scala
	src/main/scala/li/cil/oc/common/tileentity/Hologram.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/ThermalExpansion.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala
 2014-09-16 17:32:06 +02:00
Florian Nücke
cbb08e3b1c Piston upgrade. Seems to work. For the most part. 2014-09-16 16:50:40 +02:00
Florian Nücke
59b6b95a3a Made values used for converting different power types configurable. 
Made geolyzer also act as an upgrade.
 2014-09-16 14:46:46 +02:00
Florian Nücke
5e4758079f Made the thing Java 1.6 compatible again (at least it works on openjdk6). Should close #565 for good. 2014-09-16 13:49:10 +02:00
Florian Nücke
8511c836fa Doubled max y translation for holograms. 2014-09-16 13:13:03 +02:00
Johannes Lohrer
ac9ec775e4 basic liquid interaction appears to work... 2014-09-15 23:40:48 +02:00
Florian Nücke
a12a14b192 Reorganzied dependencies, moving JNLua and LuaJ code to extra repo and including jar here for a cleaner separation of mod and third-party code. 2014-09-15 21:57:52 +02:00
Florian Nücke
9ce7331bd4 Checking for actual interface presence for IC2 instead of API ID, should fix #567. 2014-09-15 01:50:52 +02:00
Florian Nücke
a3394d24bb Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/OpenComputers.scala
	src/main/scala/li/cil/oc/common/EventHandler.scala
 2014-09-14 01:47:43 +02:00
Florian Nücke
de192111d4 Cleanup. 2014-09-14 01:46:37 +02:00
Florian Nücke
1a2badf6eb Hmm. 2014-09-14 01:30:15 +02:00
Florian Nücke
2fbbd11d54 Let's see how horribly this will fail. 2014-09-14 01:22:19 +02:00
Florian Nücke
6f88bbc9f7 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-09-13 23:31:33 +02:00
Florian Nücke
82e225d9f0 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-09-13 23:31:02 +02:00
Florian Nücke
5561952391 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-09-13 23:30:45 +02:00
Florian Nücke
b1f64a6615 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-09-13 23:30:01 +02:00
Florian Nücke
33397ec310 Fixed broken Java 1.7 runtime check. 2014-09-13 23:29:36 +02:00
Johannes Lohrer
4aab9c1f14 Merge branch 'master' of github.com:MightyPirates/OpenComputers into ExperimentalUpgrades 2014-09-13 16:21:49 +02:00
Florian Nücke
e87dffdca1 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/item/Tablet.scala
 2014-09-13 12:43:32 +02:00
Florian Nücke
1494438efe Fixed a potential error in io lib when no screen was attached. 
Made sign and nav upgrades work in tablets.
 2014-09-13 12:41:43 +02:00
Johannes Lohrer
a58a7176f7 added EnderIO (not sure if this is actually used yet) 
GregTech fixes
 2014-09-13 02:40:32 +02:00
Florian Nücke
7ca4aa8e26 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-09-11 16:38:41 +02:00
Florian Nücke
3b3b872187 Fixed a massive game-breaking bug of epic proportions [/sarcasm]. 2014-09-11 16:38:22 +02:00