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

4671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
a2bf4156b2 Switched libs with ones built on an older Linux to make it work on distributions still using glibc 2.13. 2015-05-23 14:20:21 +02:00
Florian Nücke
389830c071 Added NotEnoughKeys integration. Closes #804. 
Also nicer names when displaying keybinds (well, mouse button names, mostly).
 2015-05-23 13:40:00 +02:00
Florian Nücke
50db25989c Force tablet caches to stay alive while single player game is paused, avoids tablets shutting down due to pauses. Closes #949. 2015-05-23 11:53:26 +02:00
Florian Nücke
d09943e18f Bump Forge version (so I can test Mekanism 8 in dev). 2015-05-23 11:19:27 +02:00
Florian Nücke
7ac1268079 Made boots require tier two hover upgrade. 2015-05-23 11:19:18 +02:00
dgelessus
42f1afbd36 Allow fake endstone in hoverUpgrade2 recipe 2015-05-23 02:01:10 +02:00
Florian Nücke
da333083b5 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-05-22 21:14:09 +02:00
Florian Nücke
86e056ef72 [ci skip] 2015-05-22 21:13:48 +02:00
Florian Nücke
10194b307d Adjustments for 1.8. 2015-05-22 21:11:08 +02:00
Florian Nücke
867f07a16e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-05-22 21:06:38 +02:00
Florian Nücke
693b525d7e oasdf;lokasdf;ljn 2015-05-22 21:04:03 +02:00
Florian Nücke
1bfeb69935 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/item/RemoteControl.scala
 2015-05-22 20:12:39 +02:00
Florian Nücke
e647e37243 Made boots work when power is disabled. 2015-05-22 20:12:08 +02:00
Florian Nücke
ce0ec1dc54 Made boots not consume energy when in creative mode. 2015-05-22 20:08:29 +02:00
Florian Nücke
d259d6dfca Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/block/Case.scala
	src/main/scala/li/cil/oc/common/block/RobotProxy.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/item/Debugger.scala
	src/main/scala/li/cil/oc/common/item/Delegator.scala
	src/main/scala/li/cil/oc/common/item/Drone.scala
	src/main/scala/li/cil/oc/common/item/EEPROM.scala
	src/main/scala/li/cil/oc/common/item/FloppyDisk.scala
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/item/Terminal.scala
	src/main/scala/li/cil/oc/common/item/TexturePicker.scala
	src/main/scala/li/cil/oc/common/item/traits/SimpleItem.scala
 2015-05-22 20:08:06 +02:00
Florian Nücke
6040644a94 Fixed non-creative players being able to power up creative computers by sneak-right-clicking them. 2015-05-22 19:51:26 +02:00
Florian Nücke
e0f53562de Some more refactoring. 2015-05-22 19:47:35 +02:00
Florian Nücke
4f804c39d4 Added hover boots. Because I can. 2015-05-22 19:39:05 +02:00
Florian Nücke
66203d8bd5 Minor cleanup. 2015-05-22 19:05:41 +02:00
Florian Nücke
a63a352282 Fixed charger energy conversion when charging foreign items. 2015-05-22 18:52:01 +02:00
Florian Nücke
917aca3b58 Bump version. 2015-05-22 12:42:10 +02:00
Florian Nücke
287ffd0e31 Null handling in class transformer ClassWriter workaround. Should fix #1166. 2015-05-22 12:42:01 +02:00
Florian Nücke
3f3e3494be Added APU to item index in manual. 2015-05-22 12:30:43 +02:00
Florian Nücke
fdb2ce3d71 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-05-21 14:51:04 +02:00
Florian Nücke
24b622294f Update JNLua, fixes #1104. 2015-05-21 14:41:17 +02:00
Florian Nücke
f497a7b2c4 Updated native libraries to Lua 5.2.4. 2015-05-21 14:40:56 +02:00
Florian Nücke
df811f1847 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/Sound.scala
	src/main/scala/li/cil/oc/client/Textures.scala
	src/main/scala/li/cil/oc/common/block/Raid.scala
	src/main/scala/li/cil/oc/common/event/RobotCommonHandler.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverCPU.scala
 2015-05-21 12:58:17 +02:00
