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
4,587 Commits 29 Branches 143 Tags
Commit Graph

4587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
6851128cc2 Add support for generic recipes in recipe declaration (i.e. arbitrary output). 
Added recipe for end stone, for people that absolutely, positively can't be bothered to go to the end, but still want drones...
 2015-05-03 16:10:27 +02:00
Florian Nücke
2e634a0bfc Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-05-02 21:36:36 +02:00
Florian Nücke
b96204dc56 Should fix #1119. 2015-05-02 21:36:18 +02:00
Florian "Sangar" Nücke
ec4611c082 Merge pull request #1118 from Kubuxu/master-MC1.7.10 
Allow [name]/init.lua in require.
 2015-05-02 16:56:01 +02:00
Kubuxu
b55641b722 Allow [name]/init.lua in require. 
This change allows to store complex libraries in one directory.
 2015-05-02 16:47:16 +02:00
Florian Nücke
575dc73aad Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
 2015-05-02 14:08:04 +02:00
Florian Nücke
d2b51db61d Storing and restoring OpenGL attribs in robot renderer. 
May help with some things rendering incorrectly if rendered after the robot, otherwise. Possibly.
 2015-05-02 14:05:22 +02:00
Florian Nücke
c5eec99d75 Allow experience upgrade to consume bottles of enchanting and enchanted items for experience. 
Kind of a late implementation for #129 :P
 2015-05-01 22:44:05 +02:00
Florian Nücke
208c5b65e4 Added note in tooltip of microcontroller (and robot while at it) that they cannot connect to external components. 
Should hopefully save people some head-scratching in the future.
Could have sworn the tooltip said that already, but was only the robot. Oh well!
 2015-05-01 16:47:22 +02:00
Florian Nücke
b2dfdd25ee Don't initialize BluePower integration if present version is too old. Closes #1114. 
Yay for API changes that are not reflected in minor/major version numbers \o/
 2015-05-01 15:04:12 +02:00
Florian Nücke
aca1dd0dcc Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-05-01 12:17:52 +02:00
Florian Nücke
e028924d61 Added -x option to cp.lua to allow not copying mounts, used in install.lua to avoid recursively copying target mount to itself. 
Fixed deobf build shipping parts of the Railcraft API... sometimes Gradle confuses me greatly.
 2015-05-01 12:16:55 +02:00
Florian Nücke
5f1c6af0f3 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-05-01 11:51:25 +02:00
Florian Nücke
19afcabb7f Fixed piping broken in previous commit, also improved it a little. 
Also make yes.lua handle closed output stream instead of bubbling the error (e.g. when program it pipes to finishes).
 2015-05-01 11:51:06 +02:00
