AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 18:55:03 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,459 Commits 29 Branches 143 Tags
Commit Graph

3459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
b2df4a4910 Fixed load order in tablet. 
Added recipe for tablet case.
Tablets are now precharged when assembled (like robots) and cost energy to build.
 2014-09-24 09:33:09 +02:00
Florian Nücke
1e7dc00b51 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into 1.8prep 
Conflicts:
	src/main/scala/li/cil/oc/common/SaveHandler.scala
	src/main/scala/li/cil/oc/common/block/Charger.scala
	src/main/scala/li/cil/oc/common/block/Delegator.scala
	src/main/scala/li/cil/oc/common/block/Geolyzer.scala
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/tileentity/Charger.scala
	src/main/scala/li/cil/oc/server/component/UpgradeTractorBeam.scala
	src/main/scala/li/cil/oc/server/driver/item/UpgradeTractorBeam.scala
 2014-09-23 21:32:24 +02:00
Florian Nücke
46610f417a Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	build.properties
	src/main/scala/li/cil/oc/client/gui/Case.scala
	src/main/scala/li/cil/oc/client/gui/Disassembler.scala
	src/main/scala/li/cil/oc/client/gui/DiskDrive.scala
	src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala
	src/main/scala/li/cil/oc/client/gui/Server.scala
	src/main/scala/li/cil/oc/client/gui/ServerRack.scala
	src/main/scala/li/cil/oc/client/gui/Switch.scala
	src/main/scala/li/cil/oc/common/GuiHandler.scala
	src/main/scala/li/cil/oc/common/SaveHandler.scala
	src/main/scala/li/cil/oc/common/block/Charger.scala
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/tileentity/Charger.scala
 2014-09-23 21:11:27 +02:00
Florian Nücke
668886d9b5 Cleanup. 2014-09-23 20:55:18 +02:00
Florian Nücke
238ef544d5 Added one-slot inventory to charger, can be used to charge tablets. 2014-09-23 20:54:17 +02:00
Florian Nücke
e4db950a17 Tablets now consume energy. 
Cleaned up and stabilized tablets some more.
Tablets now do *not* keep running across saves (unload/reload). This was causing too many issues when they were left in running state in inventories / lying around, and would have failed anyway if the world was saved while the owning player was not in the game (which happens all the time on servers, after all).
 2014-09-23 17:38:47 +02:00
Florian Nücke
341e692ded More API changes, machine hosts now no longer are contexts; was hacky anyway and made for annoying redundancies. 
Some more cleanup and a few fixes to bugs introduced by the dynamic architecture stuff.
 2014-09-23 08:43:37 +02:00
Johannes Lohrer
0fafd58c12 sucking and ejecting of fluids 2014-09-21 21:46:42 +02:00
Florian Nücke
dde7e0b67c 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-21 18:53:05 +02:00
Florian Nücke
65a0327695 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-09-21 18:13:57 +02:00
Florian Nücke
9d9d3f1639 Returning failure reason of first attempt in robot.swing(), closes #555. 2014-09-21 18:05:39 +02:00
Florian Nücke
dd492c8f1f Fixed an optional, may or may not help with #574. 
Fixed Geolyzer+Waila logic.
 2014-09-21 06:03:00 +02:00
Florian Nücke
b3605329d9 Hiding own crafting costs if CraftingCosts NEI plugin is present. 2014-09-20 20:23:17 +02:00
Florian Nücke
4c9784d54c Fixed it. 2014-09-20 11:43:12 +02:00
Florian Nücke
c4989e44e7 Made architecture dynamically defined via the host, reads arch from installed CPU. 2014-09-20 09:20:59 +02:00
Florian Nücke
691fbfd0c9 Some internal refactoring. 2014-09-20 07:48:06 +02:00
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