Florian Nücke
9a96cb1a88 Added banner image for readme. 2015-05-20 23:28:24 +02:00
Florian Nücke
7755ed4f68 Play dummy computer running sound when entering the game to force preloading it. May solve the short lag when turning on the first computer after entering a game. 2015-05-20 23:25:06 +02:00
Florian Nücke
0ab6636b8a Moved ItemTier to traits package. 2015-05-20 23:16:08 +02:00
Florian Nücke
3540809a0d Added getter to internal.Robot to allow upgrade renderers know whether to animate or not. Closes #1127. 2015-05-20 23:09:04 +02:00
Florian Nücke
576b28fc68 Some more typos. 2015-05-20 23:03:06 +02:00
Florian Nücke
aa1974c8ee Merge branch 'patch-1' of https://github.com/logangorence/OpenComputers into master-MC1.7.10 2015-05-20 22:58:56 +02:00
Florian Nücke
0f0953f981 Added CPUs with integrated graphics capabilities, closes #1154. 2015-05-20 22:58:36 +02:00
Florian Nücke
e67587ae60 Should avoid issues with components that remove themselves or other components from their host inventory, such as the Computronics Boom Card. 2015-05-20 21:07:44 +02:00
Florian Nücke
f96515acdf Make raid blocks without content drop without NBT data to make them stackable. Closes #1152. 2015-05-20 20:36:16 +02:00
Logan Gorence
38f4a2291f Update README.md 2015-05-19 14:30:21 -07:00
Florian Nücke
5ad8ef331d Made AE2 interface block always provide controller functionality, closes #1152. 
This way there's no functionality difference between with-channel and without-channel settings.
Functionality in controller may be removed in a future version.
 2015-05-19 14:01:45 +02:00
Florian Nücke
359fa0f990 Fixed maximum flight height computation involving built-in hover upgrades. Fixes #1156. 2015-05-17 22:49:35 +02:00
Florian Nücke
a683ff4bf9 Merge branch 'patch-1' of https://github.com/mpmxyz/OpenComputers into master-MC1.7.10 2015-05-17 22:34:03 +02:00
mpmxyz
315aa57a0c Removed duplicate Ctrl+C-Handling from term.read 
The event library already takes care about that. (returning an "interrupted" event)
I noticed that because I couldn't exit command lines reliably. (The Ctrl+C-Handling in the event library replaces some events.)
 2015-05-17 18:03:38 +02:00
Florian Nücke
a0fd81c783 Close GUI of screens getting invalidated. 
E.g. if other player breaks screen someone is looking at, or it is moved using some mod (AE2 spatial storage, Redstone/Remain in Motion, Funky Locomotion).
 2015-05-16 20:28:50 +02:00
Florian "Sangar" Nücke
554192eeff Merge pull request #1153 from cyber01/RU_doc 
Updated index.md and added endstone in russian translation
 2015-05-16 18:13:19 +02:00
cyber01
e88708d9d4 Updated index.md and added endstone in russian translation 2015-05-16 18:59:58 +03:00
Florian "Sangar" Nücke
aaba071df9 Merge pull request #1151 from rashdanml/patch-1 
Update index.md
 2015-05-15 14:52:37 +02:00
rashdanml
62a724a77e Update index.md 
Re-wrote a bit of text to better illustrate the features and limitations of different devices (more detailed information on limitations can be found in the relevant linked pages).
 2015-05-14 15:41:42 -07:00
Florian Nücke
34b2e45a9e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-05-14 22:22:00 +02:00
Florian Nücke
f73418f231 Increase max allowed EEPROM label length. 2015-05-14 22:21:40 +02:00
Florian Nücke
f0fc58d99c Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/Loot.scala
	src/main/scala/li/cil/oc/common/PacketHandler.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/inventory/Inventory.scala
	src/main/scala/li/cil/oc/common/recipe/Recipes.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverFileSystem.scala
	src/main/scala/li/cil/oc/server/PacketSender.scala
	src/main/scala/li/cil/oc/util/ItemUtils.scala
 2015-05-14 22:19:45 +02:00
Florian Nücke
39cf701c0f Removed now useless indirection for item stack loading (was for upgrading blocks to new format many versions back). 
Synching loot disks defined on dedicated servers via save directory to clients so that they show in their creative tabs. Yep, this was broken since the day it was added.
 2015-05-14 22:00:32 +02:00