Florian Nücke
6b80b75fd3 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-05-01 10:47:51 +02:00
Florian Nücke
d77bc3d3d7 Added -u flag to cp.lua, added -u flag to install.lua. Closes #1092. 
Run `/mnt/???/bin/install.lua -u` to update OpenOS more comfortably now, asks for each changed file, to avoid blindly overwriting user-changed files.
Made install.lua a bit more clever, looking for an actual mount point for an address, not blindly hoping that `/mnt/(first three chars of address)` exists. Also made it use the cp.lua on its own file system (since that's needed for updating the first time, e.g.).
 2015-05-01 10:46:13 +02:00
Florian Nücke
a4214910c4 Some print->io.write. 2015-05-01 10:08:20 +02:00
Florian Nücke
27e32a0dc9 Forgot dem excludes. 2015-04-30 13:46:17 +02:00
Florian Nücke
e310d16b03 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-30 13:35:52 +02:00
Florian Nücke
bb4718034c Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/integration/vanilla/ModVanilla.scala
	src/main/scala/li/cil/oc/util/ExtendedWorld.scala
 2015-04-30 13:35:43 +02:00
Florian Nücke
cf89399cb5 Fixed derp in previous commit >_> 2015-04-30 13:33:25 +02:00
Florian Nücke
76b015c308 Fixed redstone input computation. 2015-04-30 13:27:34 +02:00
Florian Nücke
852c5b18db Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	build.gradle
	src/main/scala/li/cil/oc/client/renderer/tileentity/HologramRenderer.scala
	src/main/scala/li/cil/oc/common/Loot.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
	src/main/scala/li/cil/oc/integration/Mods.scala
	src/main/scala/li/cil/oc/util/Audio.scala
 2015-04-30 12:47:33 +02:00
Florian Nücke
1e642a0a24 Added fallback beeping when failing to generate tones, using MC note sound. Closes #1023. 
May not work, and some nuance is lost (beep length), but it's still better than nothing.
 2015-04-30 12:23:04 +02:00
Florian Nücke
7d69f996cb Added handling for OOM errors when allocating hologram rendering data. Closes #1105. 2015-04-30 11:44:47 +02:00
Florian Nücke
d5f1280fc9 Added beep(short, short) and beep(String) to the Machine interface. Closes #1112. 
Allows architectures (and components or anything else for that matter) to play custom tones and beep patterns.
 2015-04-30 11:33:13 +02:00
Florian Nücke
495f341181 Make safe subset of debug.getinfo available in sandbox. Closes #1110. 2015-04-30 11:18:19 +02:00
Florian Nücke
2b0da714c7 Merge branch 'master-MC1.7.10' of https://github.com/Kubuxu/OpenComputers into master-MC1.7.10 2015-04-29 22:23:28 +02:00
Kubuxu
4c4051540b Make dmesg use new event capabilities. 2015-04-29 18:38:03 +02:00
Florian Nücke
f78d5a4277 Fixed potential log spam in disassembler. Closes #1107. 2015-04-29 18:24:42 +02:00
Kubuxu
4a036f89e3 Implement event.pullMultiple and event.pullFiltered 2015-04-29 18:20:29 +02:00
Florian Nücke
8b149e1df6 Merge branch 'RU_doc' of https://github.com/cyber01/OpenComputers into master-MC1.7.10 2015-04-29 16:19:37 +02:00
Florian Nücke
cb704dab33 Basic integration for IGWMod, providing manual pages for blocks and items. 2015-04-29 16:19:08 +02:00
Florian Nücke
15cc9a7146 Caching redstone devices for bluepower. 2015-04-29 16:18:21 +02:00
Florian Nücke
2886fdcd4d Reworked redstone logic to make it more modular. 2015-04-27 21:16:41 +02:00
Florian Nücke
4956271d62 Added support for BluePower's bundled redstone system. Closes #1103. 2015-04-27 20:34:47 +02:00
cyber01
a30f2d1295 Corrected mistakes 2015-04-27 19:04:05 +03:00
cyber01
6c85fd8e10 Added waypoint. Corrected mistakes 2015-04-27 19:01:39 +03:00
Florian Nücke
636a67cded Fixed another potential NPE. Probably. 2015-04-26 18:25:20 +02:00
Florian Nücke
673f3d9a8f Fixed potential NPE in rotatable class... probably. 
Dem race conditions.
 2015-04-26 18:03:39 +02:00
Florian Nücke
f7ff8afdab Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/server/component/UpgradeNavigation.scala
 2015-04-26 17:57:08 +02:00
Florian Nücke
e547c877d2 Closing waypoint GUI when confirming new label. 2015-04-26 17:56:35 +02:00
Florian Nücke
65cd4d1230 Adjustments for 1.8. 2015-04-26 17:55:49 +02:00
Florian Nücke
0e995faa8a Mentioning waypoint in nav upgrade's manual entry. 2015-04-26 17:54:09 +02:00
Florian Nücke
6ee9e332e8 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/Textures.scala
	src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
	src/main/scala/li/cil/oc/common/event/RobotCommonHandler.scala
	src/main/scala/li/cil/oc/common/init/Blocks.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverBlockEnvironments.scala
 2015-04-26 17:20:42 +02:00
Florian Nücke
5672cf8dc8 Added waypoint block, can be queried using navigation upgrades. 
Fixed drones losing their name when changing their EEPROM.
 2015-04-26 16:24:40 +02:00
Florian Nücke
226fa52315 Blacklisting hover upgrade in non-robot devices. 2015-04-25 23:42:19 +02:00
Florian Nücke
e6fca46ccc Merge branch 'patch-1' of https://github.com/Mstrodl/OpenComputers into master-MC1.7.10 2015-04-25 23:39:42 +02:00
Florian Nücke
01f63f7e90 Added hover upgrade to allow increasing robot flight height (tier two allows unlimited flight height, like it was in the olden days). 2015-04-25 23:39:04 +02:00
Florian Nücke
f11285812f Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-04-24 17:39:17 +02:00